summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-03-31 19:42:18 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-03-31 19:42:18 +0200
commit7a8ddbf9cb8b2204687bb1774a1cb2222ce50be9 (patch)
tree04864a60e82bbcf0fccfd8f16beb441f844e6dea
parentdb55b0cb8ec387d6eca65eaebbd428fdc12510ba (diff)
downloadbootstrap32-7a8ddbf9cb8b2204687bb1774a1cb2222ce50be9.tar.xz
built up to glibc
-rwxr-xr-xbuild_stage4.sh18
-rw-r--r--i486-stage4/glibc/DESCR13
-rw-r--r--i486-stage4/mkinitcpio-nbd/DESCR1
3 files changed, 18 insertions, 14 deletions
diff --git a/build_stage4.sh b/build_stage4.sh
index 19eb02e..94bafa0 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -75,23 +75,13 @@ procps-ng pcmciautils openresolv netctl dhcpcd
desktop-file-utils glib2 pkg-config
jfsutils reiserfsprogs xfsprogs sysfsutils
libaio boost thin-provisioning-tools lvm2
-mpfr gawk libmpc binutils gcc
+mpfr gawk libmpc binutils gcc glibc
links licenses
+nbd mkinitcpio-nfs-utils mkinitcpio-nbd atftp
+zip nspr gyp
"
-#~ glibc
-#~
-
-#~ zip nspr gyp nss
-
-
-#~ glibc
-
-# Archlinux base, base-devel groups
-#~ gcc-libs
-#~ glibc
-#~
-#~ licenses
+# nss still fails as in stage 3
for p in $PACKAGES; do
"$SCRIPT_DIR/build_stage4_package.sh" "$p" || exit 1
diff --git a/i486-stage4/glibc/DESCR b/i486-stage4/glibc/DESCR
new file mode 100644
index 0000000..42a58e8
--- /dev/null
+++ b/i486-stage4/glibc/DESCR
@@ -0,0 +1,13 @@
+# 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
+
+# no gd for memory profiles
+sed -i "/makedepends=/s/gd//" PKGBUILD
+
+# disable testing, even with 4GB RAM tests hang!
+SKIP_CHECK=1
diff --git a/i486-stage4/mkinitcpio-nbd/DESCR b/i486-stage4/mkinitcpio-nbd/DESCR
new file mode 100644
index 0000000..79a7fb3
--- /dev/null
+++ b/i486-stage4/mkinitcpio-nbd/DESCR
@@ -0,0 +1 @@
+FETCH_METHOD="yaourt"