diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-02-01 22:38:44 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-02-01 22:38:44 +0100 |
| commit | d717823cde98d4c534ccbb52329ff98f8719ab36 (patch) | |
| tree | 280da86db1f11ea819fab5d9fb1cb8416bf3c029 /build_stage1_package.sh | |
| parent | 655acd3a233b60c5618d0239e9a716865c0b595a (diff) | |
| download | bootstrap32-d717823cde98d4c534ccbb52329ff98f8719ab36.tar.xz | |
bugfixing, complete rebuild
added a todo list
building up to shadow, net-tools still breaks
Diffstat (limited to 'build_stage1_package.sh')
| -rwxr-xr-x | build_stage1_package.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh index 775efe2..1b9465e 100755 --- a/build_stage1_package.sh +++ b/build_stage1_package.sh @@ -33,8 +33,10 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - # using asp (or from the AUR using yaourt) PACKAGE_CONF="$SCRIPT_DIR/packages-$TARGET_CPU-stage1/$PACKAGE" - if test $(grep -c NEEDS_YAOURT $PACKAGE_CONF) = 1; then - NEEDS_YAOURT=$(grep NEEDS_YAOURT $PACKAGE_CONF | cut -f 2 -d =) + if test -f $PACKAGE_CONF; then + if test $(grep -c NEEDS_YAOURT $PACKAGE_CONF) = 1; then + NEEDS_YAOURT=$(grep NEEDS_YAOURT $PACKAGE_CONF | cut -f 2 -d =) + fi fi if test "$NEEDS_YAOURT"; then yaourt -G "$PACKAGE" @@ -62,7 +64,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - fi # copy bigger patches into the build area - if test $(find SCRIPT_DIR/patches-$TARGET_CPU-stage1/$PACKAGE-*.patch 2>/dev/null | grep -q .); then + if test $(find $SCRIPT_DIR/patches-$TARGET_CPU-stage1/$PACKAGE-*.patch 2>/dev/null | wc -l) != 0; then cp $SCRIPT_DIR/patches-$TARGET_CPU-stage1/$PACKAGE-*.patch . fi @@ -116,10 +118,16 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - cd "$STAGE1_BUILD/$PACKAGE" || exit 1 fi + echo "Built package $PACKAGE." + + else + echo "ERROR building package $PACKAGE" + exit 1 fi cd $STAGE1_BUILD || exit 1 +else + echo "$PACKAGE exists." fi -echo "Built package $PACKAGE." |