summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-05-26 22:42:38 +0200
committerLevente Polyak <anthraxx@archlinux.org>2019-08-09 19:41:53 +0200
commit8e4293034b1d29fde3bbcb8398d014674d27b97f (patch)
tree0ab0570eb9bca5fe70e66d4f25e57cc2468a2bf8
parentb7893a2ca8e09062197129881bce3fd6700a573a (diff)
downloaddevtools-8e4293034b1d29fde3bbcb8398d014674d27b97f.tar.gz
devtools-8e4293034b1d29fde3bbcb8398d014674d27b97f.tar.xz
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 <eschwartz@archlinux.org> Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
-rw-r--r--archbuild.in2
-rw-r--r--makechrootpkg.in2
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