From b445d69f041062e4695cb23d656fb8613fcf381c Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 15 Mar 2018 21:17:04 +0100
Subject: stage4: building with docu and tests up to help2man

---
 build_stage4.sh           | 58 ++++++++++++++++++++---------------------------
 build_stage4_package.sh   |  2 +-
 create_hdd.sh             |  7 ++++++
 i486-stage4/openssl/DESCR |  5 ++++
 4 files changed, 38 insertions(+), 34 deletions(-)
 create mode 100644 i486-stage4/openssl/DESCR

diff --git a/build_stage4.sh b/build_stage4.sh
index 40c1adb..ea4f7d7 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -9,10 +9,33 @@
 # to the $STAGE4_PACKAGES to speed up rebuild of the state of the stage 4
 # system in case of destroying it.
 
-PACKAGES=""
+PACKAGES="iana-etc filesystem linux-api-headers tzdata
+ncurses readline bash joe nano vi
+attr acl m4 gmp gdbm db perl openssl
+libunistring gettext perl-locale-gettext help2man
+autoconf
+"
+
+#~ stage2:
+#~ PACKAGES="
+#~    
+#~     
+#~    automake perl-error pcre2 git libtool
+#~ zlib pambase cracklib libtirpc flex pam libcap coreutils
+#~ util-linux pkg-config e2fsprogs expat bzip2 lz4 xz pcre less gzip
+#~ tar libarchive curl
+#~ pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman
+#~ elfutils sed texinfo grep findutils file diffutils ed patch
+#~ fakeroot
+#~ kbd procps-ng bison shadow
+#~ inetutils bc kmod linux uinit nasm 
+#~ net-tools libmnl libnfnetlink iptables iproute2
+#~ libedit openssh
+#~ make mpfr gawk libmpc binutils gcc glibc
+#~ libunwind strace gdb
+#~ "
 
 # Archlinux base, base-devel groups
-#~ bash
 #~ bzip2
 #~ coreutils
 #~ cryptsetup
@@ -21,12 +44,10 @@ PACKAGES=""
 #~ diffutils
 #~ e2fsprogs
 #~ file
-#~ filesystem
 #~ findutils
 #~ gawk
 #~ gcc-libs
 #~ gcc-libs
-#~ gettext
 #~ glibc
 #~ grep
 #~ gzip
@@ -42,12 +63,10 @@ PACKAGES=""
 #~ man-db
 #~ man-pages
 #~ mdadm
-#~ nano
 #~ netctl
 #~ pacman
 #~ pciutils
 #~ pcmciautils
-#~ perl
 #~ procps-ng
 #~ psmisc
 #~ reiserfsprogs
@@ -60,14 +79,11 @@ PACKAGES=""
 #~ texinfo
 #~ usbutils
 #~ util-linux
-#~ vi
 #~ which
 #~ xfsprogs
 
-#~ autoconf
 #~ automake
 #~ binutils
-#~ binutils
 #~ bison
 #~ fakeroot
 #~ file
@@ -75,14 +91,11 @@ PACKAGES=""
 #~ flex
 #~ gawk
 #~ gcc
-#~ gcc
 #~ gettext
 #~ grep
 #~ groff
 #~ gzip
 #~ libtool
-#~ libtool
-#~ m4
 #~ make
 #~ pacman
 #~ patch
@@ -94,27 +107,6 @@ PACKAGES=""
 #~ util-linux
 #~ which
 
-#~ stage2:
-#~ PACKAGES="bash
-#~ iana-etc filesystem linux-api-headers tzdata
-#~ ncurses readline joe
-#~ attr acl m4 gmp gdbm db perl openssl
-#~ libunistring gettext perl-locale-gettext help2man
-#~ autoconf automake perl-error pcre2 git libtool
-#~ zlib pambase cracklib libtirpc flex pam libcap coreutils
-#~ util-linux pkg-config e2fsprogs expat bzip2 lz4 xz pcre less gzip
-#~ tar libarchive curl
-#~ pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman
-#~ elfutils sed texinfo grep findutils file diffutils ed patch
-#~ fakeroot
-#~ kbd procps-ng bison shadow
-#~ inetutils bc kmod linux uinit nasm 
-#~ net-tools libmnl libnfnetlink iptables iproute2
-#~ libedit openssh
-#~ make mpfr gawk libmpc binutils gcc glibc
-#~ libunwind strace gdb
-#~ "
-
 for p in $PACKAGES; do
 	"$SCRIPT_DIR/build_stage4_package.sh" "$p" || exit 1
 done
diff --git a/build_stage4_package.sh b/build_stage4_package.sh
index de9d71b..4cc6502 100755
--- a/build_stage4_package.sh
+++ b/build_stage4_package.sh
@@ -102,7 +102,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 
 	echo "Building $PACKAGE on target.."
 	
-	ssh -i $CROSS_HOME/.ssh/id_rsa build@$STAGE1_MACHINE_IP bash -c "'cd $PACKAGE && makepkg --skipchecksums --skippgpcheck --nocheck'" > $PACKAGE.log 2>&1
+	ssh -i $CROSS_HOME/.ssh/id_rsa build@$STAGE1_MACHINE_IP bash -c "'cd $PACKAGE && makepkg --skipchecksums --skippgpcheck'" > $PACKAGE.log 2>&1
 	RES=$?
 	
 	tail "$PACKAGE.log"
diff --git a/create_hdd.sh b/create_hdd.sh
index 38829da..8f65923 100755
--- a/create_hdd.sh
+++ b/create_hdd.sh
@@ -58,6 +58,8 @@ mount -t sysfs sys /sys
 mkdir /dev/shm
 mount -t tmpfs shm /dev/shm
 mount -o remount,rw /
+ip link set up dev lo
+ip addr add 127.0.0.1/8 dev lo
 ip link set up dev eth0
 ip addr add ${STAGE1_MACHINE_IP}/24 dev eth0
 ip route add default via 192.168.1.1 dev eth0
@@ -68,6 +70,11 @@ cat > etc/resolv.conf <<EOF
 nameserver 192.168.1.1
 EOF
 
+# have a host name for IPv4 loopback
+cat > etc/hosts <<EOF
+127.0.0.1       localhost.localdomain   localhost
+EOF
+
 # SSH confiuration: nobody user and host keys, keys for key based login
 
 cat >> etc/group <<EOF
diff --git a/i486-stage4/openssl/DESCR b/i486-stage4/openssl/DESCR
new file mode 100644
index 0000000..69d65f7
--- /dev/null
+++ b/i486-stage4/openssl/DESCR
@@ -0,0 +1,5 @@
+sed -i "s@'i686'@'$TARGET_CPU'@g" PKGBUILD
+sed -i "s@'linux-elf'@'linux-generic32'@g" PKGBUILD
+sed -i 's@shared no-ssl3-method ${optflags}@shared ${optflags}@' PKGBUILD
+
+# pod2man fails during building of documentation, not dramatic, ignoring that.
-- 
cgit v1.2.3-54-g00ecf