r3751 - in jhalfs/branches/ablfs: BLFS/xsl CLFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Nov 6 13:56:23 PST 2013


Author: pierre
Date: Wed Nov  6 13:56:23 2013
New Revision: 3751

Log:
Merge trunk 3745:3750

Modified:
   jhalfs/branches/ablfs/BLFS/xsl/gen_pkg_list.xsl
   jhalfs/branches/ablfs/CLFS/clfs.xsl
   jhalfs/branches/ablfs/CLFS/master.sh

Modified: jhalfs/branches/ablfs/BLFS/xsl/gen_pkg_list.xsl
==============================================================================
--- jhalfs/branches/ablfs/BLFS/xsl/gen_pkg_list.xsl	Wed Nov  6 13:44:09 2013	(r3750)
+++ jhalfs/branches/ablfs/BLFS/xsl/gen_pkg_list.xsl	Wed Nov  6 13:56:23 2013	(r3751)
@@ -209,7 +209,9 @@
             </xsl:text>
             <xsl:choose>
               <xsl:when test="contains(preceding-sibling::sect1[1]/@id,
-                                       'xorg7-') and not(@id='printproto')">
+                                       'xorg7-') and
+                              not(contains(preceding-sibling::sect1[1]/@id,
+                                       'driver'))">
                 <xsl:call-template name="expand-deps">
                   <xsl:with-param name="section">
                     <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>

Modified: jhalfs/branches/ablfs/CLFS/clfs.xsl
==============================================================================
--- jhalfs/branches/ablfs/CLFS/clfs.xsl	Wed Nov  6 13:44:09 2013	(r3750)
+++ jhalfs/branches/ablfs/CLFS/clfs.xsl	Wed Nov  6 13:56:23 2013	(r3751)
@@ -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/branches/ablfs/CLFS/master.sh
==============================================================================
--- jhalfs/branches/ablfs/CLFS/master.sh	Wed Nov  6 13:44:09 2013	(r3750)
+++ jhalfs/branches/ablfs/CLFS/master.sh	Wed Nov  6 13:56:23 2013	(r3751)
@@ -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;
@@ -67,9 +69,12 @@
 	echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
 	@chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
+	chmod a+wt \$(MOUNT_PT) && \\
+	if [ -d \$(MOUNT_PT)/var ]; then \\
+	  chown -R \$(LUSER) \$(MOUNT_PT)/var; \\
+	fi && \\
 	touch envars && \\
-	chmod -R a+wt \$(MOUNT_PT) && \\
-	chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT)
+	chown \$(LUSER):\$(LGROUP) envars
 	@\$(call housekeeping)
 EOF
 ) >> $MKFILE.tmp
@@ -556,7 +561,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}"
           ;;
         * )
@@ -845,17 +850,11 @@
 #--------------------------------------#
 build_Makefile() {                     # Construct a Makefile from the book scripts
 #--------------------------------------#
-  #
-  # Script crashes if error trapping is on
-  #
-set +e
-  declare -f  method_cmds
-set -e
 
   echo "...Creating Makefile... ${BOLD}START${OFF}"
 
   cd $JHALFSDIR/${PROGNAME}-commands
-  # Start with a clean files
+  # Start with clean files
   >$MKFILE
   >$MKFILE.tmp
 
@@ -879,8 +878,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.
@@ -915,7 +912,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:
@@ -935,7 +933,7 @@
 #---------------AS LUSER
 mk_CROSS: mk_SETUP
 	@\$(call echo_PHASE,Cross and Temporary Tools)
-	@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
+	@( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
 	@sudo make restore-luser-env
 	@touch \$@
 
@@ -951,7 +949,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}; \\
@@ -959,14 +964,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
@@ -975,7 +972,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
@@ -988,7 +984,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
@@ -1026,7 +1028,7 @@
 	  echo "|However, if this is the boot environment          |"; \\
 	  echo "| the command you are looking for is               |"; \\
 	  echo "|   make makesys                                   |"; \\
-	  echo "| to finish off the build                          |"; \\
+	  echo "| to complete the build                            |"; \\
 	  echo "+--------------------------------------------------+"; \\
 	  exit 1; \\
 	fi
@@ -1042,7 +1044,7 @@
 
 mk_CROSS: mk_SETUP
 	@\$(call echo_PHASE,Cross Tool)
-	@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
+	@( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
 	@touch \$@
 
 mk_SUDO: mk_CROSS
@@ -1056,7 +1058,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}; \\
@@ -1064,21 +1073,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