[SRU focal:linux-oem-5.6] focal:linux-oem-5.10] LP#1905013 -- express oem flavour explicitly

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU focal:linux-oem-5.6] focal:linux-oem-5.10] LP#1905013 -- express oem flavour explicitly

Andy Whitcroft-3
All kernels have an intrisic flavour (generic, lowlatency, aws, oem etc).
These are normally expressed in the binary package names from the
primary package, and reflected into the meta packages names produced by
linux-meta and linux-restricted-modules.  The flavours are further
qualified via the variants system.

For the linux-oem-{5.6,5.10} packages the intrisic flavour is missing
and is supplied via the variant.  This is wrong as we could never have
a second flavour in this package.  This is incompatible with generating
the package from the flavour names, as it does not have an intrinsic
flavour.  Express the oem flavour explcitly for these packages.

There are three sets of patches.  The first patch is for
kernel-series.yaml and corrects the variants there.  The next two
patches are for linux-meta-oem-5.6 and linux-restricted-modules-5.10,
and the final two are for linux-meta-oem-5.10 and linux-meta-oem-5.10.

I have compared the debian/control files before and after these updates
and they are identicle.

It should be safe to apply the variants update to kteam-tools as soon as
the remainder of the patches have been applied to the various branches,
they do not need to be uploaded.

-apw

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] info/kernel-series: linux-oem-{5.6, 5, 10} oem flavour is now expressed explicitly

Andy Whitcroft-3
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 info/kernel-series.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/info/kernel-series.yaml b/info/kernel-series.yaml
index e193d8d39..befa08763 100644
--- a/info/kernel-series.yaml
+++ b/info/kernel-series.yaml
@@ -799,7 +799,7 @@
 
         linux-oem-5.6:
             versions: ['5.6.0']
-            variants: ['-oem-20.04']
+            variants: ['-20.04']
             packages:
                 linux-oem-5.6:
                     repo: ['git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-oem/+git/focal', 'oem-5.6-next']
@@ -821,7 +821,7 @@
 
         linux-oem-5.10:
             versions: ['5.10.0']
-            variants: ['-oem-20.04-edge']
+            variants: ['-20.04-edge']
             packages:
                 linux-oem-5.10:
                     repo: ['git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-oem/+git/focal', 'oem-5.10-next']
--
2.27.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[focal/oem-5.6/oem-5.6 1/1] UBUNTU: [Packaging] express oem flavour explicitly

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
BugLink: https://bugs.launchpad.net/bugs/1905013
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian/control.d/oem | 10 +++++-----
 debian/variants      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control.d/oem b/debian/control.d/oem
index 39d8caf..3bfb1c2 100644
--- a/debian/control.d/oem
+++ b/debian/control.d/oem
@@ -1,4 +1,4 @@
-Package: linux-headers${variant:suffix}
+Package: linux-headers-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides-headers}
@@ -7,7 +7,7 @@ Description: OEM Linux kernel headers
  This package will always depend on the latest OEM kernel headers
  available.
 
-Package: linux-image${variant:suffix}
+Package: linux-image-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides-image} ${dkms:zfs-modules} ${dkms:virtualbox-guest-modules} ${dkms:wireguard-linux-compat-modules}
@@ -17,7 +17,7 @@ Description: OEM Linux kernel image
  This package will always depend on the latest OEM kernel image
  available.
 
-Package: linux-tools${variant:suffix}
+Package: linux-tools-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-tools
@@ -26,11 +26,11 @@ Description: OEM Linux kernel tools
  This package will always depend on the latest OEM kernel tools
  available.
 
