Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/build_stage1_package.sh
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-03-10 21:35:47 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2018-03-10 21:35:47 +0100
commitc8daadccefa390907f500ca3a2621312e2a2dcb6 (patch)
tree5b14e1edd1893dd75922fc4b6dbf2b4e97d40c36 /build_stage1_package.sh
parent9d8946a6ecfc19d01d8da12f20572bbfc556977f (diff)
building up to meson
Diffstat (limited to 'build_stage1_package.sh')
-rwxr-xr-xbuild_stage1_package.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh
index 1e7f877..97a81ad 100755
--- a/build_stage1_package.sh
+++ b/build_stage1_package.sh
@@ -121,11 +121,15 @@ if test "$(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT"
repo-add $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db.tar.gz $STAGE1_CHROOT/packages/$TARGET_CPU/*pkg.tar.xz
# install into chroot via pacman
+
+ if test "$FORCE_INSTALL"; then
+ FORCE="--force"
+ fi
if test "x$ADDITIONAL_INSTALL_PACKAGE" != "x"; then
- sudo pacman --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE" "$ADDITIONAL_INSTALL_PACKAGE"
+ sudo pacman $FORCE --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE" "$ADDITIONAL_INSTALL_PACKAGE"
else
- sudo pacman --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE"
+ sudo pacman $FORCE --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE"
fi
# optionally install into cross-compiler sysroot with bsdtar