Changeset 645ec47 for common/libs

Timestamp:

11/15/2023 05:24:22 PM (11 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

3c43655

Parents:

1352172

git-author:

Pierre Labastie <pierre.labastie@…> (11/15/2023 05:04:05 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (11/15/2023 05:24:22 PM)

Message:

Reorganize advanced options in Config.in

• Put parallelization menu first
• Fix the logic for variable definitions in this menu
• change jhalfs to reflect the separation of optimization and parallelization
• validate new variables
• remove MAKEFLAGS from the validation of optimize variables
• also remove the black list, which has not been used in years.

File:

• common/libs/func_validate_configs.sh (modified) (2 diffs)

common/libs/func_validate_configs.sh

@@ -36 +36 @@
 
   # Full list of books settings
-  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot N_PARALLEL REALSBU SAVE_CH5 $ADVANCED_common"
+  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot ALL_CORES CPUSET N_PARALLEL REALSBU SAVE_CH5 $ADVANCED_common"
 #  local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
 
@@ -134 +134 @@
       RETRYDOWNLOADCNT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       DOWNLOADTIMEOUT)  [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      N_PARALLEL)       [[ "$OPTIMIZE" -gt "0" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      REALSBU)          [[ "$OPTIMIZE" = "2" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      CPUSET)           [[ "$HAVE_CGROUP" = "y" ]] && [[ "$ALL_CORES" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      N_PARALLEL)       [[ "$ALL_CORES" = "n" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
 
       # Envars that requires some validation