From cb8edbf9ec88a457e715b3592e30a9884e8cbfd6 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 23 Mar 2018 11:07:48 +0100
Subject: building git, some fixes with login shells in ssh

---
 build_stage4.sh           |  4 ++--
 build_stage4_package.sh   | 12 ++++++------
 create_hdd.sh             |  4 ----
 i486-stage2/pcre2/DESCR   |  6 ++++++
 i486-stage3/pcre2/DESCR   |  6 ++++++
 i486-stage4/git/DESCR     | 12 ++++++++++++
 i486-stage4/libtool/DESCR | 12 ++++++++++++
 7 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 i486-stage2/pcre2/DESCR
 create mode 100644 i486-stage3/pcre2/DESCR
 create mode 100644 i486-stage4/libtool/DESCR

diff --git a/build_stage4.sh b/build_stage4.sh
index 4859a64..a91be6f 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -18,13 +18,14 @@ autoconf tcl expect dejagnu cscope automake
 perl-test-pod perl-devel-symdump perl-pod-coverage
 perl-test-pod-coverage perl-error pcre2
 docbook-xml libxslt docbook-xsl xmlto asciidoc git
+libtool
 "
 
 #~ stage2:
 #~ PACKAGES="
 #~    
 #~     
-#~        libtool
+#~        
 #~ zlib pambase cracklib libtirpc flex pam libcap coreutils
 #~ util-linux pkg-config e2fsprogs expat bzip2 lz4 xz pcre less gzip
 #~ tar libarchive curl
@@ -99,7 +100,6 @@ docbook-xml libxslt docbook-xsl xmlto asciidoc git
 #~ grep
 #~ groff
 #~ gzip
-#~ libtool
 #~ make
 #~ pacman
 #~ patch
diff --git a/build_stage4_package.sh b/build_stage4_package.sh
index ad3a656..f2fbc70 100755
--- a/build_stage4_package.sh
+++ b/build_stage4_package.sh
@@ -108,7 +108,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 		TESTING=""
 	fi
 	
-	ssh -i $CROSS_HOME/.ssh/id_rsa build@$STAGE1_MACHINE_IP bash -c "'cd $PACKAGE && makepkg --skipchecksums --skippgpcheck $TESTING'" > $PACKAGE.log 2>&1
+	ssh -i $CROSS_HOME/.ssh/id_rsa build@$STAGE1_MACHINE_IP bash -l -c "'cd $PACKAGE && makepkg --skipchecksums --skippgpcheck $TESTING'" > $PACKAGE.log 2>&1
 	RES=$?
 	
 	tail "$PACKAGE.log"
@@ -119,7 +119,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 
 		# copy to our package folder in the first stage chroot
 		
