diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-01-30 14:39:20 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-01-30 14:39:20 +0100 |
| commit | 3ad78d32a2bdfa3d95ed2a369b7528551653b254 (patch) | |
| tree | 4dc73479234671e3c0ed66b0c2bc817cf4ed069e | |
| parent | eeefbe0d6b4f602b6e70d093b287aed8b5e9501f (diff) | |
| download | bootstrap32-3ad78d32a2bdfa3d95ed2a369b7528551653b254.tar.xz | |
make sure to clean the package directory and remove stale packages when building
| -rwxr-xr-x | build_stage1_package.sh | 1 | ||||
| -rw-r--r-- | default.conf | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh index bd2de31..2fe6bc1 100755 --- a/build_stage1_package.sh +++ b/build_stage1_package.sh @@ -21,6 +21,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - cd $STAGE1_BUILD || exit 1 rm -rf "$PACKAGE" + rm -f $STAGE1_PACKAGES/$PACKAGE-*pkg.tar.xz PACKAGE_CONF="$SCRIPT_DIR/packages-$TARGET_CPU-stage1/$PACKAGE" if test $(grep -c NEEDS_YAOURT $PACKAGE_CONF) = 1; then diff --git a/default.conf b/default.conf index 02d529b..7e7d626 100644 --- a/default.conf +++ b/default.conf @@ -30,6 +30,9 @@ STAGE1_CHROOT=$CROSS_HOME/$TARGET_CPU-root # the place where we build stage 1 STAGE1_BUILD=$CROSS_HOME/$TARGET_CPU-build +# where packages are stored for stage 1 +STAGE1_PACKAGES=$STAGE1_CHROOT/packages/$TARGET_CPU/ + # git repository for PKGBUILD diffs and patches for the # i686 architecture GIT_URL_ARCHLINUX32_PACKAGES=https://github.com/archlinux32/packages.git |