On Fri, Feb 26, 2021 at 6:52 AM Thorsten Leemhuis <fedora@xxxxxxxxxxxxx> wrote: > > On 26.02.21 13:29, Justin Forbes wrote: > > On Fri, Feb 26, 2021 at 6:07 AM Thorsten Leemhuis <fedora@xxxxxxxxxxxxx> wrote: > >> > >> Lo! The new stable workflow based on kernel-ark confuses me and I want > >> to ask for advice if I got something wrong or if things are really as > >> they appear to me: > >> > >> The sources file in dist.git for the Fedora 34 kernel currently(¹) > >> refers to a file that is called linux-5.11.1.tar.xz – but if you > >> download ("fedpkg sources") and unpack that file and look closer, you'll > >> notice that it actually contains the sources from Linux 5.11 (and not > >> 5.11.1). > >> > >> Is that intentional or just an mistake that someone did somewhere? > >> Because I find that really confusing. > >> > >> Once I looked closer I noticed that the diff from Linux 5.11 -> 5.11.1 > >> can actually be found in the file patch-5.11.1-redhat.patch ( > >> > >> https://src.fedoraproject.org/rpms/kernel/blob/f34/f/patch-5.11.1-redhat.patch > > > > Yes, this is a mistake, and the 5.11.1 patches should in fact be in > > the linux-5.11.1.tar.xz I looked at the built RPM and not at the > > tarballs. This was the first build with the merge from linux-5.11.y. > > It is a process as so much of it was hard coded against linus' tree as > > opposed to stable trees. Will get that fixed soom. > > Hah, okay, thx for clarifying and good luck with getting that fixed. > It is fixed, there is a 301 commit pushed, and it should be cleaner going forward. The issue was the scripts look at marker for the upstream release bits, and that ignored sublevel because sublevel was not necessary for rawhide/linus tree. I have changed the branch so that marker considers sublevel as well, and things should be cleaner going forward. Note, I will not be doing a 301 build because the code is the same, it just moved the stable patch bits from our patch to the upstream tarball. Justin _______________________________________________ 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 on the list, report it: https://pagure.io/fedora-infrastructure