diff options
| -rwxr-xr-x | build_stage1_package.sh | 12 | ||||
| -rw-r--r-- | i486-stage1/acl/DESCR (renamed from packages-i486-stage1/acl) | 0 | ||||
| -rw-r--r-- | i486-stage1/attr/DESCR (renamed from packages-i486-stage1/attr) | 0 | ||||
| -rw-r--r-- | i486-stage1/bash/DESCR (renamed from packages-i486-stage1/bash) | 0 | ||||
| -rw-r--r-- | i486-stage1/bc/DESCR (renamed from packages-i486-stage1/bc) | 0 | ||||
| -rw-r--r-- | i486-stage1/bzip2/DESCR (renamed from packages-i486-stage1/bzip2) | 0 | ||||
| -rw-r--r-- | i486-stage1/coreutils/DESCR (renamed from packages-i486-stage1/coreutils) | 0 | ||||
| -rw-r--r-- | i486-stage1/coreutils/coreutils-8.28-noman.patch (renamed from patches-i486-stage1/coreutils-8.28-noman.patch) | 0 | ||||
| -rw-r--r-- | i486-stage1/cracklib/DESCR (renamed from packages-i486-stage1/cracklib) | 0 | ||||
| -rw-r--r-- | i486-stage1/curl/DESCR (renamed from packages-i486-stage1/curl) | 0 | ||||
| -rw-r--r-- | i486-stage1/db/DESCR (renamed from packages-i486-stage1/db) | 0 | ||||
| -rw-r--r-- | i486-stage1/diffutils/DESCR (renamed from packages-i486-stage1/diffutils) | 0 | ||||
| -rw-r--r-- | i486-stage1/e2fsprogs/DESCR (renamed from packages-i486-stage1/e2fsprogs) | 0 | ||||
| -rw-r--r-- | i486-stage1/ed/DESCR (renamed from packages-i486-stage1/ed) | 0 | ||||
| -rw-r--r-- | i486-stage1/elfutils/DESCR (renamed from packages-i486-stage1/elfutils) | 0 | ||||
| -rw-r--r-- | i486-stage1/expat/DESCR (renamed from packages-i486-stage1/expat) | 0 | ||||
| -rw-r--r-- | i486-stage1/file/DESCR (renamed from packages-i486-stage1/file) | 0 | ||||
| -rw-r--r-- | i486-stage1/findutils/DESCR (renamed from packages-i486-stage1/findutils) | 0 | ||||
| -rw-r--r-- | i486-stage1/gdbm/DESCR (renamed from packages-i486-stage1/gdbm) | 0 | ||||
| -rw-r--r-- | i486-stage1/gmp/DESCR (renamed from packages-i486-stage1/gmp) | 0 | ||||
| -rw-r--r-- | i486-stage1/grep/DESCR (renamed from packages-i486-stage1/grep) | 0 | ||||
| -rw-r--r-- | i486-stage1/gzip/DESCR (renamed from packages-i486-stage1/gzip) | 0 | ||||
| -rw-r--r-- | i486-stage1/inetutils/DESCR (renamed from packages-i486-stage1/inetutils) | 0 | ||||
| -rw-r--r-- | i486-stage1/iproute2/DESCR (renamed from packages-i486-stage1/iproute2) | 0 | ||||
| -rw-r--r-- | i486-stage1/iptables/DESCR (renamed from packages-i486-stage1/iptables) | 0 | ||||
| -rw-r--r-- | i486-stage1/joe/DESCR (renamed from packages-i486-stage1/joe) | 0 | ||||
| -rw-r--r-- | i486-stage1/kbd/DESCR (renamed from packages-i486-stage1/kbd) | 0 | ||||
| -rw-r--r-- | i486-stage1/kmod/DESCR (renamed from packages-i486-stage1/kmod) | 0 | ||||
| -rw-r--r-- | i486-stage1/less/DESCR (renamed from packages-i486-stage1/less) | 0 | ||||
| -rw-r--r-- | i486-stage1/libarchive/DESCR (renamed from packages-i486-stage1/libarchive) | 0 | ||||
| -rw-r--r-- | i486-stage1/libcap/DESCR (renamed from packages-i486-stage1/libcap) | 0 | ||||
| -rw-r--r-- | i486-stage1/libcap/libcap-2.25-gperf.patch (renamed from patches-i486-stage1/libcap-2.25-gperf.patch) | 0 | ||||
| -rw-r--r-- | i486-stage1/libedit/DESCR (renamed from packages-i486-stage1/libedit) | 0 | ||||
| -rw-r--r-- | i486-stage1/libmnl/DESCR (renamed from packages-i486-stage1/libmnl) | 0 | ||||
| -rw-r--r-- | i486-stage1/libnfnetlink/DESCR (renamed from packages-i486-stage1/libnfnetlink) | 0 | ||||
| -rw-r--r-- | i486-stage1/libtirpc/DESCR (renamed from packages-i486-stage1/libtirpc) | 0 | ||||
| -rw-r--r-- | i486-stage1/libtirpc/libtirpc-1.0.2-stdint.patch (renamed from patches-i486-stage1/libtirpc-1.0.2-stdint.patch) | 0 | ||||
| -rw-r--r-- | i486-stage1/linux-api-headers/DESCR (renamed from packages-i486-stage1/linux-api-headers) | 0 | ||||
| -rw-r--r-- | i486-stage1/linux/DESCR (renamed from packages-i486-stage1/linux) | 0 | ||||
| -rw-r--r-- | i486-stage1/lz4/DESCR (renamed from packages-i486-stage1/lz4) | 0 | ||||
| -rw-r--r-- | i486-stage1/ncurses/DESCR (renamed from packages-i486-stage1/ncurses) | 0 | ||||
| -rw-r--r-- | i486-stage1/net-tools/DESCR (renamed from packages-i486-stage1/net-tools) | 0 | ||||
| -rw-r--r-- | i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch (renamed from patches-i486-stage1/net-tools-1.60-if_tunnel.patch) | 0 | ||||
| -rw-r--r-- | i486-stage1/openssh/DESCR (renamed from packages-i486-stage1/openssh) | 0 | ||||
| -rw-r--r-- | i486-stage1/openssl/DESCR (renamed from packages-i486-stage1/openssl) | 0 | ||||
| -rw-r--r-- | i486-stage1/pam/DESCR (renamed from packages-i486-stage1/pam) | 0 | ||||
| -rw-r--r-- | i486-stage1/pam/pam-1.3.0-unix-passwd-no-yp.patch (renamed from patches-i486-stage1/pam-1.3.0-unix-passwd-no-yp.patch) | 0 | ||||
| -rw-r--r-- | i486-stage1/pambase/DESCR (renamed from packages-i486-stage1/pambase) | 0 | ||||
| -rw-r--r-- | i486-stage1/patch/DESCR (renamed from packages-i486-stage1/patch) | 0 | ||||
| -rw-r--r-- | i486-stage1/pcre/DESCR (renamed from packages-i486-stage1/pcre) | 0 | ||||
| -rw-r--r-- | i486-stage1/perl/DESCR (renamed from packages-i486-stage1/perl) | 0 | ||||
| -rw-r--r-- | i486-stage1/procps-ng/DESCR (renamed from packages-i486-stage1/procps-ng) | 0 | ||||
| -rw-r--r-- | i486-stage1/readline/DESCR (renamed from packages-i486-stage1/readline) | 0 | ||||
| -rw-r--r-- | i486-stage1/sed/DESCR (renamed from packages-i486-stage1/sed) | 0 | ||||
| -rw-r--r-- | i486-stage1/shadow/DESCR (renamed from packages-i486-stage1/shadow) | 0 | ||||
| -rw-r--r-- | i486-stage1/tar/DESCR (renamed from packages-i486-stage1/tar) | 0 | ||||
| -rw-r--r-- | i486-stage1/template/DESCR (renamed from packages-i486-stage1/template) | 0 | ||||
| -rw-r--r-- | i486-stage1/texinfo/DESCR (renamed from packages-i486-stage1/texinfo) | 0 | ||||
| -rw-r--r-- | i486-stage1/uinit/DESCR (renamed from packages-i486-stage1/uinit) | 0 | ||||
| -rw-r--r-- | i486-stage1/util-linux/DESCR (renamed from packages-i486-stage1/util-linux) | 0 | ||||
| -rw-r--r-- | i486-stage1/xz/DESCR (renamed from packages-i486-stage1/xz) | 0 | ||||
| -rw-r--r-- | i486-stage1/zlib/DESCR (renamed from packages-i486-stage1/zlib) | 0 |
62 files changed, 6 insertions, 6 deletions
diff --git a/build_stage1_package.sh b/build_stage1_package.sh index 1b9465e..06ecfcd 100755 --- a/build_stage1_package.sh +++ b/build_stage1_package.sh @@ -17,7 +17,7 @@ export PATH="$XTOOLS_ARCH/bin:${PATH}" # draw in default values for build variables -. "$SCRIPT_DIR/packages-$TARGET_CPU-stage1/template" +. "$SCRIPT_DIR/$TARGET_CPU-stage1/template/DESCR" if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Q | cut -f 1 -d ' ' | grep -c "^${PACKAGE}$") = 0; then echo "Building package $PACKAGE." @@ -32,7 +32,8 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - # check out the package build information from the upstream git rep # using asp (or from the AUR using yaourt) - PACKAGE_CONF="$SCRIPT_DIR/packages-$TARGET_CPU-stage1/$PACKAGE" + PACKAGE_DIR="$SCRIPT_DIR/$TARGET_CPU-stage1/$PACKAGE" + PACKAGE_CONF="$PACKAGE_DIR/DESCR" 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 =) @@ -63,10 +64,9 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - . "$PACKAGE_CONF" fi - # copy bigger patches into the build area - 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 + # copy all files into the build area (but the package DESCR file) + cp $PACKAGE_DIR/* . + rm -f DESCR # disable or enable parallel builds diff --git a/packages-i486-stage1/acl b/i486-stage1/acl/DESCR index f34036f..f34036f 100644 --- a/packages-i486-stage1/acl +++ b/i486-stage1/acl/DESCR diff --git a/packages-i486-stage1/attr b/i486-stage1/attr/DESCR index dfe2f65..dfe2f65 100644 --- a/packages-i486-stage1/attr +++ b/i486-stage1/attr/DESCR diff --git a/packages-i486-stage1/bash b/i486-stage1/bash/DESCR index 8ed7de8..8ed7de8 100644 --- a/packages-i486-stage1/bash +++ b/i486-stage1/bash/DESCR diff --git a/packages-i486-stage1/bc b/i486-stage1/bc/DESCR index b7720fd..b7720fd 100644 --- a/packages-i486-stage1/bc +++ b/i486-stage1/bc/DESCR diff --git a/packages-i486-stage1/bzip2 b/i486-stage1/bzip2/DESCR index 9329744..9329744 100644 --- a/packages-i486-stage1/bzip2 +++ b/i486-stage1/bzip2/DESCR diff --git a/packages-i486-stage1/coreutils b/i486-stage1/coreutils/DESCR index 1995b5a..1995b5a 100644 --- a/packages-i486-stage1/coreutils +++ b/i486-stage1/coreutils/DESCR diff --git a/patches-i486-stage1/coreutils-8.28-noman.patch b/i486-stage1/coreutils/coreutils-8.28-noman.patch index 8a40a31..8a40a31 100644 --- a/patches-i486-stage1/coreutils-8.28-noman.patch +++ b/i486-stage1/coreutils/coreutils-8.28-noman.patch diff --git a/packages-i486-stage1/cracklib b/i486-stage1/cracklib/DESCR index 318e22a..318e22a 100644 --- a/packages-i486-stage1/cracklib +++ b/i486-stage1/cracklib/DESCR diff --git a/packages-i486-stage1/curl b/i486-stage1/curl/DESCR index 88b092f..88b092f 100644 --- a/packages-i486-stage1/curl +++ b/i486-stage1/curl/DESCR diff --git a/packages-i486-stage1/db b/i486-stage1/db/DESCR index fe5a83a..fe5a83a 100644 --- a/packages-i486-stage1/db +++ b/i486-stage1/db/DESCR diff --git a/packages-i486-stage1/diffutils b/i486-stage1/diffutils/DESCR index 57fb376..57fb376 100644 --- a/packages-i486-stage1/diffutils +++ b/i486-stage1/diffutils/DESCR diff --git a/packages-i486-stage1/e2fsprogs b/i486-stage1/e2fsprogs/DESCR index 1995b5a..1995b5a 100644 --- a/packages-i486-stage1/e2fsprogs +++ b/i486-stage1/e2fsprogs/DESCR diff --git a/packages-i486-stage1/ed b/i486-stage1/ed/DESCR index 9fff229..9fff229 100644 --- a/packages-i486-stage1/ed +++ b/i486-stage1/ed/DESCR diff --git a/packages-i486-stage1/elfutils b/i486-stage1/elfutils/DESCR index e747c06..e747c06 100644 --- a/packages-i486-stage1/elfutils +++ b/i486-stage1/elfutils/DESCR diff --git a/packages-i486-stage1/expat b/i486-stage1/expat/DESCR index e8c1341..e8c1341 100644 --- a/packages-i486-stage1/expat +++ b/i486-stage1/expat/DESCR diff --git a/packages-i486-stage1/file b/i486-stage1/file/DESCR index 31c2965..31c2965 100644 --- a/packages-i486-stage1/file +++ b/i486-stage1/file/DESCR diff --git a/packages-i486-stage1/findutils b/i486-stage1/findutils/DESCR index 8ed7de8..8ed7de8 100644 --- a/packages-i486-stage1/findutils +++ b/i486-stage1/findutils/DESCR diff --git a/packages-i486-stage1/gdbm b/i486-stage1/gdbm/DESCR index 73ce19a..73ce19a 100644 --- a/packages-i486-stage1/gdbm +++ b/i486-stage1/gdbm/DESCR diff --git a/packages-i486-stage1/gmp b/i486-stage1/gmp/DESCR index 73a6530..73a6530 100644 --- a/packages-i486-stage1/gmp +++ b/i486-stage1/gmp/DESCR diff --git a/packages-i486-stage1/grep b/i486-stage1/grep/DESCR index 8ed7de8..8ed7de8 100644 --- a/packages-i486-stage1/grep +++ b/i486-stage1/grep/DESCR diff --git a/packages-i486-stage1/gzip b/i486-stage1/gzip/DESCR index 2a024e0..2a024e0 100644 --- a/packages-i486-stage1/gzip +++ b/i486-stage1/gzip/DESCR diff --git a/packages-i486-stage1/inetutils b/i486-stage1/inetutils/DESCR index 669cd5f..669cd5f 100644 --- a/packages-i486-stage1/inetutils +++ b/i486-stage1/inetutils/DESCR diff --git a/packages-i486-stage1/iproute2 b/i486-stage1/iproute2/DESCR index a380e81..a380e81 100644 --- a/packages-i486-stage1/iproute2 +++ b/i486-stage1/iproute2/DESCR diff --git a/packages-i486-stage1/iptables b/i486-stage1/iptables/DESCR index 8e9c1c9..8e9c1c9 100644 --- a/packages-i486-stage1/iptables +++ b/i486-stage1/iptables/DESCR diff --git a/packages-i486-stage1/joe b/i486-stage1/joe/DESCR index 8ed7de8..8ed7de8 100644 --- a/packages-i486-stage1/joe +++ b/i486-stage1/joe/DESCR diff --git a/packages-i486-stage1/kbd b/i486-stage1/kbd/DESCR index 2e3bcfb..2e3bcfb 100644 --- a/packages-i486-stage1/kbd +++ b/i486-stage1/kbd/DESCR diff --git a/packages-i486-stage1/kmod b/i486-stage1/kmod/DESCR index 6039431..6039431 100644 --- a/packages-i486-stage1/kmod +++ b/i486-stage1/kmod/DESCR diff --git a/packages-i486-stage1/less b/i486-stage1/less/DESCR index a4c1acd..a4c1acd 100644 --- a/packages-i486-stage1/less +++ b/i486-stage1/less/DESCR diff --git a/packages-i486-stage1/libarchive b/i486-stage1/libarchive/DESCR index 0a42942..0a42942 100644 --- a/packages-i486-stage1/libarchive +++ b/i486-stage1/libarchive/DESCR diff --git a/packages-i486-stage1/libcap b/i486-stage1/libcap/DESCR index c58fb49..c58fb49 100644 --- a/packages-i486-stage1/libcap +++ b/i486-stage1/libcap/DESCR diff --git a/patches-i486-stage1/libcap-2.25-gperf.patch b/i486-stage1/libcap/libcap-2.25-gperf.patch index ddce2c4..ddce2c4 100644 --- a/patches-i486-stage1/libcap-2.25-gperf.patch +++ b/i486-stage1/libcap/libcap-2.25-gperf.patch diff --git a/packages-i486-stage1/libedit b/i486-stage1/libedit/DESCR index 6ee9176..6ee9176 100644 --- a/packages-i486-stage1/libedit +++ b/i486-stage1/libedit/DESCR diff --git a/packages-i486-stage1/libmnl b/i486-stage1/libmnl/DESCR index e613146..e613146 100644 --- a/packages-i486-stage1/libmnl +++ b/i486-stage1/libmnl/DESCR diff --git a/packages-i486-stage1/libnfnetlink b/i486-stage1/libnfnetlink/DESCR index 8aa6d2d..8aa6d2d 100644 --- a/packages-i486-stage1/libnfnetlink +++ b/i486-stage1/libnfnetlink/DESCR diff --git a/packages-i486-stage1/libtirpc b/i486-stage1/libtirpc/DESCR index 58b2b4f..58b2b4f 100644 --- a/packages-i486-stage1/libtirpc +++ b/i486-stage1/libtirpc/DESCR diff --git a/patches-i486-stage1/libtirpc-1.0.2-stdint.patch b/i486-stage1/libtirpc/libtirpc-1.0.2-stdint.patch index 5d65359..5d65359 100644 --- a/patches-i486-stage1/libtirpc-1.0.2-stdint.patch +++ b/i486-stage1/libtirpc/libtirpc-1.0.2-stdint.patch diff --git a/packages-i486-stage1/linux-api-headers b/i486-stage1/linux-api-headers/DESCR index b2ad3b4..b2ad3b4 100644 --- a/packages-i486-stage1/linux-api-headers +++ b/i486-stage1/linux-api-headers/DESCR diff --git a/packages-i486-stage1/linux b/i486-stage1/linux/DESCR index 09714f2..09714f2 100644 --- a/packages-i486-stage1/linux +++ b/i486-stage1/linux/DESCR diff --git a/packages-i486-stage1/lz4 b/i486-stage1/lz4/DESCR index 2dae4e8..2dae4e8 100644 --- a/packages-i486-stage1/lz4 +++ b/i486-stage1/lz4/DESCR diff --git a/packages-i486-stage1/ncurses b/i486-stage1/ncurses/DESCR index f74cd4e..f74cd4e 100644 --- a/packages-i486-stage1/ncurses +++ b/i486-stage1/ncurses/DESCR diff --git a/packages-i486-stage1/net-tools b/i486-stage1/net-tools/DESCR index e0227f8..e0227f8 100644 --- a/packages-i486-stage1/net-tools +++ b/i486-stage1/net-tools/DESCR diff --git a/patches-i486-stage1/net-tools-1.60-if_tunnel.patch b/i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch index 82aa34b..82aa34b 100644 --- a/patches-i486-stage1/net-tools-1.60-if_tunnel.patch +++ b/i486-stage1/net-tools/net-tools-1.60-if_tunnel.patch diff --git a/packages-i486-stage1/openssh b/i486-stage1/openssh/DESCR index 453eaff..453eaff 100644 --- a/packages-i486-stage1/openssh +++ b/i486-stage1/openssh/DESCR diff --git a/packages-i486-stage1/openssl b/i486-stage1/openssl/DESCR index 6e67468..6e67468 100644 --- a/packages-i486-stage1/openssl +++ b/i486-stage1/openssl/DESCR diff --git a/packages-i486-stage1/pam b/i486-stage1/pam/DESCR index 24f403e..24f403e 100644 --- a/packages-i486-stage1/pam +++ b/i486-stage1/pam/DESCR diff --git a/patches-i486-stage1/pam-1.3.0-unix-passwd-no-yp.patch b/i486-stage1/pam/pam-1.3.0-unix-passwd-no-yp.patch index 1ac4a11..1ac4a11 100644 --- a/patches-i486-stage1/pam-1.3.0-unix-passwd-no-yp.patch +++ b/i486-stage1/pam/pam-1.3.0-unix-passwd-no-yp.patch diff --git a/packages-i486-stage1/pambase b/i486-stage1/pambase/DESCR index 5cdb578..5cdb578 100644 --- a/packages-i486-stage1/pambase +++ b/i486-stage1/pambase/DESCR diff --git a/packages-i486-stage1/patch b/i486-stage1/patch/DESCR index 1995b5a..1995b5a 100644 --- a/packages-i486-stage1/patch +++ b/i486-stage1/patch/DESCR diff --git a/packages-i486-stage1/pcre b/i486-stage1/pcre/DESCR index 8445c25..8445c25 100644 --- a/packages-i486-stage1/pcre +++ b/i486-stage1/pcre/DESCR diff --git a/packages-i486-stage1/perl b/i486-stage1/perl/DESCR index 80032bf..80032bf 100644 --- a/packages-i486-stage1/perl +++ b/i486-stage1/perl/DESCR diff --git a/packages-i486-stage1/procps-ng b/i486-stage1/procps-ng/DESCR index 26d5bff..26d5bff 100644 --- a/packages-i486-stage1/procps-ng +++ b/i486-stage1/procps-ng/DESCR diff --git a/packages-i486-stage1/readline b/i486-stage1/readline/DESCR index 205f8d5..205f8d5 100644 --- a/packages-i486-stage1/readline +++ b/i486-stage1/readline/DESCR diff --git a/packages-i486-stage1/sed b/i486-stage1/sed/DESCR index e0c5138..e0c5138 100644 --- a/packages-i486-stage1/sed +++ b/i486-stage1/sed/DESCR diff --git a/packages-i486-stage1/shadow b/i486-stage1/shadow/DESCR index ff12a87..ff12a87 100644 --- a/packages-i486-stage1/shadow +++ b/i486-stage1/shadow/DESCR diff --git a/packages-i486-stage1/tar b/i486-stage1/tar/DESCR index 420e179..420e179 100644 --- a/packages-i486-stage1/tar +++ b/i486-stage1/tar/DESCR diff --git a/packages-i486-stage1/template b/i486-stage1/template/DESCR index faa5d7f..faa5d7f 100644 --- a/packages-i486-stage1/template +++ b/i486-stage1/template/DESCR diff --git a/packages-i486-stage1/texinfo b/i486-stage1/texinfo/DESCR index 8d6ff65..8d6ff65 100644 --- a/packages-i486-stage1/texinfo +++ b/i486-stage1/texinfo/DESCR diff --git a/packages-i486-stage1/uinit b/i486-stage1/uinit/DESCR index 34a987d..34a987d 100644 --- a/packages-i486-stage1/uinit +++ b/i486-stage1/uinit/DESCR diff --git a/packages-i486-stage1/util-linux b/i486-stage1/util-linux/DESCR index 38e4b24..38e4b24 100644 --- a/packages-i486-stage1/util-linux +++ b/i486-stage1/util-linux/DESCR diff --git a/packages-i486-stage1/xz b/i486-stage1/xz/DESCR index 6b043fe..6b043fe 100644 --- a/packages-i486-stage1/xz +++ b/i486-stage1/xz/DESCR diff --git a/packages-i486-stage1/zlib b/i486-stage1/zlib/DESCR index 32df420..32df420 100644 --- a/packages-i486-stage1/zlib +++ b/i486-stage1/zlib/DESCR |