[OS-BUILD PATCH] Use _smp_build_nthreads for rpm eval

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Don Zickus <dzickus@xxxxxxxxxx>

Use _smp_build_nthreads for rpm eval

rpm-4.18.1 recently modified how _smp_mflags is defined and it breaks
tarball creation: rpm --eval %{_smp_mflags} because the output is
'-j${RPM_BUILD_NCPUS}' instead of '-j8'.

While that is being worked on, let's simplify things and use
_smp_build_nthreads which is the same thing but without the '-j'.  The
-j was stripped before and now is unnecessary.

Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>

diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -4,7 +4,7 @@
 [ "$DISTRO" != "fedora" ] && _GITID="$GITID" || _GITID="$MARKER"
 
 # shellcheck disable=SC1083
-XZ_THREADS=$(rpm --eval %{_smp_mflags} | sed -e 's!^-j!--threads !')
+XZ_THREADS="--threads $(rpm --eval %{_smp_build_nthreads})"
 
 ARCH=$(arch)
 XZ_OPTIONS=""

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2370
_______________________________________________
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
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux