Message ID | 20200629084041.13017-1-juergh@canonical.com |
---|---|
State | New |
Headers | show |
Series | [SRU,B/linux-meta-raspi-5.4] UBUNTU: [Packaging] Add transitional packages for raspi2 hwe upgrades | expand |
On 29.06.20 10:40, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1885522 > > Add the transitionals to move the raspi2 users to the raspi flavor. > > Note that the tansitionals will only take effect once we change the > variant of this kernel set from (currently) '-hwe-18.04-edge' to > '-hwe-18.04'. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- Hm, not sure... To me this looks like creating circular dependencies on itself... > debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 debian/control.d/transitionals-raspi2 > > diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 > new file mode 100644 > index 000000000000..0d3e65cf950e > --- /dev/null > +++ b/debian/control.d/transitionals-raspi2 > @@ -0,0 +1,34 @@ > +Package: linux-headers-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-headers-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel headers (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-image-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-image-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel image (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-tools-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Depends: linux-tools-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel tools (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-raspi${variant:suffix} > +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. >
On Mon, 29 Jun 2020 13:39:06 +0200 Stefan Bader <stefan.bader@canonical.com> wrote: > On 29.06.20 10:40, Juerg Haefliger wrote: > > BugLink: https://bugs.launchpad.net/bugs/1885522 > > > > Add the transitionals to move the raspi2 users to the raspi flavor. > > > > Note that the tansitionals will only take effect once we change the > > variant of this kernel set from (currently) '-hwe-18.04-edge' to > > '-hwe-18.04'. > > > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > > --- > > Hm, not sure... To me this looks like creating circular dependencies on itself... What makes you think that this is a circular dependency? In Focal raspi we have transitionals for moving raspi2 to raspi and we want the same in the Bionic backport. So raspi2-<whatever> should transition to raspi-<whatever> and this is what this patch intends to accomplish. ...Juerg > > > debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ > > 1 file changed, 34 insertions(+) > > create mode 100644 debian/control.d/transitionals-raspi2 > > > > diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 > > new file mode 100644 > > index 000000000000..0d3e65cf950e > > --- /dev/null > > +++ b/debian/control.d/transitionals-raspi2 > > @@ -0,0 +1,34 @@ > > +Package: linux-headers-raspi2${variant:suffix} > > +Architecture: armhf arm64 > > +Section: oldlibs > > +Priority: optional > > +Depends: linux-headers-raspi${variant:suffix} > > +Description: Raspberry Pi Linux kernel headers (dummy transitional package) > > + Transitional package for upgrades from linux-raspi2${variant:suffix} > > + to linux-raspi${variant:suffix}. > > + > > +Package: linux-image-raspi2${variant:suffix} > > +Architecture: armhf arm64 > > +Section: oldlibs > > +Priority: optional > > +Depends: linux-image-raspi${variant:suffix} > > +Description: Raspberry Pi Linux kernel image (dummy transitional package) > > + Transitional package for upgrades from linux-raspi2${variant:suffix} > > + to linux-raspi${variant:suffix}. > > + > > +Package: linux-tools-raspi2${variant:suffix} > > +Architecture: armhf arm64 > > +Section: oldlibs > > +Depends: linux-tools-raspi${variant:suffix} > > +Description: Raspberry Pi Linux kernel tools (dummy transitional package) > > + Transitional package for upgrades from linux-raspi2${variant:suffix} > > + to linux-raspi${variant:suffix}. > > + > > +Package: linux-raspi2${variant:suffix} > > +Architecture: armhf arm64 > > +Section: oldlibs > > +Priority: optional > > +Depends: linux-raspi${variant:suffix} > > +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) > > + Transitional package for upgrades from linux-raspi2${variant:suffix} > > + to linux-raspi${variant:suffix}. > > > >
On 29.06.20 14:41, Juerg Haefliger wrote: > On Mon, 29 Jun 2020 13:39:06 +0200 > Stefan Bader <stefan.bader@canonical.com> wrote: > >> On 29.06.20 10:40, Juerg Haefliger wrote: >>> BugLink: https://bugs.launchpad.net/bugs/1885522 >>> >>> Add the transitionals to move the raspi2 users to the raspi flavor. >>> >>> Note that the tansitionals will only take effect once we change the >>> variant of this kernel set from (currently) '-hwe-18.04-edge' to >>> '-hwe-18.04'. >>> >>> Signed-off-by: Juerg Haefliger <juergh@canonical.com> >>> --- >> >> Hm, not sure... To me this looks like creating circular dependencies on itself... > > What makes you think that this is a circular dependency? In Focal raspi we have > transitionals for moving raspi2 to raspi and we want the same in the Bionic > backport. So raspi2-<whatever> should transition to raspi-<whatever> and this > is what this patch intends to accomplish. I was looking hard before but even then the 2 wedged in between the raspi and the variant did not register. It looked like exactly the same string... I see it now. > > ...Juerg > > >> >>> debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ >>> 1 file changed, 34 insertions(+) >>> create mode 100644 debian/control.d/transitionals-raspi2 >>> >>> diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 >>> new file mode 100644 >>> index 000000000000..0d3e65cf950e >>> --- /dev/null >>> +++ b/debian/control.d/transitionals-raspi2 >>> @@ -0,0 +1,34 @@ >>> +Package: linux-headers-raspi2${variant:suffix} >>> +Architecture: armhf arm64 >>> +Section: oldlibs >>> +Priority: optional >>> +Depends: linux-headers-raspi${variant:suffix} >>> +Description: Raspberry Pi Linux kernel headers (dummy transitional package) >>> + Transitional package for upgrades from linux-raspi2${variant:suffix} >>> + to linux-raspi${variant:suffix}. >>> + >>> +Package: linux-image-raspi2${variant:suffix} >>> +Architecture: armhf arm64 >>> +Section: oldlibs >>> +Priority: optional >>> +Depends: linux-image-raspi${variant:suffix} >>> +Description: Raspberry Pi Linux kernel image (dummy transitional package) >>> + Transitional package for upgrades from linux-raspi2${variant:suffix} >>> + to linux-raspi${variant:suffix}. >>> + >>> +Package: linux-tools-raspi2${variant:suffix} >>> +Architecture: armhf arm64 >>> +Section: oldlibs >>> +Depends: linux-tools-raspi${variant:suffix} >>> +Description: Raspberry Pi Linux kernel tools (dummy transitional package) >>> + Transitional package for upgrades from linux-raspi2${variant:suffix} >>> + to linux-raspi${variant:suffix}. >>> + >>> +Package: linux-raspi2${variant:suffix} >>> +Architecture: armhf arm64 >>> +Section: oldlibs >>> +Priority: optional >>> +Depends: linux-raspi${variant:suffix} >>> +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) >>> + Transitional package for upgrades from linux-raspi2${variant:suffix} >>> + to linux-raspi${variant:suffix}. >>> >> >> >
On 29.06.20 10:40, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1885522 > > Add the transitionals to move the raspi2 users to the raspi flavor. > > Note that the tansitionals will only take effect once we change the > variant of this kernel set from (currently) '-hwe-18.04-edge' to > '-hwe-18.04'. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 debian/control.d/transitionals-raspi2 > > diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 > new file mode 100644 > index 000000000000..0d3e65cf950e > --- /dev/null > +++ b/debian/control.d/transitionals-raspi2 > @@ -0,0 +1,34 @@ > +Package: linux-headers-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-headers-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel headers (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-image-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-image-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel image (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-tools-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Depends: linux-tools-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel tools (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-raspi${variant:suffix} > +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. >
On 2020-06-29 10:40, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1885522 > > Add the transitionals to move the raspi2 users to the raspi flavor. > > Note that the tansitionals will only take effect once we change the > variant of this kernel set from (currently) '-hwe-18.04-edge' to > '-hwe-18.04'. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 debian/control.d/transitionals-raspi2 > > diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 > new file mode 100644 > index 000000000000..0d3e65cf950e > --- /dev/null > +++ b/debian/control.d/transitionals-raspi2 > @@ -0,0 +1,34 @@ > +Package: linux-headers-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-headers-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel headers (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-image-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-image-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel image (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-tools-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Depends: linux-tools-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel tools (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-raspi${variant:suffix} > +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. >
On 2020-06-29 10:40, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1885522 > > Add the transitionals to move the raspi2 users to the raspi flavor. > > Note that the tansitionals will only take effect once we change the > variant of this kernel set from (currently) '-hwe-18.04-edge' to > '-hwe-18.04'. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 debian/control.d/transitionals-raspi2 > > diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 > new file mode 100644 > index 000000000000..0d3e65cf950e > --- /dev/null > +++ b/debian/control.d/transitionals-raspi2 > @@ -0,0 +1,34 @@ > +Package: linux-headers-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-headers-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel headers (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-image-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-image-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel image (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-tools-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Depends: linux-tools-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel tools (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-raspi${variant:suffix} > +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > Applied to focal/linux-raspi. Thanks, Kleber
On 2020-07-03 17:12, Kleber Souza wrote: > On 2020-06-29 10:40, Juerg Haefliger wrote: >> BugLink: https://bugs.launchpad.net/bugs/1885522 >> >> Add the transitionals to move the raspi2 users to the raspi flavor. >> >> Note that the tansitionals will only take effect once we change the >> variant of this kernel set from (currently) '-hwe-18.04-edge' to >> '-hwe-18.04'. >> >> Signed-off-by: Juerg Haefliger <juergh@canonical.com> >> --- >> debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ >> 1 file changed, 34 insertions(+) >> create mode 100644 debian/control.d/transitionals-raspi2 >> >> diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 >> new file mode 100644 >> index 000000000000..0d3e65cf950e >> --- /dev/null >> +++ b/debian/control.d/transitionals-raspi2 >> @@ -0,0 +1,34 @@ >> +Package: linux-headers-raspi2${variant:suffix} >> +Architecture: armhf arm64 >> +Section: oldlibs >> +Priority: optional >> +Depends: linux-headers-raspi${variant:suffix} >> +Description: Raspberry Pi Linux kernel headers (dummy transitional package) >> + Transitional package for upgrades from linux-raspi2${variant:suffix} >> + to linux-raspi${variant:suffix}. >> + >> +Package: linux-image-raspi2${variant:suffix} >> +Architecture: armhf arm64 >> +Section: oldlibs >> +Priority: optional >> +Depends: linux-image-raspi${variant:suffix} >> +Description: Raspberry Pi Linux kernel image (dummy transitional package) >> + Transitional package for upgrades from linux-raspi2${variant:suffix} >> + to linux-raspi${variant:suffix}. >> + >> +Package: linux-tools-raspi2${variant:suffix} >> +Architecture: armhf arm64 >> +Section: oldlibs >> +Depends: linux-tools-raspi${variant:suffix} >> +Description: Raspberry Pi Linux kernel tools (dummy transitional package) >> + Transitional package for upgrades from linux-raspi2${variant:suffix} >> + to linux-raspi${variant:suffix}. >> + >> +Package: linux-raspi2${variant:suffix} >> +Architecture: armhf arm64 >> +Section: oldlibs >> +Priority: optional >> +Depends: linux-raspi${variant:suffix} >> +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) >> + Transitional package for upgrades from linux-raspi2${variant:suffix} >> + to linux-raspi${variant:suffix}. >> > > Applied to focal/linux-raspi. > > Thanks, > Kleber > Please disregard this, I applied it to the wrong tree.
On 2020-06-29 10:40, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1885522 > > Add the transitionals to move the raspi2 users to the raspi flavor. > > Note that the tansitionals will only take effect once we change the > variant of this kernel set from (currently) '-hwe-18.04-edge' to > '-hwe-18.04'. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 debian/control.d/transitionals-raspi2 > > diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 > new file mode 100644 > index 000000000000..0d3e65cf950e > --- /dev/null > +++ b/debian/control.d/transitionals-raspi2 > @@ -0,0 +1,34 @@ > +Package: linux-headers-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-headers-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel headers (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-image-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-image-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel image (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-tools-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Depends: linux-tools-raspi${variant:suffix} > +Description: Raspberry Pi Linux kernel tools (dummy transitional package) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > + > +Package: linux-raspi2${variant:suffix} > +Architecture: armhf arm64 > +Section: oldlibs > +Priority: optional > +Depends: linux-raspi${variant:suffix} > +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) > + Transitional package for upgrades from linux-raspi2${variant:suffix} > + to linux-raspi${variant:suffix}. > Now applied to the correct tree, bionic/linux-meta-raspi-5.4. Thanks, Kleber
diff --git a/debian/control.d/transitionals-raspi2 b/debian/control.d/transitionals-raspi2 new file mode 100644 index 000000000000..0d3e65cf950e --- /dev/null +++ b/debian/control.d/transitionals-raspi2 @@ -0,0 +1,34 @@ +Package: linux-headers-raspi2${variant:suffix} +Architecture: armhf arm64 +Section: oldlibs +Priority: optional +Depends: linux-headers-raspi${variant:suffix} +Description: Raspberry Pi Linux kernel headers (dummy transitional package) + Transitional package for upgrades from linux-raspi2${variant:suffix} + to linux-raspi${variant:suffix}. + +Package: linux-image-raspi2${variant:suffix} +Architecture: armhf arm64 +Section: oldlibs +Priority: optional +Depends: linux-image-raspi${variant:suffix} +Description: Raspberry Pi Linux kernel image (dummy transitional package) + Transitional package for upgrades from linux-raspi2${variant:suffix} + to linux-raspi${variant:suffix}. + +Package: linux-tools-raspi2${variant:suffix} +Architecture: armhf arm64 +Section: oldlibs +Depends: linux-tools-raspi${variant:suffix} +Description: Raspberry Pi Linux kernel tools (dummy transitional package) + Transitional package for upgrades from linux-raspi2${variant:suffix} + to linux-raspi${variant:suffix}. + +Package: linux-raspi2${variant:suffix} +Architecture: armhf arm64 +Section: oldlibs +Priority: optional +Depends: linux-raspi${variant:suffix} +Description: Complete Raspberry Pi Linux kernel and headers (dummy transitional packages) + Transitional package for upgrades from linux-raspi2${variant:suffix} + to linux-raspi${variant:suffix}.
BugLink: https://bugs.launchpad.net/bugs/1885522 Add the transitionals to move the raspi2 users to the raspi flavor. Note that the tansitionals will only take effect once we change the variant of this kernel set from (currently) '-hwe-18.04-edge' to '-hwe-18.04'. Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian/control.d/transitionals-raspi2 | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 debian/control.d/transitionals-raspi2