UBUNTU: [Packaging] buildinfo -- add basic build information

BugLink: http://bugs.launchpad.net/bugs/1806380
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian/control.d/flavour-buildinfo.stub b/debian/control.d/flavour-buildinfo.stub
new file mode 100644 (file)
index 0000000..ed92b3d
--- /dev/null
+++ b/debian/control.d/flavour-buildinfo.stub
@@ -0,0 +1,13 @@
+
+Package: linux-buildinfo-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
+Architecture: ARCH
+Section: kernel
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Built-Using: ${linux:BuiltUsing}
+Description: Linux kernel buildinfo for version PKGVER on DESC
+ This package contains the Linux kernel buildinfo for version PKGVER on
+ DESC.
+ .
+ You likely do not want to install this package.

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index d45d5d89ccafa1d400beafd2f8a9684a69e021ba..44c1ba11908dfc4bbd008f31ae2e0e3de5dae549 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -134,6 +134,7 @@ bin_pkg_name_signed=linux-image-$(abi_release)
 bin_pkg_name_unsigned=linux-image-unsigned-$(abi_release)
 mods_pkg_name=linux-modules-$(abi_release)
 mods_extra_pkg_name=linux-modules-extra-$(abi_release)
+bldinfo_pkg_name=linux-buildinfo-$(abi_release)
 hdrs_pkg_name=linux-headers-$(abi_release)
 indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release)
 

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index b8bc97cf6113b944a46a7cd8cfed56f893a8bfd0..3d56ea90a8de2d946216e640f8afd27dd14bdaee 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -97,6 +97,7 @@ endef
 install-%: pkgdir_bin = $(CURDIR)/debian/$(bin_pkg_name)-$*
 install-%: pkgdir = $(CURDIR)/debian/$(mods_pkg_name)-$*
 install-%: pkgdir_ex = $(CURDIR)/debian/$(mods_extra_pkg_name)-$*
+install-%: pkgdir_bldinfo = $(CURDIR)/debian/$(bldinfo_pkg_name)-$*
 install-%: bindoc = $(pkgdir)/usr/share/doc/$(bin_pkg_name)-$*
 install-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
 install-%: signingv = $(CURDIR)/debian/$(bin_pkg_name)-signing/$(release)-$(revision)
@@ -161,10 +162,6 @@ endif
        install -d $(pkgdir)/boot
        install -m644 $(builddir)/build-$*/.config \
                $(pkgdir)/boot/config-$(abi_release)-$*
-       install -m644 $(abidir)/$* \
-               $(pkgdir)/boot/abi-$(abi_release)-$*
-       install -m644 $(abidir)/$*.retpoline \
-               $(pkgdir)/boot/retpoline-$(abi_release)-$*
        install -m600 $(builddir)/build-$*/System.map \
                $(pkgdir)/boot/System.map-$(abi_release)-$*
        if [ "$(filter true,$(do_dtbs))" ]; then \
@@ -422,6 +419,17 @@ endif
                echo "# RETPOLINE NOT ENABLED" >$(abidir)/$*.retpoline; \
        fi
 
+       # Build the buildinfo package content.
+       install -d $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*
+       install -m644 $(builddir)/build-$*/.config \
+               $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/config
+       install -m644 $(abidir)/$* \
+               $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/abi
+       install -m644 $(abidir)/$*.modules \
+               $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/modules
+       install -m644 $(abidir)/$*.retpoline \
+               $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/retpoline
+
 headers_tmp := $(CURDIR)/debian/tmp-headers
 headers_dir := $(CURDIR)/debian/linux-libc-dev
 
@@ -493,6 +501,7 @@ binary-%: pkgimg = $(bin_pkg_name)-$*
 binary-%: pkgimg_mods = $(mods_pkg_name)-$*
 binary-%: pkgimg_ex = $(mods_extra_pkg_name)-$*
 binary-%: pkgdir_ex = $(CURDIR)/debian/$(extra_pkg_name)-$*
+binary-%: pkgbldinfo = $(bldinfo_pkg_name)-$*
 binary-%: pkghdr = $(hdrs_pkg_name)-$*
 binary-%: dbgpkg = $(bin_pkg_name)-$*-dbgsym
 binary-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
@@ -523,6 +532,7 @@ ifeq ($(do_extras_package),true)
   endif
 endif
 
+       $(call dh_all,$(pkgbldinfo))
        $(call dh_all,$(pkghdr))
 
 ifneq ($(skipsub),true)

diff --git a/debian/scripts/control-create b/debian/scripts/control-create
index 9fcb112c2c59dd696e5c966bdb4edd593ad23d3e..30b08100c0fda2674208abf5e1982b58f8fe30dd 100755 (executable)
--- a/debian/scripts/control-create
+++ b/debian/scripts/control-create
@@ -9,7 +9,7 @@ any_signed=$2
 
 if [ "$is_sub" = "" ]; then
        flavour=$(basename $vars | sed 's/.*\.//')
-       stub=${DEBIAN}/control.d/flavour-control.stub
+       stub="${DEBIAN}/control.d/flavour-control.stub debian/control.d/flavour-buildinfo.stub"
        if [ "$any_signed" = 'true' ]; then
                sign_me_pkg="-unsigned"
                sign_me_txt=" unsigned"