diff mbox series

UBUNTU: snapcraft.yaml: stop invoking the obsolete (and non-existing) 'firmware_install' target

Message ID 1531839539-13086-2-git-send-email-paolo.pisati@canonical.com
State New
Headers show
Series UBUNTU: snapcraft.yaml: stop invoking the obsolete (and non-existing) 'firmware_install' target | expand

Commit Message

Paolo Pisati July 17, 2018, 2:58 p.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1782166

The snapcraft.yaml in bionic/master (by default) invokes the now obsolete
'firmware_install' target that was removed in
5620a0d1aacd554ebebcff373e31107bb1ef7769 ("firmware: delete in-kernel
firmware"), and by invoking a non existing target, it fails to build.

Since firmware files were removed from the Linux source code, and we rely on
external files provided by the linux-firmware package, skip invoking
'firmware_install' altogether and fix the build.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 snapcraft.yaml | 1 +
 1 file changed, 1 insertion(+)

Comments

Colin Ian King July 17, 2018, 3:01 p.m. UTC | #1
On 17/07/18 15:58, Paolo Pisati wrote:
> BugLink: http://bugs.launchpad.net/bugs/1782166
> 
> The snapcraft.yaml in bionic/master (by default) invokes the now obsolete
> 'firmware_install' target that was removed in
> 5620a0d1aacd554ebebcff373e31107bb1ef7769 ("firmware: delete in-kernel
> firmware"), and by invoking a non existing target, it fails to build.
> 
> Since firmware files were removed from the Linux source code, and we rely on
> external files provided by the linux-firmware package, skip invoking
> 'firmware_install' altogether and fix the build.
> 
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
> ---
>  snapcraft.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index f96d4aa..2452c40 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -21,6 +21,7 @@ parts:
>        cp debian/scripts/retpoline-extract-one \
>          $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>        snapcraftctl build
> +    kernel-with-firmware: false
>    firmware:
>      plugin: nil
>      stage-packages:
> 

Makes sense.

Acked-by: Colin Ian King <colin.king@canonical.com>
Kleber Sacilotto de Souza July 18, 2018, 2:57 p.m. UTC | #2
On 07/17/18 16:58, Paolo Pisati wrote:
> BugLink: http://bugs.launchpad.net/bugs/1782166
> 
> The snapcraft.yaml in bionic/master (by default) invokes the now obsolete
> 'firmware_install' target that was removed in
> 5620a0d1aacd554ebebcff373e31107bb1ef7769 ("firmware: delete in-kernel
> firmware"), and by invoking a non existing target, it fails to build.
> 
> Since firmware files were removed from the Linux source code, and we rely on
> external files provided by the linux-firmware package, skip invoking
> 'firmware_install' altogether and fix the build.
> 
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
> ---
>  snapcraft.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index f96d4aa..2452c40 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -21,6 +21,7 @@ parts:
>        cp debian/scripts/retpoline-extract-one \
>          $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
>        snapcraftctl build
> +    kernel-with-firmware: false
>    firmware:
>      plugin: nil
>      stage-packages:
> 
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>


Note: to be applied cleanly, this patch needs to be applied after
"UBUNTU: snapcraft.yaml: copy retpoline-extract-one to scripts before
build".
diff mbox series

Patch

diff --git a/snapcraft.yaml b/snapcraft.yaml
index f96d4aa..2452c40 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,6 +21,7 @@  parts:
       cp debian/scripts/retpoline-extract-one \
         $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one
       snapcraftctl build
+    kernel-with-firmware: false
   firmware:
     plugin: nil
     stage-packages: