From c8daadccefa390907f500ca3a2621312e2a2dcb6 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 10 Mar 2018 21:35:47 +0100 Subject: building up to meson --- build_stage1_package.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'build_stage1_package.sh') 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 -- cgit v1.2.3-54-g00ecf