Changeset 8825e69

Timestamp:

03/30/2022 03:45:35 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

3e82b0b

Parents:

2bd2fb8

Message:

Get completely rid of PROGNAME

There is only one PROGNAME: lfs, so no need for a variable.

Files:

• Config.in (modified) (2 diffs)
• common/libs/func_book_parser (modified) (5 diffs)
• common/libs/func_download_pkgs (modified) (1 diff)
• common/libs/func_validate_configs.sh (modified) (4 diffs)
• common/libs/func_wrt_Makefile (modified) (2 diffs)
• jhalfs (modified) (2 diffs)

Config.in

@@ -45 +45 @@
         default "sysv"         if BOOK_LFS || BLFS_SYSV
         default "systemd"      if BOOK_LFS_SYSD || BLFS_SYSD
-
-    config    PROGNAME
-        string
-        default "lfs"          if BOOK_LFS || BOOK_LFS_SYSD
 
     config    RUN_ME
@@ -937 +933 @@
         config    XSL
             string "XSL stylesheet"
-            default "$PROGNAME.xsl"
+            default "lfs.xsl"
 
         config    PKG_LST

common/libs/func_book_parser

@@ -11 +11 @@
     exit 1"
 
-    echo -n "Downloading the lfs document, $COMMIT commit... "
+    echo -n "Downloading the lfs document, $COMMIT branch/tag/commit... "
 
     # Grab a fresh book if it's missing, otherwise, update it from the
@@ -51 +51 @@
   # Extract the commands
   echo -n "Extracting commands for"
-  case ${PROGNAME} in
+  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
+    bash process-scripts.sh >> $LOGDIR/$LOG 2>&1
+  fi
+  # Recent git versions need version.ent to be generated
+  if [ -f git-version.sh ]; then
+    bash git-version.sh "$INITSYS" >> $LOGDIR/$LOG 2>&1
+  fi
+  popd > /dev/null
 
-    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
-          bash process-scripts.sh >> $LOGDIR/$LOG 2>&1
-        fi
-        # Recent git versions need version.ent to be generated
-        if [ -f git-version.sh ]; then
-          bash git-version.sh "$INITSYS" >> $LOGDIR/$LOG 2>&1
-        fi
-        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 case,
+  # profiling on arch is useless, but does not hurt either.
+  xsltproc --nonet                                      \
+           --xinclude                                   \
+           --stringparam profile.revision "$INITSYS"    \
+           --stringparam profile.arch     "$MULTILIB"   \
+           --output prbook.xml                          \
+           $BOOK/stylesheets/lfs-xsl/profile.xsl        \
+           $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
 
