On Wed, Jun 10, 2020 at 2:16 PM Justin Forbes <jmforbes@xxxxxxxxxxx> wrote: > On Wed, Jun 10, 2020 at 6:59 AM Jan Stancek <jstancek@xxxxxxxxxx> wrote: > > > > > > ----- Original Message ----- > > > On Tue, 09 Jun 2020 20:13:39 -0000, GitLab Bridge on behalf of dzickusrh > > > wrote: > > > > 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. > > > > > > What is the rpm version of the kernel after this patch? > > > > > > The kernel is not actually 5.7, it is a later one. 5.8-rc0 seems > > > appropriate, though obviously does not match the in-kernel version and > > > has the problems you mention. However, naming the kernel "5.7" seems > > > misleading. > > > > > > Could we perhaps append something to the kernel version to indicate > > > it's not a 5.7 kernel anymore? Even something like "5.7.0-5.8.0.rc0" > > > would work, IMHO. Just be sure that this is understood as a newer > > > version than 5.7.0 by rpm. > > > > The place to put something like this would be in EXTRAVERSION which we > already truncate because it exceeds the character limit. But it has > the date and the gitrev. It can't be that confusing, Linus doesn't > bump PATCHLEVEL until rc1, it has always been that way. Merge window > kernels for 5.7 were 5.6 still. > > > +1, Since it's daily snapshot, how about git sha, so it's possible > > to tell 2 snapshots apart? > > > > It has one, just not in this particular section. EXTRAVERSION has the > gitrev and the date. > kernel-5.7.0-0.rc0.20200608gitaf7b4801030c.1 But this is < kernel-5.7.0-1, which is older than this snapshot. Maybe we could at least change the first number in PREBUILD from 0 to 900 or something to make the version higher than any v5.7 based kernel build? -- Ondrej Mosnacek Software Engineer, Platform Security - SELinux kernel Red Hat, Inc. _______________________________________________ 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