[PATCH] [SRU][X/snapdragon] 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/snapdragon] Fix build with snapcraft 2.42.1

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

Impact:

Xenial/snapdragon 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/382090616/buildlog_snap_ubuntu_xenial_arm64_piso-xenial-snapdragon-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 | 6 +++---
 1 file changed, 3 insertions(+), 3 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/1785653

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 480f7ec..49d064a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -17,12 +17,11 @@ parts:
     kconfigflavour: snapdragon
     kconfigs:
       - CONFIG_DEBUG_INFO=n
+    kernel-image-target: Image
     override-build: |
       cp debian/scripts/retpoline-extract-one \
         $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
       snapcraftctl build
-    kernel-image-target: Image
-    install: |
       cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb
       cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/*.dtb $SNAPCRAFT_PART_INSTALL/dtbs/
   firmware:
@@ -35,7 +34,8 @@ parts:
     prime:
       - -usr
       - -lib
-    install: |
+    override-build: |
+      snapcraftctl build
       mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan
       ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/
     build-packages:
--
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 17:25, Paolo Pisati wrote:
> BugLink: http://bugs.launchpad.net/bugs/1785653
>
> Signed-off-by: Paolo Pisati <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>  snapcraft.yaml | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index 480f7ec..49d064a 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -17,12 +17,11 @@ parts:
>      kconfigflavour: snapdragon
>      kconfigs:
>        - CONFIG_DEBUG_INFO=n
> +    kernel-image-target: Image
>      override-build: |
>        cp debian/scripts/retpoline-extract-one \
>          $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>        snapcraftctl build
> -    kernel-image-target: Image
> -    install: |
>        cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb
>        cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/*.dtb $SNAPCRAFT_PART_INSTALL/dtbs/
>    firmware:
> @@ -35,7 +34,8 @@ parts:
>      prime:
>        - -usr
>        - -lib
> -    install: |
> +    override-build: |
> +      snapcraftctl build
>        mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan
>        ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/
>      build-packages:
>


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

signature.asc (836 bytes) Download Attachment