From 8e4293034b1d29fde3bbcb8398d014674d27b97f Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 26 May 2019 16:42:38 -0400 Subject: [PATCH] makechrootpkg: also downgrade packages when updating chroots Packages should never be getting downgraded... unless a package is pulled from testing, e.g. for example if gcc9 totally breaks the linux kernel. In such cases, the master repo says there is a downgrade, so we'd better go with that. Basically, ensure that packages match the repo they are being built against. Consistency at all costs! Signed-off-by: Eli Schwartz Signed-off-by: Levente Polyak --- archbuild.in | 2 +- makechrootpkg.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archbuild.in b/archbuild.in index 709d70d..b6d0b56 100644 --- a/archbuild.in +++ b/archbuild.in @@ -71,7 +71,7 @@ else -C "@pkgdatadir@/pacman-${repo}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ - pacman -Syu --noconfirm || abort + pacman -Syuu --noconfirm || abort fi # Always build official packages reproducibly diff --git a/makechrootpkg.in b/makechrootpkg.in index f69c781..7c3cc93 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -361,7 +361,7 @@ fi (( update_first )) && arch-nspawn "$copydir" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ - pacman -Syu --noconfirm + pacman -Syuu --noconfirm if [[ -n ${install_pkgs[*]:-} ]]; then install_packages