Skip to content

Commit

Permalink
repro: Restore makepkg.conf from devtools
Browse files Browse the repository at this point in the history
The commit ceeead1 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 <[email protected]>
  • Loading branch information
Foxboron committed Apr 22, 2021
1 parent b6f1b4b commit 9293d6f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion repro.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -548,7 +554,7 @@ function parse_args() {
if [[ $# != 1 ]]; then
error "too many packages provided"
print_help
exit 1
exit 1
fi

pkg="$@"
Expand Down

0 comments on commit 9293d6f

Please sign in to comment.