-		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'
+		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -l -c "'
 			cd /build/$PACKAGE
 			rm -f ./*debug*.pkg.tar.xz
 			cp -v ./*.pkg.tar.xz /packages/$TARGET_CPU/.
@@ -128,7 +128,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 		# redo the whole pacman cache and repo (always running into trouble
 		# there, packages seem to reappear in old versions)
 
-		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'
+		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -l -c "'
 #			rm -rf /var/cache/pacman/pkg/*
 #			rm -rf /packages/$TARGET_CPU/temp.db*
 #			rm -rf /packages/$TARGET_CPU/temp.files*
@@ -141,7 +141,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 			FORCE="--force"
 		fi
 		
-		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'		
+		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -l -c "'		
 			# TODO: broken [temp] repo
 			if test \"$ADDITIONAL_INSTALL_PACKAGE\" != \"\"; then
 				#pacman $FORCE --noconfirm -Syy $PACKAGE $ADDITIONAL_INSTALL_PACKAGE
@@ -163,9 +163,9 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 		mv "$STAGE4_BUILD/$PACKAGE/$PACKAGE.log" "$tmp_dir"
 		cd "$STAGE4_BUILD" || exit 1
 		rm -rf "$PACKAGE"
-		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'cd /build && tar zcf $PACKAGE.tar.gz $PACKAGE/'"		
+		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -l -c "'cd /build && tar zcf $PACKAGE.tar.gz $PACKAGE/'"		
 		scp -i $CROSS_HOME/.ssh/id_rsa -rC build@$STAGE1_MACHINE_IP:/build/"$PACKAGE.tar.gz" "$STAGE4_BUILD/."
-		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'cd /build && rm -f $PACKAGE.tar.gz'"		
+		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -l -c "'cd /build && rm -f $PACKAGE.tar.gz'"		
 		tar zxf "$PACKAGE.tar.gz"
 		rm -f "$PACKAGE.tar.gz"
 		mv "$tmp_dir/$PACKAGE.log" "$STAGE4_BUILD/$PACKAGE/."
diff --git a/create_hdd.sh b/create_hdd.sh
index f7b5c99..8f65923 100755
--- a/create_hdd.sh
+++ b/create_hdd.sh
@@ -111,10 +111,6 @@ cp "$HOME/.ssh/id_rsa.pub" build/.ssh/authorized_keys
 chown 1001:1001 build
 # default PAM rules expect a password to be set for su?
 echo 'build:xx' | chpasswd
-cat > build/.bashrc <<EOF
-export PATH=$PATH:/usr/bin/core_perl
-EOF
-chmod 0775 build/.bashrc
 
 # add some test programs to test the C and C++ compiler
 
diff --git a/i486-stage2/pcre2/DESCR b/i486-stage2/pcre2/DESCR
new file mode 100644
index 0000000..56ea041
--- /dev/null
+++ b/i486-stage2/pcre2/DESCR
@@ -0,0 +1,6 @@
+# pcre2 configure, overload CFLAGS and CXXFLAGS to avoid optimization
+# using MMX registers (default in gcc)
+sed -i 's@./configure@CFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" ./configure@' PKGBUILD
+
+# disable JIT, contains hard coded XMM registers
+sed -i 's/--enable-jit/--disable-jit/' PKGBUILD
diff --git a/i486-stage3/pcre2/DESCR b/i486-stage3/pcre2/DESCR
new file mode 100644
index 0000000..56ea041
--- /dev/null
+++ b/i486-stage3/pcre2/DESCR
@@ -0,0 +1,6 @@
+# pcre2 configure, overload CFLAGS and CXXFLAGS to avoid optimization
+# using MMX registers (default in gcc)
+sed -i 's@./configure@CFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" ./configure@' PKGBUILD
+
+# disable JIT, contains hard coded XMM registers
+sed -i 's/--enable-jit/--disable-jit/' PKGBUILD
diff --git a/i486-stage4/git/DESCR b/i486-stage4/git/DESCR
index fc4e5cc..56a5c72 100644
--- a/i486-stage4/git/DESCR
+++ b/i486-stage4/git/DESCR
@@ -6,3 +6,15 @@ sed -i "/# gnome credentials helper/,/#/s/\(.*\)/#\1/" PKGBUILD
 # no libsecret in stage3 currently
 sed -i "s@\(make -C contrib/credential/libsecret\)@#\1@" PKGBUILD
 sed -i "/# libsecret credentials helper/,/#/s/\(.*\)/#\1/" PKGBUILD
+
+#Test Summary Report
+#-------------------
+#t4202-log.sh                                     (Wstat: 256 Tests: 80 Failed: 3)
+#  Failed tests:  26-27, 30
+#  Non-zero exit status: 1
+#t7810-grep.sh                                    (Wstat: 256 Tests: 201 Failed: 5)
+#  Failed tests:  27, 61, 162-163, 181
+#  Non-zero exit status: 1
+#Files=803, Tests=16814, 3417 wallclock secs ( 9.50 usr  5.28 sys + 1676.66 cusr 1665.12 csys = 3356.56 CPU)
+#Result: FAIL
+SKIP_CHECK=1
diff --git a/i486-stage4/libtool/DESCR b/i486-stage4/libtool/DESCR
new file mode 100644
index 0000000..ae91c9d
--- /dev/null
+++ b/i486-stage4/libtool/DESCR
@@ -0,0 +1,12 @@
+# libtool has tests which should be executed!
+sed -i 's/make check || :/make check/' PKGBUILD
+
+# TODO:
+# ==> Starting check()...
+#  GEN      public-submodule-commit
+# fatal: Not a valid commit name 2112962abddd971a395c70611ca86caa86e7b391
+# Stopping at 'gnulib'; script returned non-zero status.
+# maint.mk: found non-public submodule commit
+# make: *** [maint.mk:1405: public-submodule-commit] Error 1
+# ==> ERROR: A failure occurred in check().
+#    Aborting...
-- 
cgit v1.2.3-54-g00ecf