From: Don Zickus <dzickus@xxxxxxxxxx> I am not sure why the version number is bumped for rc0, but it causes the rpm to build with the wrong version number. This puts the kernel modules in the wrong directory and the booted kernel can't find them. For example, currently the 5.8-rc1 merge window has 5.7.0 in the top level Makefile. But the kernel.spec puts the modules in 5.8.0-0.rc0 directory which doesn't match. I believe this was for legacy reasons, but forgot why. Not sure why we are suddently seeing this after a year. This might be the first time we tried building a kernel before -rc1 is officially out. Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx> --- redhat/Makefile.common | 9 --------- 1 file changed, 9 deletions(-) diff --git a/redhat/Makefile.common b/redhat/Makefile.common index d980847aacc7..ff5e0853fc40 100644 --- a/redhat/Makefile.common +++ b/redhat/Makefile.common @@ -53,15 +53,6 @@ endif ifeq ($(SNAPSHOT),1) # The base for generating tags is the snapshot commit MARKER:=$(shell echo $(TAG) | cut -d "g" -f 2) - # The merge window is weird because the actual versioning hasn't - # been updated but we still need something that works for - # packaging. Fix this by bumping the patch level and marking - # this as rc0 - ifeq ($(RPMKEXTRAVERSION),) - KEXTRAVERSION:=.rc0 - PREBUILD:=0$(KEXTRAVERSION). - RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1) - endif # Follow the packaging guidelines to include the date + git snapshot PREBUILD:=$(PREBUILD)$(shell date +%Y%m%d)git$(MARKER). UPSTREAM_TARBALL_NAME:=$(shell date +%Y%m%d)git$(MARKER) -- 2.27.0 _______________________________________________ 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
