On Wed, Apr 15, 2020 at 9:53 AM Jeremy Cline jeremy@jcline.org wrote:
On Wed, 2020-04-15 at 11:15 +0200, Thorsten Leemhuis wrote:
Am 15.04.20 um 04:24 schrieb Paul Moore:
On Tue, Apr 14, 2020 at 9:52 PM Paul Moore paul@paul-moore.com wrote:
There is another change in the kernel's specfile relating to where the %buildid is inserted into the version string. Previously the kernel NVR would look like this:
kernel-5.6.0-0.rc7.git1.1.BUILDID.fc33.src.rpm
... but now it looks like this:
kernel-5.7.0-0.rc1.20200414git8632e9b5645b.1.fc33.BUILDID.src.rpm
Any chance you can change the specfile so that the %buildid comes before %dist as it did in the past?
Should be straight-forward, I'll take care of that today.
FWIW, this is the patch I've been using since last night; limited testing of course, but it seems to work thus far.
diff --git kernel.spec kernel.spec index 2aa6271ff..bdfbf766e 100644 --- kernel.spec +++ kernel.spec @@ -74,7 +74,7 @@ Summary: The Linux kernel # allow pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc1.20200414git8632e9b5645b.1%{?dist}
-%define pkg_release %{specrelease}%{?buildid} +%define pkg_release %{pkgrelease}%{?buildid}%{?dist}
# What parts do we want to build? We must build at least one kernel. # These are the kernels that are built IF the architecture allows it.