From 88b8131480f6a0a77cc0f00dbeb3b45eceb9a261 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Thu, 8 Nov 2012 17:46:57 -0700
Subject: minor cleanup to stage1 script, stage2 step

---
 stage1 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/stage1 b/stage1
index 4f2edfa..938d96a 100755
--- a/stage1
+++ b/stage1
@@ -921,7 +921,6 @@ EOF
 	    WITH_SELINUX=yes \
             -C src
         make install ROOT=${ROOTFS}
-        echo 'id:S:initdefault:' > ${ROOTFS}/etc/inittab
         ;;
 
      util-linux )
@@ -1045,12 +1044,10 @@ EOF
 	cp $STAGE2 $ROOTFS/stage2/stage2
 
 	(
-	    #newJ=$(echo $J | sed 's/-j//')
-	    #echo J=-j$newJ
-            echo J=-j1
+	    newJ=$(echo $J | sed 's/-j//')
+	    echo J=-j$newJ
 
-	    #echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999
-	    echo DISTCC_HOSTS=localhost
+	    echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999
 	    echo DISTCC_BACKOFF_PERIOD=0
 	    echo PATH=/stage2/distcc-bin:\$PATH
 
@@ -1063,7 +1060,9 @@ EOF
 		| sed 's/--host=[^ ]*//' \
 		| sed 's/--target=[^ ]*//' \
 		| sed 's/--with-sysroot=[^ ]*//' \
-		| sed 's/--with-build-sysroot=[^ ]*//'
+		| sed 's/--with-build-sysroot=[^ ]*//' \
+		| sed 's/--with-arch=armv8//' \
+		| sed 's/--with-fpu=neon-fp-armv8//'
 
 	    echo export J DISTCC_HOSTS DISTCC_BACKOFF_PERIOD PATH
 	    echo export TARGET RPMTARGET TCONFIGARGS
-- 
cgit