[PATCH] [SRU][X/raspi2] Fix build with snapcraft 2.42.1

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

[PATCH] [SRU][X/raspi2] Fix build with snapcraft 2.42.1

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

Impact:

Xenial/raspi2 kernel snap fails to build with latest snapcraft release (2.42.1):

https://launchpadlibrarian.net/382070508/buildlog_snap_ubuntu_xenial_arm64_piso-xenial-snapdragon-dummy_BUILDING.txt.gz

...
Selecting previously unselected package snapcraft.
Preparing to unpack .../snapcraft_2.42.1_all.deb ...
Unpacking snapcraft (2.42.1) ...
...
Running pull phase...
Issues while validating None: The 'parts/kernel' property does not match the
required schema: Parts cannot contain both 'install' and 'override-*' keywords.
Use 'override-build' instead of 'install'.
Build failed
...

that is due to the deprecation of the 'prepare, build and install' targets and
their inability to coexist with the newer 'override-build' target.

Fix:

Apply the attached patch and snap again:

https://launchpadlibrarian.net/382085652/buildlog_snap_ubuntu_xenial_armhf_piso-xenial-raspi2-dummy_BUILDING.txt.gz

this time it'll snap fine.

Regression:

It fixes the build, so none.

Paolo Pisati (1):
  UBUNTU: snapcraft.yaml: convert prepare, build and install to
    override-build

 snapcraft.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 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
|

[PATCH] UBUNTU: snapcraft.yaml: convert prepare, build and install to override-build

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

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index a5b4147..f5181ce6 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -17,12 +17,11 @@ parts:
     kconfigflavour: raspi2
     kconfigs:
       - CONFIG_DEBUG_INFO=n
+    kernel-image-target: zImage
     override-build: |
       cp debian/scripts/retpoline-extract-one \
         $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
       snapcraftctl build
-    kernel-image-target: zImage
-    install: |
       tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
       rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
   firmware:
@@ -43,13 +42,13 @@ parts:
     source: .
     after:
       - firmware
-    prepare: |
+    override-build: |
       PKGS="http://ppa.launchpad.net/snappy-dev/image/ubuntu/dists/xenial/main/binary-armhf/Packages.gz"
       PKGPATH="$(wget -q -O- $PKGS|zcat|grep-dctrl raspberrypi-wireless-firmware |\
         grep Filename|tail -1| sed 's/^Filename: //')"
       wget http://ppa.launchpad.net/snappy-dev/image/ubuntu/$PKGPATH
       dpkg -x $(basename $PKGPATH) unpack/
-    install: |
+      snapcraftctl build
       mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/brcm
       mv unpack/usr/share/doc/raspberrypi-wireless-firmware $SNAPCRAFT_PART_INSTALL/firmware/rpi-wlanfw-licenses
       mv unpack/lib/firmware/brcm/* $SNAPCRAFT_PART_INSTALL/firmware/brcm
--
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
|

ACK: [PATCH] UBUNTU: snapcraft.yaml: convert prepare, build and install to override-build

Stefan Bader-2
On 06.08.2018 16:50, Paolo Pisati wrote:
> BugLink: http://bugs.launchpad.net/bugs/1785647
>
> Signed-off-by: Paolo Pisati <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>  snapcraft.yaml | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index a5b4147..f5181ce6 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -17,12 +17,11 @@ parts:
>      kconfigflavour: raspi2
>      kconfigs:
>        - CONFIG_DEBUG_INFO=n
> +    kernel-image-target: zImage
>      override-build: |
>        cp debian/scripts/retpoline-extract-one \
>          $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>        snapcraftctl build
> -    kernel-image-target: zImage
> -    install: |
>        tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
>        rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
>    firmware:
> @@ -43,13 +42,13 @@ parts:
>      source: .
>      after:
>        - firmware
> -    prepare: |
> +    override-build: |
>        PKGS="http://ppa.launchpad.net/snappy-dev/image/ubuntu/dists/xenial/main/binary-armhf/Packages.gz"
>        PKGPATH="$(wget -q -O- $PKGS|zcat|grep-dctrl raspberrypi-wireless-firmware |\
>          grep Filename|tail -1| sed 's/^Filename: //')"
>        wget http://ppa.launchpad.net/snappy-dev/image/ubuntu/$PKGPATH
>        dpkg -x $(basename $PKGPATH) unpack/
> -    install: |
> +      snapcraftctl build
>        mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/brcm
>        mv unpack/usr/share/doc/raspberrypi-wireless-firmware $SNAPCRAFT_PART_INSTALL/firmware/rpi-wlanfw-licenses
>        mv unpack/lib/firmware/brcm/* $SNAPCRAFT_PART_INSTALL/firmware/brcm
>


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

signature.asc (836 bytes) Download Attachment