[SRU,D/E/F:raspi2] UBUNTU: [Packaging] raspi2: Fix snapcraft.yaml

BugLink: https://bugs.launchpad.net/bugs/1851469

The current snapcraft.yaml file on the raspi2 branch is the one from the
main/master kernel and not the raspi2 version. Fix that.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 snapcraft.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

On 11/6/19 4:40 AM, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1851469
> 
> The current snapcraft.yaml file on the raspi2 branch is the one from the
> main/master kernel and not the raspi2 version. Fix that.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>

Acked-by: Connor Kuehl <connor.kuehl@canonical.com>

> ---
>   snapcraft.yaml | 14 +++++++++-----
>   1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 2452c4031066..e10e356c9189 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -1,10 +1,10 @@
> -name: pc-kernel
> +name: pi2-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
> +summary: The Canonical raspi2 Linux kernel
> +description: The Canonical raspi2 Linux kernel
>   grade: stable
>   confinement: strict
>   type: kernel
> @@ -14,14 +14,17 @@ parts:
>       plugin: kernel
>       source: .
>       source-type: git
> -    kconfigflavour: generic
> +    kconfigflavour: raspi2
>       kconfigs:
>         - CONFIG_DEBUG_INFO=n
> +    kernel-image-target: zImage
> +    kernel-with-firmware: false
>       override-build: |
>         cp debian/scripts/retpoline-extract-one \
>           $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>         snapcraftctl build
> -    kernel-with-firmware: false
> +      tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
> +      rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
>     firmware:
>       plugin: nil
>       stage-packages:
> @@ -34,3 +37,4 @@ parts:
>       build-packages:
>         - cpio
>         - libssl-dev
> +      - dpkg-dev
>

On 06.11.19 13:40, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1851469
> 
> The current snapcraft.yaml file on the raspi2 branch is the one from the
> main/master kernel and not the raspi2 version. Fix that.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---

Short-term ok, long-term it would be simpler to have the real file in the
flavour specific sub-directory and only a link in the top-level dir. If that is
possible...


>  snapcraft.yaml | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 2452c4031066..e10e356c9189 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -1,10 +1,10 @@
> -name: pc-kernel
> +name: pi2-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
> +summary: The Canonical raspi2 Linux kernel
> +description: The Canonical raspi2 Linux kernel
>  grade: stable
>  confinement: strict
>  type: kernel
> @@ -14,14 +14,17 @@ parts:
>      plugin: kernel
>      source: .
>      source-type: git
> -    kconfigflavour: generic
> +    kconfigflavour: raspi2
>      kconfigs:
>        - CONFIG_DEBUG_INFO=n
> +    kernel-image-target: zImage
> +    kernel-with-firmware: false
>      override-build: |
>        cp debian/scripts/retpoline-extract-one \
>          $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>        snapcraftctl build
> -    kernel-with-firmware: false
> +      tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
> +      rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
>    firmware:
>      plugin: nil
>      stage-packages:
> @@ -34,3 +37,4 @@ parts:
>      build-packages:
>        - cpio
>        - libssl-dev
> +      - dpkg-dev
>

On 2019-11-06 13:40:44 , Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1851469
> 
> The current snapcraft.yaml file on the raspi2 branch is the one from the
> main/master kernel and not the raspi2 version. Fix that.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  snapcraft.yaml | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 2452c4031066..e10e356c9189 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -1,10 +1,10 @@
> -name: pc-kernel
> +name: pi2-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
> +summary: The Canonical raspi2 Linux kernel
> +description: The Canonical raspi2 Linux kernel
>  grade: stable
>  confinement: strict
>  type: kernel
> @@ -14,14 +14,17 @@ parts:
>      plugin: kernel
>      source: .
>      source-type: git
> -    kconfigflavour: generic
> +    kconfigflavour: raspi2
>      kconfigs:
>        - CONFIG_DEBUG_INFO=n
> +    kernel-image-target: zImage
> +    kernel-with-firmware: false
>      override-build: |
>        cp debian/scripts/retpoline-extract-one \
>          $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>        snapcraftctl build
> -    kernel-with-firmware: false
> +      tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
> +      rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
>    firmware:
>      plugin: nil
>      stage-packages:
> @@ -34,3 +37,4 @@ parts:
>      build-packages:
>        - cpio
>        - libssl-dev
> +      - dpkg-dev
> -- 
> 2.20.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team