| Message ID | 20220905071615.523877-1-jianhui.lee@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [kernel-snaps-uc20:intel] intel: repack intel-kernel snap from intel-iotg-kernel snap | expand |
Applied, tweaked to use 20/edge however, after more discussions with a stable team. This means we build/crank intel-kernel, only when intel-iotg-kernel is published in 20/edge (not currently enforced), and then promote them as normal. On Mon, 5 Sept 2022 at 08:17, Jian Hui Lee <jianhui.lee@canonical.com> wrote: > > This patch rewrites intel-kernel snapcraft.yaml packaging to repack from intel-iotg-kernel snap by using stag-snaps. > > Signed-off-by: Jian Hui Lee <jianhui.lee@canonical.com> > --- > kernel-info.yaml | 2 +- > snapcraft.yaml | 26 +++++++++++--------------- > 2 files changed, 12 insertions(+), 16 deletions(-) > > diff --git a/kernel-info.yaml b/kernel-info.yaml > index 986c92c..acaad8c 100644 > --- a/kernel-info.yaml > +++ b/kernel-info.yaml > @@ -2,5 +2,5 @@ > # Kernel Source Information > # > series: focal > -source: linux-uc20-intel > +source: linux-uc20-intel-iotg > version: 5.13.0-1017.19.1 > diff --git a/snapcraft.yaml b/snapcraft.yaml > index 9a2b636..1b03d8b 100644 > --- a/snapcraft.yaml > +++ b/snapcraft.yaml > @@ -1,24 +1,20 @@ > name: intel-kernel > -version: 5.13.0-1017.19.1 > +adopt-info: kernel > summary: generic linux kernel > description: The Intel Ubuntu kernel package as a snap > type: kernel > +grade: stable > confinement: strict > build-base: core20 > > parts: > kernel: > - source: git://git.launchpad.net/~canonical-kernel-snaps/+git/kernel-snaps-uc20 > - source-type: git > - source-branch: master > - plugin: make > - make-parameters: > - - KERNEL_SOURCE=focal:linux-uc20-intel > - - KERNEL=linux-image-uc20-intel > - - KERNEL_IMAGE_FORMAT=efi > - - PROPOSED=true > - build-packages: > - - debootstrap > - - gnupg > - - kmod > - - lsb-release > + plugin: nil > + # Set this snap version to the meta version of kernel.efi > + override-pull: | > + snapcraftctl pull > + snapcraftctl set-version "$(snap info intel-iotg-kernel | yq '.channels.20/stable | split(" ").0')" > + build-snaps: > + - yq > + stage-snaps: > + - intel-iotg-kernel/20/stable > -- > 2.34.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/kernel-info.yaml b/kernel-info.yaml index 986c92c..acaad8c 100644 --- a/kernel-info.yaml +++ b/kernel-info.yaml @@ -2,5 +2,5 @@ # Kernel Source Information # series: focal -source: linux-uc20-intel +source: linux-uc20-intel-iotg version: 5.13.0-1017.19.1 diff --git a/snapcraft.yaml b/snapcraft.yaml index 9a2b636..1b03d8b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,24 +1,20 @@ name: intel-kernel -version: 5.13.0-1017.19.1 +adopt-info: kernel summary: generic linux kernel description: The Intel Ubuntu kernel package as a snap type: kernel +grade: stable confinement: strict build-base: core20 parts: kernel: - source: git://git.launchpad.net/~canonical-kernel-snaps/+git/kernel-snaps-uc20 - source-type: git - source-branch: master - plugin: make - make-parameters: - - KERNEL_SOURCE=focal:linux-uc20-intel - - KERNEL=linux-image-uc20-intel - - KERNEL_IMAGE_FORMAT=efi - - PROPOSED=true - build-packages: - - debootstrap - - gnupg - - kmod - - lsb-release + plugin: nil + # Set this snap version to the meta version of kernel.efi + override-pull: | + snapcraftctl pull + snapcraftctl set-version "$(snap info intel-iotg-kernel | yq '.channels.20/stable | split(" ").0')" + build-snaps: + - yq + stage-snaps: + - intel-iotg-kernel/20/stable
This patch rewrites intel-kernel snapcraft.yaml packaging to repack from intel-iotg-kernel snap by using stag-snaps. Signed-off-by: Jian Hui Lee <jianhui.lee@canonical.com> --- kernel-info.yaml | 2 +- snapcraft.yaml | 26 +++++++++++--------------- 2 files changed, 12 insertions(+), 16 deletions(-)