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_stage3_package.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'build_stage3_package.sh') diff --git a/build_stage3_package.sh b/build_stage3_package.sh index 78fc5a6..ec9efd8 100755 --- a/build_stage3_package.sh +++ b/build_stage3_package.sh @@ -131,14 +131,18 @@ if test "$(find "$STAGE3_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l # install onto stage 1 system via pacman + if test "$FORCE_INSTALL"; then + FORCE="--force" + fi + ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "' # TODO: broken [temp] repo if test \"$ADDITIONAL_INSTALL_PACKAGE\" != \"\"; then - #pacman --noconfirm -Syy $PACKAGE $ADDITIONAL_INSTALL_PACKAGE - pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz /packages/$TARGET_CPU/$ADDITIONAL_INSTALL_PACKAGE-*.pkg.tar.xz + #pacman $FORCE --noconfirm -Syy $PACKAGE $ADDITIONAL_INSTALL_PACKAGE + pacman $FORCE --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz /packages/$TARGET_CPU/$ADDITIONAL_INSTALL_PACKAGE-*.pkg.tar.xz else - #pacman --noconfirm -Syy $PACKAGE - pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz + #pacman $FORCE --noconfirm -Syy $PACKAGE + pacman $FORCE --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz fi '" -- cgit v1.2.3-70-g09d2