From 2f578141b1a7ba3de5a5a2a8400e07c226202009 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 2 Feb 2018 16:05:49 +0100
Subject: building now propertly up to iproute2 (was without iptables before)

---
 README                        | 18 +-----------------
 build_stage1.sh               |  2 +-
 packages-i486-stage1/iproute2 |  5 +++++
 packages-i486-stage1/iptables | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 packages-i486-stage1/iproute2
 create mode 100644 packages-i486-stage1/iptables

diff --git a/README b/README
index 2d3f6f1..671ffa4 100644
--- a/README
+++ b/README
@@ -169,18 +169,16 @@ archlinux-keyring archlinux32-keyring pacman-mirrorlist pacman \
 make mpfr gawk libmpc binutils gcc \
  linux   uinit \
 glibc \
-   iptables iproute2 \
 libedit openssh \
 sysfsutils libidn nettle iputils"
 # libunwind
 
 # mpfr for gawk, gcc
-# iptables for iproute2
 # libedit for openssh
 # sysfsutils and libidn, nettle for iputils
 SYSROOT_PACKAGES=" \
   \
-file libmpc mpfr iptables \
+file libmpc mpfr \
 libedit sysfsutils libidn"
 
 
@@ -346,21 +344,7 @@ sed -i "/pkgname/s/lib32-glibc//g" PKGBUILD
 
 
 
-# iptables
-sed -i 's@./configure@./configure --host=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu@g' iptables/PKGBUILD
-sed -i 's@--enable-bpf-compiler@--disable-bpf-compiler@g' iptables/PKGBUILD
-# disable nftable support, draws in more libraries, we need the xtables depevelopment mainly now for iproute2
-sed -i 's@./configure@./configure --disable-nftables@' iptables/PKGBUILD
-# disable connection tracking
-sed -i 's@./configure@./configure --disable-connlabel@' iptables/PKGBUILD
 
-# iproute2
-# cross-compilation and verbosity flags
-sed -i "s@make\$@make V=1 CC=i486-unknown-linux-gnu-cc AR=i486-unknown-linux-gnu-ar@g" iproute2/PKGBUILD
-# disabled iptables (too many dependencies)
-# disable linux-atm (unlikely we have such a hardware for i486)
-sed -i 's@^makedepends\(.*\)@#makedepends\1@g' iproute2/PKGBUILD
-sed -i 's@^depends\(.*\)@#depends\1@g' iproute2/PKGBUILD
 
 # libedit
 sed -i 's@./configure@./configure --host=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu@g' libedit/PKGBUILD
diff --git a/build_stage1.sh b/build_stage1.sh
index 37045d6..73ef55f 100755
--- a/build_stage1.sh
+++ b/build_stage1.sh
@@ -17,7 +17,7 @@ elfutils
 sed texinfo grep findutils file diffutils ed patch
 kbd procps-ng shadow
 
-net-tools libmnl libnfnetlink"
+net-tools libmnl libnfnetlink iptables iproute2"
 
 for p in $PACKAGES; do
 	"$SCRIPT_DIR/build_stage1_package.sh" "$p" || exit 1
diff --git a/packages-i486-stage1/iproute2 b/packages-i486-stage1/iproute2
new file mode 100644
index 0000000..a380e81
--- /dev/null
+++ b/packages-i486-stage1/iproute2
@@ -0,0 +1,5 @@
+# cross-compilation and verbosity flags
+sed -i "s@make\$@make V=1 HOSTCC=gcc CC=$TARGET_ARCH-cc AR=$TARGET_ARCH-ar@g" PKGBUILD
+
+# disable linux-atm (unlikely we still have some ATM based networks)
+sed -i "/makedepends=/s/'linux-atm'//" PKGBUILD
diff --git a/packages-i486-stage1/iptables b/packages-i486-stage1/iptables
new file mode 100644
index 0000000..8e9c1c9
--- /dev/null
+++ b/packages-i486-stage1/iptables
@@ -0,0 +1,19 @@
+# iptables is needed by iproute2
+SYSROOT_INSTALL=1
+
+# prepare configure for cross-compilation
+sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
+
+# disable Berkley Packet Filtering
+sed -i 's@--enable-bpf-compiler@--disable-bpf-compiler@g' PKGBUILD
+
+# disable nftable support, draws in more libraries, we need the xtables
+# depevelopment mainly now for iproute2
+sed -i "/depends=/s/libnftnl//" PKGBUILD
+sed -i 's@./configure@./configure --disable-nftables@' PKGBUILD
+
+# disable libpcap (tcpdump, draws in too many dependencies)
+sed -i "/depends=/s/libpcap//" PKGBUILD
+
+# disable connection tracking
+sed -i 's@./configure@./configure --disable-connlabel@' PKGBUILD
-- 
cgit v1.2.3-54-g00ecf