| Message ID | 20240301150652.107814-1-roxana.nicolescu@canonical.com |
|---|---|
| Headers | show |
| Series | Cranky update-dkms-versions rollout | expand |
On 01.03.24 16:06, Roxana Nicolescu wrote: > BugLink: https://bugs.launchpad.net/bugs/2055685 > > SRU Justification > > [Impact] > Having a common file for dkms-versions between main kernels and > derivatives causes a lot of conflicts during rebase. > Solution is to have a dkms-versions per kernels, under > debian.<derivative>/dkms-version. > > While at it, instead of running ./update-dkms-version script, cranky > update-dkms-versions was introduced. > > [Fix] > This is needed only in the main kernels. > 1. remove update-dkms-version script > 2. rename debian/dkms-version with debian.master/dkms-versions > 3. Replace debian/dkms-versions references in debian scripts and rules > with $(DEBIAN)/dkms-versions > The 3rd fix required separate patches because the scripts are a bit > different. > > Note for derivatives: These changes will be inherited from the parent > during cranky rebase. > The only change to the cranky process is: instead of using > ./update-dkms-versions > script, cranky-update-dkms-versions should be used > > [Test] > Build test on cbd. No issue found. > > [Regression pottential] > Owners have tried this last cycle in derivatives and no issues were > found. > We may see build failures due to wrong dkms versions, but it will be > fixed along the way. > > Roxana Nicolescu (3): > UBUNTU: [Packaging] remove update-dkms-versions > UBUNTU: Move debian/dkms-versions to debian.master/dkms-versions > UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions > Generally agree. One question about the script change for nvidia modules. The likely should copy into lrm but I am not sure it still is done that way. The other thing is there is this other script (old) update-versions-dkms. That might be removed as well. Acked-by: Stefan Bader <stefan.bader@canonical.com>
On 04/03/2024 09:43, Stefan Bader wrote: > On 01.03.24 16:06, Roxana Nicolescu wrote: >> BugLink: https://bugs.launchpad.net/bugs/2055685 >> >> SRU Justification >> >> [Impact] >> Having a common file for dkms-versions between main kernels and >> derivatives causes a lot of conflicts during rebase. >> Solution is to have a dkms-versions per kernels, under >> debian.<derivative>/dkms-version. >> >> While at it, instead of running ./update-dkms-version script, cranky >> update-dkms-versions was introduced. >> >> [Fix] >> This is needed only in the main kernels. >> 1. remove update-dkms-version script >> 2. rename debian/dkms-version with debian.master/dkms-versions >> 3. Replace debian/dkms-versions references in debian scripts and rules >> with $(DEBIAN)/dkms-versions >> The 3rd fix required separate patches because the scripts are a bit >> different. >> >> Note for derivatives: These changes will be inherited from the parent >> during cranky rebase. >> The only change to the cranky process is: instead of using >> ./update-dkms-versions >> script, cranky-update-dkms-versions should be used >> >> [Test] >> Build test on cbd. No issue found. >> >> [Regression pottential] >> Owners have tried this last cycle in derivatives and no issues were >> found. >> We may see build failures due to wrong dkms versions, but it will be >> fixed along the way. >> >> Roxana Nicolescu (3): >> UBUNTU: [Packaging] remove update-dkms-versions >> UBUNTU: Move debian/dkms-versions to debian.master/dkms-versions >> UBUNTU: [Packaging] Replace debian/dkms-versions with >> $(DEBIAN)/dkms-versions >> > Generally agree. One question about the script change for nvidia > modules. The likely should copy into lrm but I am not sure it still is > done that way. > The other thing is there is this other script (old) > update-versions-dkms. That might be removed as well. > > Acked-by: Stefan Bader <stefan.bader@canonical.com> > Good points. 1. for dependant tree (including lrm), cranky update-dependant will remove update-version and update-dkms-versions scripts if the main tree does not have update-dkms-versions script. And cranky commands will be used instead. I also test it, and it seems nvidia versions are updated correctly. 2. I completely forgot about the old script that's not used anymore update-version-dkms. I'll remove it. I'll send a v2 because this pull request is already complicated. Roxana
On 01/03/2024 16:06, Roxana Nicolescu wrote: > BugLink: https://bugs.launchpad.net/bugs/2055685 > > SRU Justification > > [Impact] > Having a common file for dkms-versions between main kernels and > derivatives causes a lot of conflicts during rebase. > Solution is to have a dkms-versions per kernels, under > debian.<derivative>/dkms-version. > > While at it, instead of running ./update-dkms-version script, cranky > update-dkms-versions was introduced. > > [Fix] > This is needed only in the main kernels. > 1. remove update-dkms-version script > 2. rename debian/dkms-version with debian.master/dkms-versions > 3. Replace debian/dkms-versions references in debian scripts and rules > with $(DEBIAN)/dkms-versions > The 3rd fix required separate patches because the scripts are a bit > different. > > Note for derivatives: These changes will be inherited from the parent > during cranky rebase. > The only change to the cranky process is: instead of using > ./update-dkms-versions > script, cranky-update-dkms-versions should be used > > [Test] > Build test on cbd. No issue found. > > [Regression pottential] > Owners have tried this last cycle in derivatives and no issues were > found. > We may see build failures due to wrong dkms versions, but it will be > fixed along the way. > > Roxana Nicolescu (3): > UBUNTU: [Packaging] remove update-dkms-versions > UBUNTU: Move debian/dkms-versions to debian.master/dkms-versions > UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions > Will send a v2