diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-02-06 21:41:08 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-02-06 21:41:08 +0100 |
| commit | 4b17bcd56378f2ed5dfde17c33709187b2290539 (patch) | |
| tree | edde869f7e5758932b01089399480e721b40bf93 /build_stage1_package.sh | |
| parent | 7c7a001ee6b8642121d28191bcc913c2ea452900 (diff) | |
| download | bootstrap32-4b17bcd56378f2ed5dfde17c33709187b2290539.tar.xz | |
adapted to linux config naming changes
rebuild world
small fixes
Diffstat (limited to 'build_stage1_package.sh')
| -rwxr-xr-x | build_stage1_package.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh index 585f2db..a73cb17 100755 --- a/build_stage1_package.sh +++ b/build_stage1_package.sh @@ -70,7 +70,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - # copy all other files from Archlinux32, if they exist # (we assume, we only take core packages during stage1) if test -f "$DIFF_PKGBUILD"; then - find $ARCHLINUX32_PACKAGES/core/pacman-mirrorlist/* ! -name PKGBUILD \ + find $ARCHLINUX32_PACKAGES/core/$PACKAGE/* ! -name PKGBUILD \ -exec cp {} . \; fi @@ -82,8 +82,10 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - fi # copy all files into the build area (but the package DESCR file) - cp $PACKAGE_DIR/* . - rm -f DESCR + if test -d $PACKAGE_DIR; then + find $PACKAGE_DIR/* ! -name DESCR \ + -exec cp {} . \; + fi # disable or enable parallel builds |