-        # 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 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"    \
-                 --stringparam ncurses5       "$NCURSES5"     \
-                 --stringparam strip          "$STRIP"        \
-                 --stringparam del-la-files   "$DEL_LA_FILES" \
-                 --stringparam full-locale    "$FULL_LOCALE"  \
-                 --stringparam timezone       "$TIMEZONE"     \
-                 --stringparam page           "$PAGE"         \
-                 --stringparam lang           "$LANG"         \
-                 --stringparam pkgmngt        "$PKGMNGT"      \
-                 --stringparam wrap-install   "$WRAP_INSTALL" \
-                 --stringparam hostname       "$HOSTNAME"     \
-                 --stringparam interface      "$INTERFACE"    \
-                 --stringparam ip             "$IP_ADDR"      \
-                 --stringparam gateway        "$GATEWAY"      \
-                 --stringparam prefix         "$PREFIX"       \
-                 --stringparam broadcast      "$BROADCAST"    \
-                 --stringparam domain         "$DOMAIN"       \
-                 --stringparam nameserver1    "$DNS1"         \
-                 --stringparam nameserver2    "$DNS2"         \
-                 --stringparam font           "$FONT"         \
-                 --stringparam fontmap        "$FONTMAP"      \
-                 --stringparam unicode        "$UNICODE"      \
-                 --stringparam keymap         "$KEYMAP"       \
-                 --stringparam local          "$LOCAL"        \
-                 --stringparam log-level      "$LOG_LEVEL"    \
-                 --stringparam script-root    "$SCRIPT_ROOT"  \
-                 --output "./${COMMANDS}/"                    \
-                 $XSL                                         \
-                 prbook.xml >> $LOGDIR/$LOG 2>&1
-# Remove flags requesting user action in some cases. Much easier here than
-# in the stylesheet...
-        sed -i 's/-iv /-v /' "./${COMMANDS}/"chapter??/*kernel*
-      ;;
-    *)  echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate build... "
-        exit 1 ;;
-  esac
+  # Use the profiled book for generating the scriptlets
+  xsltproc --nonet                                      \
+           --stringparam testsuite      "$TEST"         \
+           --stringparam bomb-testsuite "$BOMB_TEST"    \
+           --stringparam ncurses5       "$NCURSES5"     \
+           --stringparam strip          "$STRIP"        \
+           --stringparam del-la-files   "$DEL_LA_FILES" \
+           --stringparam full-locale    "$FULL_LOCALE"  \
+           --stringparam timezone       "$TIMEZONE"     \
+           --stringparam page           "$PAGE"         \
+           --stringparam lang           "$LANG"         \
+           --stringparam pkgmngt        "$PKGMNGT"      \
+           --stringparam wrap-install   "$WRAP_INSTALL" \
+           --stringparam hostname       "$HOSTNAME"     \
+           --stringparam interface      "$INTERFACE"    \
+           --stringparam ip             "$IP_ADDR"      \
+           --stringparam gateway        "$GATEWAY"      \
+           --stringparam prefix         "$PREFIX"       \
+           --stringparam broadcast      "$BROADCAST"    \
+           --stringparam domain         "$DOMAIN"       \
+           --stringparam nameserver1    "$DNS1"         \
+           --stringparam nameserver2    "$DNS2"         \
+           --stringparam font           "$FONT"         \
+           --stringparam fontmap        "$FONTMAP"      \
+           --stringparam unicode        "$UNICODE"      \
+           --stringparam keymap         "$KEYMAP"       \
+           --stringparam local          "$LOCAL"        \
+           --stringparam log-level      "$LOG_LEVEL"    \
+           --stringparam script-root    "$SCRIPT_ROOT"  \
+           --output "./${COMMANDS}/"                    \
+           $XSL                                         \
+           prbook.xml >> $LOGDIR/$LOG 2>&1
+  # Remove flags requesting user action in some cases. Much easier here than
+  # in the stylesheet...
+  sed -i 's/-iv /-v /' "./${COMMANDS}/"chapter??/*kernel*
 
   echo "done"
@@ -122 +115 @@
   # Make the scripts executable.
   chmod -R +x "$JHALFSDIR/${COMMANDS}"
-
-  # Create the packages file. We need it for proper Makefile creation
-  # lfs does not use this anymore, but this is taken care in the
-  # function body
-  create_package_list
-  # On the other hand, lfs needs two auxiliary files
-  if [ "${PROGNAME}" = lfs ]; then
-    create_chroot_scripts
-    create_kernfs_scripts
-  fi
+  create_chroot_scripts
+  create_kernfs_scripts
 
   # we create the VERSION variable here. Should maybe go into its own
   # function. But at this point we can use the profiled xml to get
   # version from lfs-release in the lfs case.
-  case $PROGNAME in
-    lfs)
-      VERSION=$(grep 'echo.*lfs-release' prbook.xml | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
-      ;;
-    *)
-      VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//')  ;;
-  esac
+  VERSION=$(grep 'echo.*lfs-release' prbook.xml | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
 
   # Done. Moving on...
   get_sources
-}
-
-#----------------------------#
-create_package_list() {      #
-#----------------------------#
-
-  # Create the packages file. We need it for proper Makefile creation
-  rm -f pkg_tarball_list
-  echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK"
-  if [ ! -z "$ARCH" ] ; then echo -n " $ARCH" ; fi
-  echo -n "... "
-  case ${PROGNAME} in
-    lfs)
-        # lfs does not use the package list anymore
-      ;;
-    *)
-  esac
-
-  echo "done"
-
 }
 
@@ -176 +135 @@
   if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
   echo -n "... "
-  case ${PROGNAME} in
-    lfs)
-      xsltproc --nonet --xinclude \
-               -o chroot-scripts/ chroot.xsl \
-               $BOOK/chapter0?/*chroot*.xml >> $LOGDIR/$LOG 2>&1
-      ;;
-    *)
-  esac
+  xsltproc --nonet --xinclude \
+           -o chroot-scripts/ chroot.xsl \
+           $BOOK/chapter0?/*chroot*.xml >> $LOGDIR/$LOG 2>&1
   echo "done"
 
@@ -197 +151 @@
   if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
   echo -n "... "
-  case ${PROGNAME} in
-    lfs)
-      xsltproc --nonet \
-               -o kernfs-scripts/devices.sh kernfs.xsl \
-               $BOOK/*/kernfs.xml >> $LOGDIR/$LOG 2>&1
-      xsltproc --nonet \
-               -o kernfs-scripts/teardown.sh kernfs.xsl \
-               $BOOK/chapter??/reboot.xml >> $LOGDIR/$LOG 2>&1
-      ;;
-    *)
-  esac
+  xsltproc --nonet \
+           -o kernfs-scripts/devices.sh kernfs.xsl \
+           $BOOK/*/kernfs.xml >> $LOGDIR/$LOG 2>&1
+  xsltproc --nonet \
+           -o kernfs-scripts/teardown.sh kernfs.xsl \
+           $BOOK/chapter??/reboot.xml >> $LOGDIR/$LOG 2>&1
+
   echo "done"
 

common/libs/func_download_pkgs

@@ -131 +131 @@
   cd $JHALFSDIR
 
-  case ${PROGNAME} in
-    lfs)
-        echo -n "Creating LFS specific URLs file"
-        xsltproc --nonet --xinclude                \
-                 --stringparam server "$SERVER"    \
-                 --stringparam family lfs          \
-                 --stringparam pkgmngt "$PKGMNGT"  \
-                 --stringparam revision "$INITSYS" \
-                 --output ../sources/urls.lst      \
-                 urls.xsl                          \
-                 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
-        echo " ...OK"
-      ;;
-  esac
+  echo -n "Creating URLs file... "
+  xsltproc --nonet --xinclude                \
+           --stringparam server "$SERVER"    \
+           --stringparam family lfs          \
+           --stringparam pkgmngt "$PKGMNGT"  \
+           --stringparam revision "$INITSYS" \
+           --output ../sources/urls.lst      \
+           urls.xsl                          \
+           $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
+  echo "OK"
 
   cd $BUILDDIR/sources

common/libs/func_validate_configs.sh

@@ -6 +6 @@
 #----------------------------#
 : <<inline_doc
-      Validates the configuration parameters. The global var PROGNAME selects the
-    parameter list.
+      Validates the configuration parameters.
 
     input vars: none
     externals:  color constants
-                PROGNAME (lfs only as of February 28th, 2022)
     modifies:   none
     returns:    nothing
@@ -19 +17 @@
 
   # Common settings by Config.in sections and books family
-  local -r     BOOK_common="BOOK CUSTOM_TOOLS"
+  local -r     BOOK_common="COMMIT BOOK CUSTOM_TOOLS"
   local -r  GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
                             SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
@@ -124 +122 @@
 
   set +e
-  PARAM_GROUP=${PROGNAME}_PARAM_LIST
-  for config_param in ${!PARAM_GROUP}; do
+  for config_param in $lfs_PARAM_LIST; do
     case $config_param in
       # Envvars that depend on other settings to be displayed
@@ -209 +206 @@
                fi
                ;;
-      # Display non-validated envars found in ${PROGNAME}_PARAM_LIST
+      # Display non-validated envars found in lfs_PARAM_LIST
       * ) echo -e "`eval echo $PARAM_VALS`" ;;
 

common/libs/func_wrt_Makefile

@@ -234 +234 @@
         @source ~/.bashrc && \\
         \$(CMDSDIR)/`dirname $file`/\$@ >> \$(LOGDIR)/\$@$version 2>&1 && \\
-        if [ "${PROGNAME}" != lfs ]; then \$(PRT_DU) >>logs/\$@$version; fi
 EOF
 ) >> $MKFILE.tmp
@@ -251 +250 @@
         @source envars && \\
         \$(crCMDSDIR)/`dirname $file`/\$@ >>\$(crLOGDIR)/\$@$version 2>&1 && \\
-        if [ "${PROGNAME}" != lfs ]; then \$(PRT_DU_CR) >>logs/\$@$version; fi
 EOF
 ) >> $MKFILE.tmp

jhalfs

@@ -205 +205 @@
 # Set true internal variables
 COMMON_DIR="common"
-PACKAGE_DIR=$(echo "$PROGNAME" | tr '[:lower:]' '[:upper:]')
+PACKAGE_DIR=LFS
 MODULE=$PACKAGE_DIR/master.sh
 PKGMNGTDIR="pkgmngt"
@@ -343 +343 @@
 
 # Copy packageManager.xml, if needed
-  [[ "$PKGMNGT" = "y" ]] && [[ "$PROGNAME" = "lfs" ]] && {
+  [[ "$PKGMNGT" = "y" ]] && {
     sed s@BOOK@"$BOOK"@ "$PKGMNGTDIR/packageManager.xml" > \
                         "$JHALFSDIR/"packageManager.xml