summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec4
-rwxr-xr-x[-rw-r--r--]parallel_xz.sh26
2 files changed, 27 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 737527e86..101240c54 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,8 +51,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
-# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
# define buildid .local
@@ -2070,7 +2068,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | %{SOURCE79} %{?_smp_mflags}; \
fi \
%{nil}
diff --git a/parallel_xz.sh b/parallel_xz.sh
index e69de29bb..bc08a548d 100644..100755
--- a/parallel_xz.sh
+++ b/parallel_xz.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Reads filenames on stdin, xz-compresses each in place.
+# Not optimal for "compress relatively few, large files" scenario!
+
+# How many xz's to run in parallel:
+procgroup=""
+while test "$#" != 0; do
+ # Get it from -jNUM
+ N="${1#-j}"
+ if test "$N" = "$1"; then
+ # Not -j<something> - warn and ignore
+ echo "parallel_xz: warning: unrecognized argument: '$1'"
+ else
+ procgroup="$N"
+ fi
+ shift
+done
+
+# If told to use only one cpu:
+test "$procgroup" || exec xargs -r xz
+test "$procgroup" = 1 && exec xargs -r xz
+
+# xz has some startup cost. If files are really small,
+# this cost might be significant. To combat this,
+# process several files (in sequence) by each xz process via -n 16:
+exec xargs -r -n 16 -P $procgroup xz