-Package: linux${variant:suffix}
+Package: linux-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides}
-Depends: ${misc:Depends}, linux-image${variant:suffix} (= ${binary:Version}), linux-headers${variant:suffix} (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-oem${variant:suffix} (= ${binary:Version}), linux-headers-oem${variant:suffix} (= ${binary:Version})
 Description: Complete OEM Linux kernel and headers
  This package will always depend on the latest complete OEM Linux kernel
  and headers.
diff --git a/debian/variants b/debian/variants
index 6e00ca1..234402d 100644
--- a/debian/variants
+++ b/debian/variants
@@ -1 +1 @@
--oem-20.04
+-20.04
--
2.27.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[focal/oem-5.6/oem-5.6 1/1] UBUNTU: [Packaging] express oem flavour explicitly

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
BugLink: https://bugs.launchpad.net/bugs/1905013
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian/control.d/meta-nvidia | 4 ++--
 debian/variants              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia
index 631bd87..17242c7 100644
--- a/debian/control.d/meta-nvidia
+++ b/debian/control.d/meta-nvidia
@@ -1,4 +1,4 @@
-Package: linux-modules-nvidia-450${variant:suffix}
+Package: linux-modules-nvidia-450-oem${variant:suffix}
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
@@ -8,7 +8,7 @@ Depends: ${misc:Depends}, linux-modules-nvidia-450-ABI-oem (= ${binary:Version})
 Description: Extra drivers for nvidia-450 for the OEM flavour
  Install extra signed nvidia-450 modules compatible with the OEM flavour.
 
-Package: linux-modules-nvidia-455${variant:suffix}
+Package: linux-modules-nvidia-455-oem${variant:suffix}
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
diff --git a/debian/variants b/debian/variants
index 6e00ca1..234402d 100644
--- a/debian/variants
+++ b/debian/variants
@@ -1 +1 @@
--oem-20.04
+-20.04
--
2.27.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[focal/oem-5.6/oem-5.10 1/1] UBUNTU: [Packaging] express oem flavour explicitly

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
BugLink: https://bugs.launchpad.net/bugs/1905013
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian/control.d/oem | 10 +++++-----
 debian/variants      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control.d/oem b/debian/control.d/oem
index 467e049..1c4e2de 100644
--- a/debian/control.d/oem
+++ b/debian/control.d/oem
@@ -1,4 +1,4 @@
-Package: linux-headers${variant:suffix}
+Package: linux-headers-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides-headers}
@@ -7,7 +7,7 @@ Description: OEM Linux kernel headers
  This package will always depend on the latest OEM kernel headers
  available.
 
-Package: linux-image${variant:suffix}
+Package: linux-image-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides-image} ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules}
@@ -17,7 +17,7 @@ Description: OEM Linux kernel image
  This package will always depend on the latest OEM kernel image
  available.
 
-Package: linux-tools${variant:suffix}
+Package: linux-tools-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-tools
@@ -26,11 +26,11 @@ Description: OEM Linux kernel tools
  This package will always depend on the latest OEM kernel tools
  available.
 
-Package: linux${variant:suffix}
+Package: linux-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides:  ${test:provides-full-oem} ${test:provides-full-preferred} ${variant:provides}
-Depends: ${misc:Depends}, linux-image${variant:suffix} (= ${binary:Version}), linux-headers${variant:suffix} (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-oem${variant:suffix} (= ${binary:Version}), linux-headers-oem${variant:suffix} (= ${binary:Version})
 Description: Complete OEM Linux kernel and headers
  This package will always depend on the latest complete OEM Linux kernel
  and headers.
diff --git a/debian/variants b/debian/variants
index 7edabe1..a5f9f8e 100644
--- a/debian/variants
+++ b/debian/variants
@@ -1 +1 @@
--oem-20.04-edge
+-20.04-edge
--
2.27.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[focal/oem-5.6/oem-5.10 1/1] UBUNTU: [Packaging] express oem flavour explicitly

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
BugLink: https://bugs.launchpad.net/bugs/1905013
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian/control.d/meta-nvidia | 2 +-
 debian/variants              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia
index b5115bf..adac7d6 100644
--- a/debian/control.d/meta-nvidia
+++ b/debian/control.d/meta-nvidia
@@ -1,4 +1,4 @@
-Package: linux-modules-nvidia-450${variant:suffix}
+Package: linux-modules-nvidia-450-oem${variant:suffix}
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
diff --git a/debian/variants b/debian/variants
index 7edabe1..a5f9f8e 100644
--- a/debian/variants
+++ b/debian/variants
@@ -1 +1 @@
--oem-20.04-edge
+-20.04-edge
--
2.27.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[NACK] [SRU focal:linux-oem-5.6] focal:linux-oem-5.10] LP#1905013 -- express oem flavour explicitly

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
Ok, those subjects are just confusing ... I'll clean it up and resubmit.

-apw

On Fri, Nov 20, 2020 at 01:01:44PM +0000, Andy Whitcroft wrote:

> All kernels have an intrisic flavour (generic, lowlatency, aws, oem etc).
> These are normally expressed in the binary package names from the
> primary package, and reflected into the meta packages names produced by
> linux-meta and linux-restricted-modules.  The flavours are further
> qualified via the variants system.
>
> For the linux-oem-{5.6,5.10} packages the intrisic flavour is missing
> and is supplied via the variant.  This is wrong as we could never have
> a second flavour in this package.  This is incompatible with generating
> the package from the flavour names, as it does not have an intrinsic
> flavour.  Express the oem flavour explcitly for these packages.
>
> There are three sets of patches.  The first patch is for
> kernel-series.yaml and corrects the variants there.  The next two
> patches are for linux-meta-oem-5.6 and linux-restricted-modules-5.10,
> and the final two are for linux-meta-oem-5.10 and linux-meta-oem-5.10.
>
> I have compared the debian/control files before and after these updates
> and they are identicle.
>
> It should be safe to apply the variants update to kteam-tools as soon as
> the remainder of the patches have been applied to the various branches,
> they do not need to be uploaded.
>
> -apw

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team