Changeset d68eb1b for LFS

Timestamp:

01/12/2014 09:40:20 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

b97ed5b

Parents:

7735c7a

Message:

Major change to th scripts layout:

• Do not put the chroot commands in $PROGNAME-commands, but rather in a separate directory chroot-scripts
• Use the commands in the chroot-scripts directory to generate the CHROOT variables in Makefile
• The commands are extracted to $PROGNAME-commands only if they do not have role="nodump attribute and they do not begin with "chroot" (for compatibility with previous books where chroot commands did not have the role="nodump" attribute.

Location:

LFS

Files:

• lfs.xsl (modified) (3 diffs)
• master.sh (modified) (9 diffs)

LFS/lfs.xsl

@@ -55 +55 @@
                   count(descendant::screen/userinput) > 0 and
                   count(descendant::screen/userinput) >
-                      count(descendant::screen[@role='nodump'])">
+                      count(descendant::screen[@role='nodump']) and
+                  count(descendant::screen/userinput) >
+                      count(descendant::screen/userinput[starts-with(string(),'chroot')])">
+<!-- The last condition is a hack to allow previous versions of the
+     book where the chroot commands did not have role="nodump".
+     It only works if the chroot command is the only one on the page -->
         <!-- The dirs names -->
       <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
@@ -134 +139 @@
                                                         ]//userinput"/>
       </xsl:if>
-      <xsl:if test="not(@id='ch-system-chroot') and
-                    not(@id='ch-system-revisedchroot')">
-        <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
-      </xsl:if>
+      <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
       <xsl:text>exit&#xA;</xsl:text>
     </exsl:document>
@@ -144 +146 @@
 
   <xsl:template match="sect2">
-    <!--XML::Parser is on the same page as Perl. The present code is OK
-        except for PKG_DEST and PKGDIR, which would be the same as for Perl.
-        so set them to valid values.
-        Since rev 10281, that is no more true. So comment out.
-    <xsl:if test="contains(string(./title),'XML::Parser')">
-      <xsl:text>PKGDIR=$(dirname $PKGDIR)/</xsl:text>
-      <xsl:copy-of select="substring-after(.//userinput[@remap='pre'], 'cd ')"/>
-      <xsl:text>
-PKG_DEST=$(dirname $PKGDIR)/000-xml-parser
-</xsl:text>
-    </xsl:if>-->
     <xsl:apply-templates
       select=".//screen[not(@role) or

LFS/master.sh

@@ -198 +198 @@
     this_script=`basename $file`
 
-    # We'll run the chroot commands differently than the others, so skip them in the
-    # dependencies and target creation.
+    # Skip the "stripping" scripts if the user does not want to strip.
     # Skip also linux-headers in iterative builds.
     case "${this_script}" in
-      *chroot)      continue ;;
       *stripping*) [[ "${STRIP}" = "n" ]] && continue ;;
       *linux-headers*) [[ -n "$N" ]] && continue ;;
@@ -210 +208 @@
     name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' -e 's,'$N',,'`
 
-    # Find the version of the command files, if it corresponds with the building of
-    # a specific package. We need this here to can skip scripts not needed for
-    # iterations rebuilds
+    # Find the tarball corresponding to our script.
+    # If it doesn't, we skip it in iterations rebuilds (except stripping).
     pkg_tarball=$(get_package_tarball_name $name)
     pkg_version=$(get_package_version $pkg_tarball)
@@ -256 +253 @@
       case $name in
         binutils | gcc | glibc | gmp | mpfr )
-          [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" "$pkg_version"
+          [[ "$TEST" != "0" ]] &&
+             CHROOT_wrt_test_log "${this_script}" "$pkg_version"
           ;;
         * )
-          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}" "$pkg_version"
+          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] &&
+             CHROOT_wrt_test_log "${this_script}" "$pkg_version"
           ;;
       esac
@@ -433 +432 @@
   CHROOT_LOC="`whereis -b chroot | cut -d " " -f2`"
   i=1
-  for file in chapter06/*chroot* ; do
+  for file in ../chroot-scripts/*chroot* ; do
     chroot=`cat $file | \
             sed -e "s@chroot@$CHROOT_LOC@" \
@@ -442 +441 @@
                 -e 's|\\$|&&|g' \
                 -e 's|exit||g' \
-                -e 's|$| -c|' \
                 -e 's|"$$LFS"|$(MOUNT_PT)|' \
                 -e 's|set -e||' \
@@ -495 +493 @@
 mk_CHROOT: mk_SUDO
         @\$(call echo_CHROOT_request)
-        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT")
+        @( sudo \$(CHROOT1) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT")
         @touch \$@
 
 mk_BOOT: mk_CHROOT
         @\$(call echo_CHROOT_request)
-        @( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BOOT")
+        @( sudo \$(CHROOT2) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BOOT")
         @touch \$@
 
@@ -506 +504 @@
         @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
           \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-          (sudo \$(CHROOT2) "make -C $BLFS_ROOT/work"); \\
+          (sudo \$(CHROOT2) -c "make -C $BLFS_ROOT/work"); \\
         fi;
         @touch \$@
@@ -514 +512 @@
           \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
           sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
-          (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\
+          (sudo \$(CHROOT2) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\
         fi;
         @touch \$@
@@ -546 +544 @@
 
 chroot: devices
-        sudo /usr/sbin/chroot \$(MOUNT_PT) /tools/bin/env -i \\
-      HOME=/root TERM=\$(TERM) PS1='\\u:\\w\\\$\$ ' \\
-      PATH=/bin:/usr/bin:/sbin:/usr/sbin \\
-      /tools/bin/bash --login
+        sudo \$(CHROOT2)
         \$(MAKE) teardown