r3747 - jhalfs/trunk/CLFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Nov 3 14:49:46 PST 2013


Author: pierre
Date: Sun Nov  3 14:49:46 2013
New Revision: 3747

Log:
Incorporates BLFS tools to CLFS. WOrks with method=chroot. Not tested
with method=boot

Modified:
   jhalfs/trunk/CLFS/clfs.xsl
   jhalfs/trunk/CLFS/master.sh

Modified: jhalfs/trunk/CLFS/clfs.xsl
==============================================================================
--- jhalfs/trunk/CLFS/clfs.xsl	Fri Nov  1 13:47:42 2013	(r3746)
+++ jhalfs/trunk/CLFS/clfs.xsl	Sun Nov  3 14:49:46 2013	(r3747)
@@ -6,7 +6,8 @@
 
 <!-- $Id$ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exsl="http://exslt.org/common"
     extension-element-prefixes="exsl"
     version="1.0">
@@ -30,8 +31,8 @@
   -->
   <xsl:param name="bomb-testsuite" select="n"/>
 
-  <!-- Install vim-lang package? -->
-  <xsl:param name="vim-lang" select="y"/>
+  <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
+  <xsl:param name="vim-lang" select="n"/>
 
   <!-- Time zone -->
   <xsl:param name="timezone" select="GMT"/>
@@ -217,17 +218,16 @@
         </xsl:choose>
       </xsl:when>
       <!-- Fixing toolchain test suites run XXX more to fix -->
-      <xsl:when test="string() = 'make check' or
-                contains(string(), 'make -k check')">
+      <xsl:when test="contains(string(),'glibc-check-log')">
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
+            <xsl:value-of select="substring-before(string(),'2>')"/>
             <xsl:choose>
               <xsl:when test="$bomb-testsuite = 'n'">
-                <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+                <xsl:text>>> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:apply-templates/>
-                <xsl:text> >> $TEST_LOG 2>&1</xsl:text>
+                <xsl:text>>> $TEST_LOG 2>&1</xsl:text>
                 <xsl:if test="contains(string(),' -k ')">
                   <xsl:text> || true</xsl:text>
                 </xsl:if>
@@ -237,16 +237,17 @@
           </xsl:when>
         </xsl:choose>
       </xsl:when>
-      <xsl:when test="contains(string(),'glibc-check-log')">
+      <xsl:when test="string() = 'make check' or
+                contains(string(), 'make -k check')">
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
-            <xsl:value-of select="substring-before(string(),'>g')"/>
             <xsl:choose>
               <xsl:when test="$bomb-testsuite = 'n'">
-                <xsl:text>>> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+                <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:text>>> $TEST_LOG 2>&1</xsl:text>
+                <xsl:apply-templates/>
+                <xsl:text> >> $TEST_LOG 2>&1</xsl:text>
                 <xsl:if test="contains(string(),' -k ')">
                   <xsl:text> || true</xsl:text>
                 </xsl:if>
@@ -278,6 +279,13 @@
         <xsl:value-of select="substring-after(string(),'make ')"/>
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
+      <!-- Avoid calling hostname in chroot -->
+      <xsl:when test="ancestor::note[@os='a00']">
+        <xsl:if test="$method='boot'">
+          <xsl:apply-templates/>
+          <xsl:text>&#xA;</xsl:text>
+        </xsl:if>
+      </xsl:when>
       <!-- The rest of commands -->
       <xsl:otherwise>
         <xsl:apply-templates/>

Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh	Fri Nov  1 13:47:42 2013	(r3746)
+++ jhalfs/trunk/CLFS/master.sh	Sun Nov  3 14:49:46 2013	(r3747)
@@ -18,14 +18,14 @@
 cat << EOF
 023-creatingtoolsdir:
 	@\$(call echo_message, Building)
-	@mkdir \$(MOUNT_PT)/tools && \\
+	@install -dv \$(MOUNT_PT)/tools && \\
 	rm -f /tools && \\
 	ln -s \$(MOUNT_PT)/tools /
 	@\$(call housekeeping)
 
 024-creatingcrossdir: 023-creatingtoolsdir
 	@\$(call echo_message, Building)
-	@mkdir -v \$(MOUNT_PT)/cross-tools && \\
+	@install -dv \$(MOUNT_PT)/cross-tools && \\
 	rm -f /cross-tools && \\
 	ln -s \$(MOUNT_PT)/cross-tools /
 	@\$(call housekeeping)
@@ -33,13 +33,15 @@
 025-addinguser:  024-creatingcrossdir
 	@\$(call echo_message, Building)
 	@if [ ! -d \$(LUSER_HOME) ]; then \\
-		groupadd \$(LGROUP); \\
-		useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
+	    groupadd \$(LGROUP); \\
+	    useradd -s /bin/bash -g \$(LGROUP) -d \$(LUSER_HOME) \$(LUSER); \\
+	    mkdir -pv \$(LUSER_HOME); \\
+	    chown -v \$(LUSER):\$(LGROUP) \$(LUSER_HOME); \\
 	else \\
