From 2d2dc3a222e422e49082e0031ac53118c1957a7e Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 24 Feb 2018 21:16:25 +0100
Subject: building stage3 up to joe

---
 TODOS                   |  4 ++++
 build_stage3.sh         | 48 +++++++++++++++++++++++-------------------------
 build_stage3_package.sh |  8 ++++----
 default.conf            |  2 +-
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/TODOS b/TODOS
index 3823783..7484b87 100644
--- a/TODOS
+++ b/TODOS
@@ -84,3 +84,7 @@ stage2 issues:
   for stage3
 
 stage 3 issues:
+- some packages don't install (also in stage 1): iana-etc, filesystem
+- withoud -x the messages of the build script are a little bit weird, add
+  some verbose output again
+  
diff --git a/build_stage3.sh b/build_stage3.sh
index 18c9dcb..d1e60cd 100755
--- a/build_stage3.sh
+++ b/build_stage3.sh
@@ -9,12 +9,32 @@
 # to the $STAGE3_PACKAGES to speed up rebuild of the state of the stage 2
 # system in case of destroying it.
 
-PACKAGES="which"
+PACKAGES="iana-etc filesystem linux-api-headers tzdata
+ncurses readline bash joe
+attr acl"
+
+#~ stage2:
+#~  
+#~  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
+#~ "
+#~ #TODO after nasm: syslinux
 
 # stage3 (from compute_dependencies.sh)
-#~ acl: attr 
 #~ argon2: glibc 
-#~ attr: glibc 
 #~ autoconf: awk m4 diffutils sh 
 #~ automake: perl bash 
 #~ bash: readline glibc ncurses 
@@ -37,7 +57,6 @@ PACKAGES="which"
 #~ expat: glibc 
 #~ fakeroot: glibc filesystem sed util-linux sh 
 #~ file: glibc zlib 
-#~ filesystem: iana-etc 
 #~ findutils: glibc sh 
 #~ flex: glibc m4 sh 
 #~ gawk: sh glibc mpfr 
@@ -146,27 +165,6 @@ PACKAGES="which"
 #~ xz: sh 
 #~ zlib: glibc 
 
-#~ stage2:
-#~ 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
-#~ "
-#~ #TODO after nasm: syslinux
 
 for p in $PACKAGES; do
 	"$SCRIPT_DIR/build_stage3_package.sh" "$p" || exit 1
diff --git a/build_stage3_package.sh b/build_stage3_package.sh
index fa2d018..1c1242e 100755
--- a/build_stage3_package.sh
+++ b/build_stage3_package.sh
@@ -119,10 +119,10 @@ if test "$(find "$STAGE3_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 		# there, packages seem to reappear in old versions)
 
 		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'
-			rm -rf /var/cache/pacman/pkg/*
-			rm -rf /packages/$TARGET_CPU/temp.db*
-			rm -rf /packages/$TARGET_CPU/temp.files*
-			repo-add /packages/$TARGET_CPU/temp.db.tar.gz /packages/$TARGET_CPU/*pkg.tar.xz
+#			rm -rf /var/cache/pacman/pkg/*
+#			rm -rf /packages/$TARGET_CPU/temp.db*
+#			rm -rf /packages/$TARGET_CPU/temp.files*
+#			repo-add /packages/$TARGET_CPU/temp.db.tar.gz /packages/$TARGET_CPU/*pkg.tar.xz
 		'"
 		
 		# install onto stage 1 system via pacman
diff --git a/default.conf b/default.conf
index b5a89ed..ae4a9a1 100644
--- a/default.conf
+++ b/default.conf
@@ -71,7 +71,7 @@ GIT_URL_ARCHLINUX32_PACKAGES=https://github.com/archlinux32/packages.git
 ARCHLINUX32_PACKAGES=$CROSS_HOME/packages32
 
 # uncomment to debug scripts
-set -x
+#set -x
 
 # some default variables, not to be changed
 SCRIPT=$(sudo realpath -s "$0")
-- 
cgit v1.2.3-54-g00ecf