Changeset 13e52a5 for common

Timestamp:

06/20/2020 05:16:22 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

49f8b03

Parents:

706e5bf

Message:

Add the multilib book: fixes ticket #1722

Location:

common/libs

Files:

• func_book_parser (modified) (3 diffs)
• func_wrt_Makefile (modified) (1 diff)

common/libs/func_book_parser

@@ -157 +157 @@
     lfs)
         echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
+        # The scripts pages are xincluded by the book, so must
+        # be generated for running xsltproc
         pushd $BOOK > /dev/null
         if [ -f process-scripts.sh ]; then
@@ -163 +165 @@
         popd > /dev/null
 
+        # First profile the book, for revision and arch. Note that
+        # MULTIBLIB is set to "default" if pure 64 bit book. In this
+        # profiling on arch is useless, but does not hurt either.
         xsltproc --nonet                                      \
                  --xinclude                                   \
-                 --stringparam revision       "$INITSYS"      \
+                 --stringparam profile.revision "$INITSYS"    \
+                 --stringparam profile.arch     "$MULTILIB"   \
+                 --output prbook.xml                          \
+                 $BOOK/stylesheets/lfs-xsl/profile.xsl        \
+                 $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
+
+        # Use the profiled book for generating the scriptlets
+        xsltproc --nonet                                      \
                  --stringparam testsuite      "$TEST"         \
                  --stringparam bomb-testsuite "$BOMB_TEST"    \
@@ -195 +207 @@
                  --output ./${PROGNAME}-commands/             \
                  $XSL                                         \
-                 $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
+                 prbook.xml >> $LOGDIR/$LOG 2>&1
 # Remove flags requesting user action in some cases. Much easier here than
 # in the stylesheet...

common/libs/func_wrt_Makefile

@@ -421 +421 @@
 LUSER_wrt_LogNewFiles() {          #
 #----------------------------------#
+(
+cat << EOF
+        @\$(call log_new_files_LUSER,$1)
+EOF
+) >> $MKFILE.tmp
+}
+
+#----------------------------------#
+CHROOT_wrt_LogNewFiles() {         #
+#----------------------------------#
+(
+cat << EOF
+        @\$(call log_new_files,$1)
+EOF
+) >> $MKFILE.tmp
+}
+
+#=======================
+
+
+#==== RM BUILD DIRS ====
+
+#----------------------------------#
+LUSER_RemoveBuildDirs() {          #
+#----------------------------------#
   local name=`echo ${1} | sed 's/[0-9]-//'`
 (
 cat << EOF
-        @\$(call log_new_files_LUSER,$name)
-EOF
-) >> $MKFILE.tmp
-}
-
-#----------------------------------#
-CHROOT_wrt_LogNewFiles() {         #
+        @\$(call remove_build_dirs,$name)
+EOF
+) >> $MKFILE.tmp
+}
+
+#----------------------------------#
+CHROOT_wrt_RemoveBuildDirs() {     #
 #----------------------------------#
   local name=`echo ${1} | sed 's/[0-9]-//'`
 (
 cat << EOF
-        @\$(call log_new_files,$name)
-EOF
-) >> $MKFILE.tmp
-}
-
-#=======================
-
-
-#==== RM BUILD DIRS ====
-
-#----------------------------------#
-LUSER_RemoveBuildDirs() {          #
-#----------------------------------#
-  local name=`echo ${1} | sed 's/[0-9]-//'`
-(
-cat << EOF
-        @\$(call remove_build_dirs,$name)
-EOF
-) >> $MKFILE.tmp
-}
-
-#----------------------------------#
-CHROOT_wrt_RemoveBuildDirs() {     #
-#----------------------------------#
-  local name=`echo ${1} | sed 's/[0-9]-//'`
-(
-cat << EOF
         @\$(call remove_build_dirs2,$name)
 EOF