summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-02-03 22:07:26 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2018-02-03 22:07:26 +0100
commit7be0daa504d7c43e20dc5583350417bff8d0f474 (patch)
treef30f43d50cf6fab409e12887c57a71c291ca256d
parent1c13a88a004d30c0ad7f156df7ca19eb94353621 (diff)
downloadbootstrap32-7be0daa504d7c43e20dc5583350417bff8d0f474.tar.xz
added kmod, ineturils for linux, linux itself doesn't build yet
-rwxr-xr-xbuild_stage1.sh4
-rw-r--r--packages-i486-stage1/inetutils6
-rw-r--r--packages-i486-stage1/kmod6
-rw-r--r--packages-i486-stage1/linux8
4 files changed, 17 insertions, 7 deletions
diff --git a/build_stage1.sh b/build_stage1.sh
index f4b00a5..7e3de6b 100755
--- a/build_stage1.sh
+++ b/build_stage1.sh
@@ -11,12 +11,12 @@ PACKAGES="iana-etc filesystem linux-api-headers tzdata
ncurses readline bash joe
attr acl gmp gdbm db perl openssl
zlib pambase cracklib libtirpc pam libcap coreutils
-util-linux inetutils e2fsprogs
+util-linux e2fsprogs
expat bzip2 lz4 xz pcre less gzip tar libarchive curl
elfutils
sed texinfo grep findutils file diffutils ed patch
kbd procps-ng shadow
-bc linux
+inetutils bc kmod linux
net-tools libmnl libnfnetlink iptables iproute2
libedit openssh"
diff --git a/packages-i486-stage1/inetutils b/packages-i486-stage1/inetutils
index aa9cde5..669cd5f 100644
--- a/packages-i486-stage1/inetutils
+++ b/packages-i486-stage1/inetutils
@@ -1,5 +1,11 @@
# prepare configure for cross-compilation
sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+# no libedit, introduces a cycle with linux-headers, libedit
+sed -i "s@./configure@./configure --disable-readline@" PKGBUILD
+
# no man page generation
sed -i "/depends=/s/help2man//" PKGBUILD
+
+# see https://bugs.archlinux.org/task/57352
+sed -i 's@"\(https://ftp.gnu.org/gnu/inetutils.*\)"@\1@g' PKGBUILD
diff --git a/packages-i486-stage1/kmod b/packages-i486-stage1/kmod
new file mode 100644
index 0000000..6039431
--- /dev/null
+++ b/packages-i486-stage1/kmod
@@ -0,0 +1,6 @@
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
+# don't build documentation
+sed -i "/depends=/s/gtk-doc//" PKGBUILD
+sed -i "s/--enable-gtk-doc/--disable-gtk-doc/" PKGBUILD
diff --git a/packages-i486-stage1/linux b/packages-i486-stage1/linux
index 37d75a5..09714f2 100644
--- a/packages-i486-stage1/linux
+++ b/packages-i486-stage1/linux
@@ -6,11 +6,9 @@ sed -i "s@make prepare@make prepare ARCH=$KERNEL_ARCH CROSS_COMPILE=$XTOOLS_ARCH
sed -i "s@make config@make config ARCH=$KERNEL_ARCH CROSS_COMPILE=$XTOOLS_ARCH_PREFIX@g" PKGBUILD
# remove make dependencies, currently we build without module support
+# (TODO: though we can easily build kmod, but we are missing a simple ramdisk for stage1)
sed -i "s@make bzImage modules@make bzImage ARCH=$KERNEL_ARCH CROSS_COMPILE=$XTOOLS_ARCH_PREFIX@g" PKGBUILD
sed -i "s@make modules_install@#make modules_install@g" PKGBUILD
-# TODO: build what's possible, ommit the rest
-# remove dependencies from kernel package, we don't have modules or a ramdisk right now
-#sed -i 's/ \+\(depends=\)/#\1/' PKGBUILD
-# ignore failing hooks on installation, it's just depmod and mkinitcpio which we both don't need
-#sed -i 's@makedepends\(.*\)@#makedepends\1@g' PKGBUILD
+# disable documentation
+sed -i "/depends=/s/xmlto//" PKGBUILD