[PATCH] [SRU] [X/generic] Update snapcraft.yaml

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

[PATCH] [SRU] [X/generic] Update snapcraft.yaml

Paolo Pisati-5
BugLink: http://bugs.launchpad.net/bugs/1700480

Update the snapcraft.yaml we ship in Xenial to exploit some of the new feature
present in snapcraft's 3.21.

Among the improvements:

1) include the linux-firmware / linux-firmware-snapdragon package in the final
   snap
2) rename it to pc-kernel / dragonboard-kernel to match the snaps we have
   in the store
3) dynamic versioning
4) autogenerated config from debian.$DEBIAN/config/*
5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el
   and s390x (this only for -generic)

Paolo Pisati (1):
  UBUNTU: snapcraft.yaml: various improvements

 snapcraft.yaml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

--
2.7.4


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

[PATCH] UBUNTU: snapcraft.yaml: various improvements

Paolo Pisati-5
BugLink: http://bugs.launchpad.net/bugs/1700480

This patch improves over the original snapcraft.yaml we ship in Xenial,
and makes the generated kernel snap nearly identical to the one we ship
in the store.
Among the different improvements, we have:

1) include the linux-firmware package in the final snap
2) rename it to pc-kernel to match the snap we have in the store
3) dynamic versioning
4) autogenerated config from debian.$DEBIAN/config/*
5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el
and s390x

Signed-off-by: Paolo Pisati <[hidden email]>
---
 snapcraft.yaml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9ecb77df..9eb3f40 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,7 +1,12 @@
-name: ubuntu-generic-kernel
-version: 4.4.0
-summary: The generic kernel for snappy
-description: This is a generic snapped kernel, based off the xenial src and config
+name: pc-kernel
+version: null
+version-script: |
+    . debian/debian.env
+    dpkg-parsechangelog -l $DEBIAN/changelog -S version
+summary: The Ubuntu generic Linux kernel
+description: This Ubuntu generic Linux kernel
+grade: stable
+confinement: strict
 type: kernel
 
 parts:
@@ -9,8 +14,18 @@ parts:
     plugin: kernel
     source: .
     source-type: git
-    kdefconfig: ['--makefile=debian/snapcraft.mk', 'branch=master','flavour=generic', 'config']
+    kconfigflavour: generic
     kconfigs:
-      - CONFIG_LOCALVERSION="-xenial_generic"
       - CONFIG_DEBUG_INFO=n
-    kernel-image-target: bzImage
+  firmware:
+    plugin: nil
+    stage-packages:
+      - linux-firmware
+    organize:
+      lib/firmware: firmware
+    prime:
+      - -usr
+      - -lib
+    build-packages:
+      - cpio
+      - libssl-dev
--
2.7.4


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

ACK: [PATCH] UBUNTU: snapcraft.yaml: various improvements

Colin Ian King-2
On 26/06/17 10:04, Paolo Pisati wrote:

> BugLink: http://bugs.launchpad.net/bugs/1700480
>
> This patch improves over the original snapcraft.yaml we ship in Xenial,
> and makes the generated kernel snap nearly identical to the one we ship
> in the store.
> Among the different improvements, we have:
>
> 1) include the linux-firmware package in the final snap
> 2) rename it to pc-kernel to match the snap we have in the store
> 3) dynamic versioning
> 4) autogenerated config from debian.$DEBIAN/config/*
> 5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el
> and s390x
>
> Signed-off-by: Paolo Pisati <[hidden email]>
> ---
>  snapcraft.yaml | 29 ++++++++++++++++++++++-------
>  1 file changed, 22 insertions(+), 7 deletions(-)
>
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 9ecb77df..9eb3f40 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -1,7 +1,12 @@
> -name: ubuntu-generic-kernel
> -version: 4.4.0
> -summary: The generic kernel for snappy
> -description: This is a generic snapped kernel, based off the xenial src and config
> +name: pc-kernel
> +version: null
> +version-script: |
> +    . debian/debian.env
> +    dpkg-parsechangelog -l $DEBIAN/changelog -S version
> +summary: The Ubuntu generic Linux kernel
> +description: This Ubuntu generic Linux kernel
> +grade: stable
> +confinement: strict
>  type: kernel
>  
>  parts:
> @@ -9,8 +14,18 @@ parts:
>      plugin: kernel
>      source: .
>      source-type: git
> -    kdefconfig: ['--makefile=debian/snapcraft.mk', 'branch=master','flavour=generic', 'config']
> +    kconfigflavour: generic
>      kconfigs:
> -      - CONFIG_LOCALVERSION="-xenial_generic"
>        - CONFIG_DEBUG_INFO=n
> -    kernel-image-target: bzImage
> +  firmware:
> +    plugin: nil
> +    stage-packages:
> +      - linux-firmware
> +    organize:
> +      lib/firmware: firmware
> +    prime:
> +      - -usr
> +      - -lib
> +    build-packages:
> +      - cpio
> +      - libssl-dev
>
Acked-by: Colin Ian King <[hidden email]>

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

Re: [PATCH] [SRU] [X/generic] Update snapcraft.yaml

Paolo Pisati-5
In reply to this post by Paolo Pisati-5
Oh, and i forgot to mention one thing here:

https://code.launchpad.net/~p-pisati/+snap/pc-kernel

here is a snap package in my lp that generate -generic kernel snaps
out of that yaml every time i push a commit - for amd64, i386, armhf
and arm64.

For s390x and ppc64el i have two patches already queued for snapcraft
that we'll fix kernel generation for them too:

https://github.com/snapcore/snapcraft/pull/1376
https://github.com/snapcore/snapcraft/pull/1377


On Mon, Jun 26, 2017 at 11:04 AM, Paolo Pisati
<[hidden email]> wrote:

> BugLink: http://bugs.launchpad.net/bugs/1700480
>
> Update the snapcraft.yaml we ship in Xenial to exploit some of the new feature
> present in snapcraft's 3.21.
>
> Among the improvements:
>
> 1) include the linux-firmware / linux-firmware-snapdragon package in the final
>    snap
> 2) rename it to pc-kernel / dragonboard-kernel to match the snaps we have
>    in the store
> 3) dynamic versioning
> 4) autogenerated config from debian.$DEBIAN/config/*
> 5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el
>    and s390x (this only for -generic)
>
> Paolo Pisati (1):
>   UBUNTU: snapcraft.yaml: various improvements
>
>  snapcraft.yaml | 29 ++++++++++++++++++++++-------
>  1 file changed, 22 insertions(+), 7 deletions(-)
>
> --
> 2.7.4
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team



--
bye,
p.

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

Re: [PATCH] [SRU] [X/generic] Update snapcraft.yaml

Colin Ian King-2
On 26/06/17 10:14, Paolo Pisati wrote:

> Oh, and i forgot to mention one thing here:
>
> https://code.launchpad.net/~p-pisati/+snap/pc-kernel
>
> here is a snap package in my lp that generate -generic kernel snaps
> out of that yaml every time i push a commit - for amd64, i386, armhf
> and arm64.
>
> For s390x and ppc64el i have two patches already queued for snapcraft
> that we'll fix kernel generation for them too:
>
> https://github.com/snapcore/snapcraft/pull/1376
> https://github.com/snapcore/snapcraft/pull/1377

Nice one Paolo.

>
>
> On Mon, Jun 26, 2017 at 11:04 AM, Paolo Pisati
> <[hidden email]> wrote:
>> BugLink: http://bugs.launchpad.net/bugs/1700480
>>
>> Update the snapcraft.yaml we ship in Xenial to exploit some of the new feature
>> present in snapcraft's 3.21.
>>
>> Among the improvements:
>>
>> 1) include the linux-firmware / linux-firmware-snapdragon package in the final
>>    snap
>> 2) rename it to pc-kernel / dragonboard-kernel to match the snaps we have
>>    in the store
>> 3) dynamic versioning
>> 4) autogenerated config from debian.$DEBIAN/config/*
>> 5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el
>>    and s390x (this only for -generic)
>>
>> Paolo Pisati (1):
>>   UBUNTU: snapcraft.yaml: various improvements
>>
>>  snapcraft.yaml | 29 ++++++++++++++++++++++-------
>>  1 file changed, 22 insertions(+), 7 deletions(-)
>>
>> --
>> 2.7.4
>>
>>
>> --
>> kernel-team mailing list
>> [hidden email]
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
>
>


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

ACK: [PATCH] UBUNTU: snapcraft.yaml: various improvements

Shrirang Bagul
In reply to this post by Paolo Pisati-5
On Mon, 2017-06-26 at 11:04 +0200, Paolo Pisati wrote:

> BugLink: http://bugs.launchpad.net/bugs/1700480
>
> This patch improves over the original snapcraft.yaml we ship in Xenial,
> and makes the generated kernel snap nearly identical to the one we ship
> in the store.
> Among the different improvements, we have:
>
> 1) include the linux-firmware package in the final snap
> 2) rename it to pc-kernel to match the snap we have in the store
> 3) dynamic versioning
> 4) autogenerated config from debian.$DEBIAN/config/*
> 5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el
> and s390x
>
> Signed-off-by: Paolo Pisati <[hidden email]>
> ---
>  snapcraft.yaml | 29 ++++++++++++++++++++++-------
>  1 file changed, 22 insertions(+), 7 deletions(-)
>
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 9ecb77df..9eb3f40 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -1,7 +1,12 @@
> -name: ubuntu-generic-kernel
> -version: 4.4.0
> -summary: The generic kernel for snappy
> -description: This is a generic snapped kernel, based off the xenial src and config
> +name: pc-kernel
> +version: null
> +version-script: |
> +    . debian/debian.env
> +    dpkg-parsechangelog -l $DEBIAN/changelog -S version
> +summary: The Ubuntu generic Linux kernel
> +description: This Ubuntu generic Linux kernel
> +grade: stable
> +confinement: strict
>  type: kernel
>  
>  parts:
> @@ -9,8 +14,18 @@ parts:
>      plugin: kernel
>      source: .
>      source-type: git
> -    kdefconfig: ['--makefile=debian/snapcraft.mk',
> 'branch=master','flavour=generic', 'config']
> +    kconfigflavour: generic
>      kconfigs:
> -      - CONFIG_LOCALVERSION="-xenial_generic"
>        - CONFIG_DEBUG_INFO=n
> -    kernel-image-target: bzImage
> +  firmware:
> +    plugin: nil
> +    stage-packages:
> +      - linux-firmware
> +    organize:
> +      lib/firmware: firmware
> +    prime:
> +      - -usr
> +      - -lib
> +    build-packages:
> +      - cpio
> +      - libssl-dev
> -- 
Acked-by: Shrirang Bagul <[hidden email]>


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

APPLIED: [PATCH] [SRU] [X/generic] Update snapcraft.yaml

Thadeu Lima de Souza Cascardo-3
In reply to this post by Paolo Pisati-5
Applied to xenial master-next branch.

Thanks.
Cascardo.

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