diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-22 09:10:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-22 09:10:01 +0200 |
commit | d8a8b2fd2a41adcd1ae9ececc57b7c93886d6c8f (patch) | |
tree | 94ddb9c583f4cf741bbe97653186f3b2501aec32 /kernel.spec | |
parent | 1f661ef89f210f128c39b4f45ce58f408b00a6b3 (diff) | |
parent | b0bc74c2361e228231f13ad8a79f939517f492f9 (diff) | |
download | kernel-d8a8b2fd2a41adcd1ae9ececc57b7c93886d6c8f.tar.gz kernel-d8a8b2fd2a41adcd1ae9ececc57b7c93886d6c8f.tar.xz kernel-d8a8b2fd2a41adcd1ae9ececc57b7c93886d6c8f.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc5.git4.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc5.git4.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc5.git4.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 3593466bf..d63d30a3d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -22,6 +22,8 @@ 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 @@ -77,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1579,7 +1581,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso} fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs xz; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \ fi \ %{nil} @@ -1844,6 +1846,9 @@ fi # # %changelog +* Fri Jun 21 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git4.1 +- Linux v5.2-rc5-290-g4ae004a9bca8 + * Thu Jun 20 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git3.1 - Linux v5.2-rc5-239-g241e39004581 |