Changeset 945ccaa for common

Timestamp:

04/09/2017 10:29:32 AM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

cee84ad

Parents:

909ee37

Message:

Merge the new_features branch (manully, thanks to svn)

Location:

common

Files:

• libs/func_book_parser (modified) (1 diff)
• libs/func_install_blfs (modified) (2 diffs)
• libs/func_validate_configs.sh (modified) (3 diffs)
• makefile-functions (modified) (1 diff)

common/libs/func_book_parser

@@ -165 +165 @@
         popd > /dev/null
 
-        xsltproc --nonet                                   \
-                 --xinclude                                \
-                 --stringparam revision       $INITSYS     \
-                 --stringparam testsuite      $TEST        \
-                 --stringparam bomb-testsuite $BOMB_TEST   \
-                 --stringparam vim-lang       $VIMLANG     \
-                 --stringparam full-locale    $FULL_LOCALE \
-                 --stringparam timezone       $TIMEZONE    \
-                 --stringparam page           $PAGE        \
-                 --stringparam lang           $LANG        \
-                 --stringparam pkgmngt        $PKGMNGT     \
-                 --output ./${PROGNAME}-commands/          \
-                 $XSL                                      \
+        xsltproc --nonet                                    \
+                 --xinclude                                 \
+                 --stringparam revision       $INITSYS      \
+                 --stringparam testsuite      $TEST         \
+                 --stringparam bomb-testsuite $BOMB_TEST    \
+                 --stringparam vim-lang       $VIMLANG      \
+                 --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         \
+                 --output ./${PROGNAME}-commands/           \
+                 $XSL                                       \
                  $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
       ;;

common/libs/func_install_blfs

@@ -13 +13 @@
 cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
 cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
+if [ "$WRAP_INSTALL" = y ]; then
+  sed -e 's/PKGDIR/UNPACKDIR/' \
+      -e 's/PKG_DEST/PKG_DIR/' \
+      $PKGMNGTDIR/packInstall.sh > ${BUILDDIR}${BLFS_ROOT}/packInstall.sh
+fi
 
 # Clean-up
@@ -116 +121 @@
 optDependency=2
 SUDO=n
+WRAP_INSTALL=$WRAP_INSTALL
 EOF
 

common/libs/func_validate_configs.sh

@@ -42 +42 @@
 
   # Build Settings by book
-  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT FULL_LOCALE"
+  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
   local -r  HLFS_build="$BUILD_chroot         $BUILD_common"
   local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
@@ -48 +48 @@
   local -r CLFS3_build="                      $BUILD_common"
 
+  # System Settings by book (only LFS for now)
+  local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST DOMAIN DNS1 DNS2 FONT CONSOLE_MAP UNICODE KEYMAP"
+
   # Full list of books settings
-  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build   $ADVANCED_chroot $ADVANCED_common"
+  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot $ADVANCED_common"
   local -r  hlfs_PARAM_LIST="$HLFS_book  $GENERAL_common $HLFS_build  $ADVANCED_chroot $ADVANCED_common"
   local -r  clfs_PARAM_LIST="$CLFS_book  $GENERAL_common $CLFS_build  $ADVANCED_chroot $ADVANCED_common"
@@ -194 +197 @@
                ;;
 
+        # Treatment of HOSTNAME
+      HOSTNAME)  echo -e "`eval echo $PARAM_VALS`"
+                 [[ "${!config_param}" = "**EDIT ME**" ]] && write_error_and_die
+                 ;;
+
         # Case of PKGMNGT: two files, packageManager.xml and packInstall.sh
         # must exist in $PKGMNGTDIR if PKGMNGT='y':

common/makefile-functions

@@ -116 +116 @@
     echo "source packInstall.sh" >> envars; \
     echo "export -f packInstall" >> envars; \
+    echo "export -f wrapInstall" >> envars; \
   fi;
 endef