On Thu, Nov 19, 2020 at 08:54:27PM -0000, GitLab Bridge on behalf of jmflinuxtx wrote:
> From: "Justin M. Forbes" <jforbes@xxxxxxxxxxxxxxxxx>
>
> For quite some time, the parallel_xz.sh script has been hanging up
> builds in koji. While it may be a benefit to get this fixed, it is much
> better to back that change out in the short term. This reverts us to
> the way that Fedora used to compress the modules.
Hopefully it isn't that much slower. But yeah stability over speed.
Acked-by: Don Zickus <dzickus@xxxxxxxxxx>
>
> Signed-off-by: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx>
> ---
> redhat/kernel.spec.template | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
> index 4d16c0005536..34e32e982a49 100644
> --- a/redhat/kernel.spec.template
> +++ b/redhat/kernel.spec.template
> @@ -83,6 +83,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
>
> %%BUILDID%%
> @@ -2063,7 +2065,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' | %{SOURCE79} %{?_smp_mflags}; \
> + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \
> fi \
> %{nil}
>
> --
> GitLab
> _______________________________________________
> kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
> To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
