An error occurred while fetching this tab.
Misc de-duplication and cleanups
- Oct 02, 2023
-
-
Emil Velikov authored
Not a big win as-is. It will make the upcoming introduction of multilib-devel a bit saner. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
ed0440cc -
Emil Velikov authored
Bonus point, we actually error out when the git command fails. v2: - fix curl quoting - sed match-complete-line-and-remove - inline update make-dockerfile.sh variables Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
d1254eee -
Emil Velikov authored
Less duplication ftw, specially with multilib-devel on the horizon. Unfortunately we'd need to tag the file pattern rules as precious, otherwise make thinks they are intermediate files and nukes them. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
0a6910ca -
Emil Velikov authored
The field is an inline comment, which by default is not present in the podman log. Plus we do have the exact URL list a couple of lines further down. Haven't seen any other Dockerfile have one either, so let's nuke it. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
64cb18a0 -
Emil Velikov authored
Currently the TEMPLATE_ROOTFS_DOWNLOAD handling is overly complicated. For the local builds, we set a ROOTFS=$GROUP.tar.zst. While for remote builds, we: - invoke curl to fetch the remote tarball - ok - do curl and shell escaping contortions to prints the filename - ehhh - that we already now - and rely upon to not change, otherwise sha256sum will fail Just use a dummy "true", for the local builds and a normal curl command otherwise. v2: - don't call curl in a sub-shell - no longer needed Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
a972ead2
-
- Sep 25, 2023
-
-
Emil Velikov authored
Drop the spurious cat, we already echo the value the like above so it's pretty clear what it is in the logs. While here, rename the file to the what's commonly used by us (see the ISOs) and others, while removing the misleading "rootfs.tar" - we're having a tar.zst tarball. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2f43fc41 -
Emil Velikov authored
Move the cp/ln calls outside of the WRAPPER call block. The files that are referenced are either disowned by pacman or are explicitly "backup" files, such that pacman will not override them. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
c4b62bb1 -
Emil Velikov authored
The files are explicitly omitted from the tarball via the excludes file. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
0067757d -
Emil Velikov authored
Embedding one pieces of code into another (shell script into a makefiles in this case) is rarely pretty. Split things up, as appropriate. While here, simplify the rootfs in a few ways: - pass only the extra non-base (and effectively group name) package - add a handy variable for the fakeroot/fakechroot combo - split and rewrap long lines As a bonus point, this makes it easier to use pattern rules in the makefile - which will be handy for the upcoming multilib-devel group/target. Plus we can check the scripts via shellcheck/etc CI stage, as follow-up. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
f737d643 -
Emil Velikov authored
The commands are identical across the three hosts. Just flesh that into a simple for loop. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
b2136558 -
Emil Velikov authored
The option was moved the to template and an earlier commit reintroduced/copied them back seemingly by mistake. Cc: nl6720 <nl6720@gmail.com> Fixes: ca9957f7 ("Do not use secure runners on forks") Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
069a4dee
-