Changeset cacc6c5

Timestamp:

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

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

640cd57

Parents:

63190e6

git-author:

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

git-committer:

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

Message:

Allow users to pass a cpuset

If using a new book, MAKEFLAGS is set to -j$(nproc), so that if
we want to easure timings with 4 processors and our computer has
more than that, we need to restrict the number of processors.
Jhalfs allows to do that using th cpuset cgroup controller, so that
it only restrits the make job and not the whole machine. For that
use a small scripts written by Xi Ruoyao that restarts make this
the cpuset set.

Files:

• LFS/master.sh (modified) (1 diff)
• common/libs/func_wrt_Makefile (modified) (1 diff)
• jhalfs (modified) (1 diff)

LFS/master.sh

@@ -303 +303 @@
   done
 
+  # If CPUSET is defined and not equal to "all", then we define a first target
+  # that calls a script which re-enters make calling target all
+  if [ -n "$CPUSET" ] && [ "$CPUSET" != all ]; then
+(
+    cat << EOF
+
+all-with-cpuset:
+        @CPUSPEC="\$(CPUSET)" ./run-in-cgroup \$(MAKE) all
+EOF
+) >> $MKFILE
+  fi
   # Drop in the main target 'all:' and the chapter targets with each sub-target
   # as a dependency. Also prevent running targets in parallel.

common/libs/func_wrt_Makefile

@@ -45 +45 @@
 PKGMNGT          = $PKGMNGT
 WRAP_INSTALL     = $WRAP_INSTALL
+CPUSET           = $CPUSET
 
 

jhalfs

@@ -324 +324 @@
 
 # Copy common helper files
-  cp "$COMMON_DIR"/{makefile-functions,progress_bar.sh} "$JHALFSDIR/"
+  cp "$COMMON_DIR"/{makefile-functions,progress_bar.sh,run-in-cgroup.sh} "$JHALFSDIR/"
 
 # Copy needed stylesheets