diff options
| -rw-r--r-- | README | 23 | ||||
| -rwxr-xr-x | build_stage1.sh | 2 | ||||
| -rwxr-xr-x | build_stage1_package.sh | 4 | ||||
| -rw-r--r-- | i486-stage1/glibc/DESCR | 17 |
4 files changed, 20 insertions, 26 deletions
@@ -166,7 +166,6 @@ su cross ./create_cdrom.sh # basic packages PACKAGES=" \ -glibc \ # TODO: iputils is for ping only, a little bit too many packages for # that. sysfsutils libidn nettle iputils" @@ -215,28 +214,6 @@ sed -i 's@./configure@./configure --host=i486-unknown-linux-gnu --build=x86_64-p -# glibc -sed -i 's@/configure"@/configure" --host=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu@g' PKGBUILD -# change bug reporting -sed -i 's@https://bugs.archlinux.org/@https://bugs.archlinux32.org/@g' PKGBUILD -# disable multilib, we are on 32-bit only -sed -i 's@--enable-multi-arch@--disable-multi-arch@g' PKGBUILD -# git for release checkouts, a bad idea IMHO, current git+https is commented out in trunk anyway -sed -i "/makedepends/s/git//g" PKGBUILD -# gd for memory profiles, no please -sed -i "/makedepends/s/gd//g" PKGBUILD -cat ~/packages32/core/glibc/PKGBUILD >> PKGBUILD -sed -i "/makedepends/s/lib32-gcc-libs//g" PKGBUILD -sed -i "/pkgname/s/lib32-glibc//g" PKGBUILD - - - - - - - - - # libidn diff --git a/build_stage1.sh b/build_stage1.sh index f2d27a0..b45464e 100755 --- a/build_stage1.sh +++ b/build_stage1.sh @@ -15,7 +15,7 @@ util-linux e2fsprogs expat bzip2 lz4 xz pcre less gzip tar libarchive curl pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman fakeroot elfutils -make mpfr gawk libmpc binutils gcc +make mpfr gawk libmpc binutils gcc glibc sed texinfo grep findutils file diffutils ed patch kbd procps-ng shadow inetutils bc kmod linux uinit diff --git a/build_stage1_package.sh b/build_stage1_package.sh index f4aac23..18ca632 100755 --- a/build_stage1_package.sh +++ b/build_stage1_package.sh @@ -19,9 +19,9 @@ export PATH="$XTOOLS_ARCH/bin:${PATH}" . "$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 +if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Q | cut -f 1 -d ' ' | grep -c "^${PACKAGE}$") = 0 -o $(find $STAGE1_PACKAGES/$PACKAGE-*pkg.tar.xz 2>/dev/null | grep -v shim | wc -l) = 0; then echo "Building package $PACKAGE." - + cd $STAGE1_BUILD || exit 1 # clean up old build diff --git a/i486-stage1/glibc/DESCR b/i486-stage1/glibc/DESCR new file mode 100644 index 0000000..0183d96 --- /dev/null +++ b/i486-stage1/glibc/DESCR @@ -0,0 +1,17 @@ +# prepare configure for cross-compilation +sed -i "s@/configure\"@/configure\" --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD + +# disable multilib, we are on 32-bit only +sed -i 's@--enable-multi-arch@--disable-multi-arch@g' PKGBUILD +sed -i "/makedepends=/s/lib32-gcc-libs//g" PKGBUILD +sed -i "/pkgname/s/lib32-glibc//g" PKGBUILD + +# change bug reporting +sed -i 's@https://bugs.archlinux.org/@https://bugs.archlinux32.org/@g' PKGBUILD + +# git for release checkouts, a bad idea IMHO, current git+https is commented out in trunk anyway +sed -i "/makedepends=/s/git//" PKGBUILD + +# no gd for memory profiles +sed -i "/makedepends=/s/gd//" PKGBUILD + |