scripts/package: snap-pkg target

Following in footsteps of other targets like 'deb-pkg, 'rpm-pkg' and 'tar-pkg',
this patch adds a 'snap-pkg' target for the creation of a Linux kernel snap
package using the kbuild infrastructure.

A snap, in its general form, is a self contained, sandboxed, universal package
and it is intended to work across multiple distributions and/or devices. A snap
package is distributed as a single compressed squashfs filesystem.

A kernel snap is a snap package carrying the Linux kernel, kernel modules,
accessory files (DTBs, System.map, etc) and a manifesto file.  The purpose of a
kernel snap is to carry the Linux kernel during the creation of a system image,
eg. Ubuntu Core, and its subsequent upgrades.

For more information on snap packages: https://snapcraft.io/docs/

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/.gitignore b/.gitignore
index f6050b88e95b5b59e2c08dbef865d92049956e58..705e09913dc237cd4eb79e269bc1a0d83ea52d99 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,11 @@ modules.builtin
 #
 /debian/
 
+#
+# Snap directory (make snap-pkg)
+#
+/snap/
+
 #
 # tar directory (make tar*-pkg)
 #

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index c23534925b38173d8d5adeeee99b298bd6053960..61e29da374ccee453b805a3feff4e9f366a7a7fb 100644 (file)
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -94,6 +94,21 @@ bindeb-pkg: FORCE
 
 clean-dirs += $(objtree)/debian/
 
+# snap-pkg
+# ---------------------------------------------------------------------------
+snap-pkg: FORCE
+       rm -rf $(objtree)/snap
+       mkdir $(objtree)/snap
+       $(MAKE) clean
+       $(call cmd,src_tar,$(KERNELPATH))
+       sed "s@KERNELRELEASE@$(KERNELRELEASE)@; \
+               s@SRCTREE@$(shell realpath $(KERNELPATH).tar.gz)@" \
+               $(srctree)/scripts/package/snapcraft.template > \
+               $(objtree)/snap/snapcraft.yaml
+       cd $(objtree)/snap && \
+       snapcraft --target-arch=$(UTS_MACHINE)
+
+clean-dirs += $(objtree)/snap/
 
 # tarball targets
 # ---------------------------------------------------------------------------
@@ -138,6 +153,7 @@ help: FORCE
        @echo '  binrpm-pkg          - Build only the binary kernel RPM package'
        @echo '  deb-pkg             - Build both source and binary deb kernel packages'
        @echo '  bindeb-pkg          - Build only the binary kernel deb package'
+       @echo '  snap-pkg            - Build only the binary kernel snap package (will connect to external hosts)'
        @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
        @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
        @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'

diff --git a/scripts/package/snapcraft.template b/scripts/package/snapcraft.template
new file mode 100644 (file)
index 0000000..626d278
--- /dev/null
+++ b/scripts/package/snapcraft.template
@@ -0,0 +1,14 @@
+name: kernel
+version: KERNELRELEASE
+summary: Linux kernel
+description: The upstream Linux kernel
+grade: stable
+confinement: strict
+type: kernel
+
+parts:
+  kernel:
+    plugin: kernel
+    source: SRCTREE
+    source-type: tar
+    kernel-with-firmware: false