-		touch luser-exist; \\
-	fi;
-	@chown \$(LUSER) \$(MOUNT_PT)/tools && \\
-	chown \$(LUSER) \$(MOUNT_PT)/cross-tools && \\
+	    touch luser-exist; \\
+	fi
+	@chown -v \$(LUSER) \$(MOUNT_PT)/tools && \\
+	chown -v \$(LUSER) \$(MOUNT_PT)/cross-tools && \\
 	chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\
 	chmod a+wt \$(SRCSDIR)
 	@\$(call housekeeping)
@@ -48,7 +50,7 @@
 	@\$(call echo_message, Building)
 	@if [ -f \$(LUSER_HOME)/.bashrc -a ! -f \$(LUSER_HOME)/.bashrc.XXX ]; then \\
 		mv \$(LUSER_HOME)/.bashrc \$(LUSER_HOME)/.bashrc.XXX; \\
-	fi;
+	fi
 	@if [ -f \$(LUSER_HOME)/.bash_profile  -a ! -f \$(LUSER_HOME)/.bash_profile.XXX ]; then \\
 		mv \$(LUSER_HOME)/.bash_profile \$(LUSER_HOME)/.bash_profile.XXX; \\
 	fi;
@@ -556,7 +558,7 @@
       CHROOT_Unpack "$pkg_tarball"
       # If the testsuites must be run, initialize the log file
       case $name in
-        binutils | gcc | glibc | eglibc )
+        binutils | gcc | glibc | eglibc | gmp | mpfr | mpc | isl | cloog )
           [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
           ;;
         * )
@@ -873,8 +875,6 @@
 
   # Add the CUSTOM_TOOLS targets, if needed
   [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target
-  # Add the BLFS_TOOL targets, if needed
-  [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
 
   # Add a header, some variables and include the function file
   # to the top of the real Makefile.
@@ -909,7 +909,8 @@
 all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL
 	@sudo make do-housekeeping
 	@echo "$VERSION - jhalfs build" > clfs-release && \\
-	sudo mv clfs-release \$(MOUNT_PT)/etc
+	sudo mv clfs-release \$(MOUNT_PT)/etc && \\
+	sudo chown root:root \$(MOUNT_PT)/etc/clfs-release
 	@\$(call echo_finished,$VERSION)
 
 ck_UID:
@@ -945,7 +946,14 @@
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT_JAIL")
 	@touch \$@
 
-mk_CUSTOM_TOOLS: create-sbu_du-report
+mk_BLFS_TOOL: create-sbu_du-report
+	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+	  (sudo \$(CHROOT1) "make -C $BLFS_ROOT/work"); \\
+	fi;
+	@touch \$@
+
+mk_CUSTOM_TOOLS: mk_BLFS_TOOL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
@@ -953,14 +961,6 @@
 	fi;
 	@touch \$@
 
-mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
-	  sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"; \\
-	fi;
-	@touch \$@
-
 SETUP:            $host_prep
 AS_LUSER:         $cross_tools $temptools
 SUDO:	          $orphan_scripts
@@ -969,7 +969,6 @@
 CHROOT_JAIL:       SHELL=/tools/bin/bash
 CHROOT_JAIL:      $testsuitetools $basicsystem  $bootscripttools  $bootabletools
 CUSTOM_TOOLS:     $custom_list
-BLFS_TOOL:        $blfs_tool
 
 
 create-sbu_du-report:  mk_SYSTOOLS
@@ -982,7 +981,13 @@
 
 do-housekeeping:
 	@-umount \$(MOUNT_PT)/dev/pts
-	@-umount \$(MOUNT_PT)/dev/shm
+	@-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
+	  link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
+	  umount \$(MOUNT_PT)/\$\$link; \\
+	  unset link; \\
+	else \\
+	  umount \$(MOUNT_PT)/dev/shm; \\
+	fi
 	@-umount \$(MOUNT_PT)/dev
 	@-umount \$(MOUNT_PT)/sys
 	@-umount \$(MOUNT_PT)/proc
@@ -1050,7 +1055,14 @@
 	@( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) AS_ROOT )
 	@touch \$@
 
-mk_CUSTOM_TOOLS: mk_FINAL
+mk_BLFS_TOOL: mk_FINAL
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+          ( make -C $BLFS_ROOT/work ); \\
+        fi;
+        @touch \$@
+
+mk_CUSTOM_TOOLS: mk_BLFS_TOOL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  mkdir -p ${TRACKING_DIR}; \\
@@ -1058,21 +1070,12 @@
 	fi;
 	@touch \$@
 
-mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-	  mkdir -p $TRACKING_DIR; \\
-	  ( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL ); \\
-	fi
-	@touch \$@
-
 SETUP:        $host_prep
 AS_LUSER:     $cross_tools $temptools ${boottools}
 SUDO:	      $orphan_scripts
 AS_ROOT:      SHELL=/tools/bin/bash
 AS_ROOT:      $testsuitetools $basicsystem $bootscripttools $bootabletools
 CUSTOM_TOOLS: $custom_list
-BLFS_TOOL:    $blfs_tool
 
 do-housekeeping:
 	@-rm /tools /cross-tools



More information about the alfs-log mailing list