| Message ID | 20230425100152.1142093-1-dimitri.ledkov@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [jammy:linux-meta-azure-fde-5.19,SRU] UBUNTU: [Packaging] drop version from linux-azure-fde-edge meta names | expand |
On 23/04/25 11:01AM, Dimitri John Ledkov wrote: > FDE edge variant should just be called `linux-azure-fde-edge` like it > was called before in jammy, and in focal. `linux-azure-fde-5.19-edge` > was a mistake. > > BugLink: https://bugs.launchpad.net/bugs/2017658 > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com> > --- > debian/control.d/azure-fde | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/debian/control.d/azure-fde b/debian/control.d/azure-fde > index fb14964691..c3d30eadfa 100644 > --- a/debian/control.d/azure-fde > +++ b/debian/control.d/azure-fde > @@ -1,4 +1,4 @@ > -Package: linux-headers-azure-fde-5.19${variant:suffix} > +Package: linux-headers-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > @@ -7,7 +7,7 @@ Description: Linux kernel headers for Azure systems. > This package will always depend on the latest kernel headers available > for Azure systems. > > -Package: linux-image-azure-fde-5.19${variant:suffix} > +Package: linux-image-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > @@ -16,27 +16,27 @@ Description: Linux kernel image for Azure systems. > This package will always depend on the latest kernel image available > for Azure systems. > > -Package: linux-modules-extra-azure-fde-5.19${variant:suffix} > +Package: linux-modules-extra-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > -Provides: ${test:provides-modules-extra-azure-fde-5.19} > +Provides: ${test:provides-modules-extra-azure-fde} > Depends: ${misc:Depends}, linux-modules-extra-${kernel-abi-version}-azure > Description: Linux kernel extra modules for Azure systems. > This package will always depend on the latest extra modules package > available for Azure systems. > > -Package: linux-azure-fde-5.19${variant:suffix} > +Package: linux-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > -Provides: ${test:provides-full-azure-fde-5.19} ${test:provides-full-preferred} > -Depends: ${misc:Depends}, linux-image-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}) > +Provides: ${test:provides-full-azure-fde} ${test:provides-full-preferred} > +Depends: ${misc:Depends}, linux-image-azure-fde${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde${variant:suffix} (= ${binary:Version}) > Description: Complete Linux kernel for Azure systems. > This package will always depend on the latest complete Linux kernel available > for Azure systems. > > -Package: linux-tools-azure-fde-5.19${variant:suffix} > +Package: linux-tools-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-azure > @@ -44,7 +44,7 @@ Description: Linux kernel versioned tools for Azure systems. > This package will always depend on the latest Linux kernel versioned tools > available for Azure systems. > > -Package: linux-cloud-tools-azure-fde-5.19${variant:suffix} > +Package: linux-cloud-tools-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-azure > -- > 2.34.1
On 4/25/23 4:01 AM, Dimitri John Ledkov wrote: > FDE edge variant should just be called `linux-azure-fde-edge` like it > was called before in jammy, and in focal. `linux-azure-fde-5.19-edge` > was a mistake. > > BugLink: https://bugs.launchpad.net/bugs/2017658 > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> > --- > debian/control.d/azure-fde | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/debian/control.d/azure-fde b/debian/control.d/azure-fde > index fb14964691..c3d30eadfa 100644 > --- a/debian/control.d/azure-fde > +++ b/debian/control.d/azure-fde > @@ -1,4 +1,4 @@ > -Package: linux-headers-azure-fde-5.19${variant:suffix} > +Package: linux-headers-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > @@ -7,7 +7,7 @@ Description: Linux kernel headers for Azure systems. > This package will always depend on the latest kernel headers available > for Azure systems. > > -Package: linux-image-azure-fde-5.19${variant:suffix} > +Package: linux-image-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > @@ -16,27 +16,27 @@ Description: Linux kernel image for Azure systems. > This package will always depend on the latest kernel image available > for Azure systems. > > -Package: linux-modules-extra-azure-fde-5.19${variant:suffix} > +Package: linux-modules-extra-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > -Provides: ${test:provides-modules-extra-azure-fde-5.19} > +Provides: ${test:provides-modules-extra-azure-fde} > Depends: ${misc:Depends}, linux-modules-extra-${kernel-abi-version}-azure > Description: Linux kernel extra modules for Azure systems. > This package will always depend on the latest extra modules package > available for Azure systems. > > -Package: linux-azure-fde-5.19${variant:suffix} > +Package: linux-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > -Provides: ${test:provides-full-azure-fde-5.19} ${test:provides-full-preferred} > -Depends: ${misc:Depends}, linux-image-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}) > +Provides: ${test:provides-full-azure-fde} ${test:provides-full-preferred} > +Depends: ${misc:Depends}, linux-image-azure-fde${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde${variant:suffix} (= ${binary:Version}) > Description: Complete Linux kernel for Azure systems. > This package will always depend on the latest complete Linux kernel available > for Azure systems. > > -Package: linux-tools-azure-fde-5.19${variant:suffix} > +Package: linux-tools-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-azure > @@ -44,7 +44,7 @@ Description: Linux kernel versioned tools for Azure systems. > This package will always depend on the latest Linux kernel versioned tools > available for Azure systems. > > -Package: linux-cloud-tools-azure-fde-5.19${variant:suffix} > +Package: linux-cloud-tools-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-azure Acked-by: Tim Gardner <tim.gardner@canonical.com>
On 4/25/23 4:01 AM, Dimitri John Ledkov wrote: > FDE edge variant should just be called `linux-azure-fde-edge` like it > was called before in jammy, and in focal. `linux-azure-fde-5.19-edge` > was a mistake. > > BugLink: https://bugs.launchpad.net/bugs/2017658 > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> > --- > debian/control.d/azure-fde | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/debian/control.d/azure-fde b/debian/control.d/azure-fde > index fb14964691..c3d30eadfa 100644 > --- a/debian/control.d/azure-fde > +++ b/debian/control.d/azure-fde > @@ -1,4 +1,4 @@ > -Package: linux-headers-azure-fde-5.19${variant:suffix} > +Package: linux-headers-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > @@ -7,7 +7,7 @@ Description: Linux kernel headers for Azure systems. > This package will always depend on the latest kernel headers available > for Azure systems. > > -Package: linux-image-azure-fde-5.19${variant:suffix} > +Package: linux-image-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > @@ -16,27 +16,27 @@ Description: Linux kernel image for Azure systems. > This package will always depend on the latest kernel image available > for Azure systems. > > -Package: linux-modules-extra-azure-fde-5.19${variant:suffix} > +Package: linux-modules-extra-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > -Provides: ${test:provides-modules-extra-azure-fde-5.19} > +Provides: ${test:provides-modules-extra-azure-fde} > Depends: ${misc:Depends}, linux-modules-extra-${kernel-abi-version}-azure > Description: Linux kernel extra modules for Azure systems. > This package will always depend on the latest extra modules package > available for Azure systems. > > -Package: linux-azure-fde-5.19${variant:suffix} > +Package: linux-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Priority: optional > -Provides: ${test:provides-full-azure-fde-5.19} ${test:provides-full-preferred} > -Depends: ${misc:Depends}, linux-image-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}) > +Provides: ${test:provides-full-azure-fde} ${test:provides-full-preferred} > +Depends: ${misc:Depends}, linux-image-azure-fde${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde${variant:suffix} (= ${binary:Version}) > Description: Complete Linux kernel for Azure systems. > This package will always depend on the latest complete Linux kernel available > for Azure systems. > > -Package: linux-tools-azure-fde-5.19${variant:suffix} > +Package: linux-tools-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-azure > @@ -44,7 +44,7 @@ Description: Linux kernel versioned tools for Azure systems. > This package will always depend on the latest Linux kernel versioned tools > available for Azure systems. > > -Package: linux-cloud-tools-azure-fde-5.19${variant:suffix} > +Package: linux-cloud-tools-azure-fde${variant:suffix} > Architecture: amd64 > Section: metapackages > Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-azure Applied to jammy linux-meta-azure-fde-5.19:azure-fde-5.19. Thanks. -rtg
diff --git a/debian/control.d/azure-fde b/debian/control.d/azure-fde index fb14964691..c3d30eadfa 100644 --- a/debian/control.d/azure-fde +++ b/debian/control.d/azure-fde @@ -1,4 +1,4 @@ -Package: linux-headers-azure-fde-5.19${variant:suffix} +Package: linux-headers-azure-fde${variant:suffix} Architecture: amd64 Section: metapackages Priority: optional @@ -7,7 +7,7 @@ Description: Linux kernel headers for Azure systems. This package will always depend on the latest kernel headers available for Azure systems. -Package: linux-image-azure-fde-5.19${variant:suffix} +Package: linux-image-azure-fde${variant:suffix} Architecture: amd64 Section: metapackages Priority: optional @@ -16,27 +16,27 @@ Description: Linux kernel image for Azure systems. This package will always depend on the latest kernel image available for Azure systems. -Package: linux-modules-extra-azure-fde-5.19${variant:suffix} +Package: linux-modules-extra-azure-fde${variant:suffix} Architecture: amd64 Section: metapackages Priority: optional -Provides: ${test:provides-modules-extra-azure-fde-5.19} +Provides: ${test:provides-modules-extra-azure-fde} Depends: ${misc:Depends}, linux-modules-extra-${kernel-abi-version}-azure Description: Linux kernel extra modules for Azure systems. This package will always depend on the latest extra modules package available for Azure systems. -Package: linux-azure-fde-5.19${variant:suffix} +Package: linux-azure-fde${variant:suffix} Architecture: amd64 Section: metapackages Priority: optional -Provides: ${test:provides-full-azure-fde-5.19} ${test:provides-full-preferred} -Depends: ${misc:Depends}, linux-image-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde-5.19${variant:suffix} (= ${binary:Version}) +Provides: ${test:provides-full-azure-fde} ${test:provides-full-preferred} +Depends: ${misc:Depends}, linux-image-azure-fde${variant:suffix} (= ${binary:Version}), linux-headers-azure-fde${variant:suffix} (= ${binary:Version}), linux-tools-azure-fde${variant:suffix} (= ${binary:Version}), linux-cloud-tools-azure-fde${variant:suffix} (= ${binary:Version}) Description: Complete Linux kernel for Azure systems. This package will always depend on the latest complete Linux kernel available for Azure systems. -Package: linux-tools-azure-fde-5.19${variant:suffix} +Package: linux-tools-azure-fde${variant:suffix} Architecture: amd64 Section: metapackages Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-azure @@ -44,7 +44,7 @@ Description: Linux kernel versioned tools for Azure systems. This package will always depend on the latest Linux kernel versioned tools available for Azure systems. -Package: linux-cloud-tools-azure-fde-5.19${variant:suffix} +Package: linux-cloud-tools-azure-fde${variant:suffix} Architecture: amd64 Section: metapackages Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-azure
FDE edge variant should just be called `linux-azure-fde-edge` like it was called before in jammy, and in focal. `linux-azure-fde-5.19-edge` was a mistake. BugLink: https://bugs.launchpad.net/bugs/2017658 Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> --- debian/control.d/azure-fde | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)