From 9293d6f1e2197b63aaffb4936735eaebdd5e4620 Mon Sep 17 00:00:00 2001 From: Morten Linderud Date: Thu, 22 Apr 2021 22:44:12 +0200 Subject: [PATCH] repro: Restore makepkg.conf from devtools The commit ceeead14e1c247a193a8501d11c3138662244e31 the portion of code that copies the devtools makepkg.conf from the temporary container to the build container. That was fine since it wouldn't work with EPHEMERAL containers implementation anyway :) This patch reintroduces the devtools makepkg.conf correctly into the build container. Signed-off-by: Morten Linderud --- repro.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/repro.in b/repro.in index eb896cd..0c8fe95 100755 --- a/repro.in +++ b/repro.in @@ -448,12 +448,18 @@ __END__ EPHEMERAL=1 exec_nspawn root \ --bind="${build_root_dir}:/mnt" \ --bind-ro="$KEYRINGCACHE/$keyring_package:/gnupg" \ + --bind="$(readlink -e ${cachedir}):/var/cache/pacman/pkg" \ --bind="$(readlink -e ${cachedir}):/cache" \ bash -bash "${packages[@]}" <<-__END__ rm --recursive /etc/pacman.d/gnupg/ cp --target-directory=/etc/pacman.d/ --recursive /gnupg echo "faked-system-time ${SOURCE_DATE_EPOCH}" >> /etc/pacman.d/gnupg/gpg.conf pacstrap -G -U /mnt --needed "\$@" +# Ignore all dependencies since we only want the file +# Saves us a few seconds and doesn't download a bunch of things +# we are getting rid off +pacman --noconfirm --needed -Sddu devtools +cp -v /usr/share/devtools/makepkg-x86_64.conf /mnt/etc/makepkg.conf __END__ lock_close 9 "$KEYRINGCACHE/$keyring_package.lock" @@ -548,7 +554,7 @@ function parse_args() { if [[ $# != 1 ]]; then error "too many packages provided" print_help - exit 1 + exit 1 fi pkg="$@"