s390/crypto: Fix return code checking in cbc_paes_crypt()

[mirror_ubuntu-bionic-kernel.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2673f6f80c16b435834d18ae1778598dbf503b50..fd3397c67996296dd9b7a63fdc1a9b10fe0cb425 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,8 @@ include $(DROOT)/rules.d/1-maintainer.mk
 
 do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
 do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
-do_tools_common=true
+do_tools_common?=true
+do_tools_host?=false
 
 # Don't build tools or udebs in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
@@ -44,6 +45,14 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
        do_zfs=false
 endif
 
+# Are any of the kernel signing options enabled.
+any_signed=$(sort $(filter-out false,$(uefi_signed) $(opal_signed)))
+ifeq ($(any_signed),true)
+bin_pkg_name=$(bin_pkg_name_unsigned)
+else
+bin_pkg_name=$(bin_pkg_name_signed)
+endif
+
 # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap
 ifeq ($(DEB_STAGE),stage1)
     DEB_BUILD_PROFILES=stage1
@@ -65,6 +74,9 @@ ifeq ($(do_mainline_build),true)
        do_tools=false
        no_dumpfile=1
        do_zfs=false
+       skipabi=true
+       skipmodule=true
+       skipretpoline=true
 endif
 
 # Disable tools build and packaging if do_tools != true
@@ -72,6 +84,7 @@ ifneq ($(do_tools),true)
        do_linux_tools=
        do_cloud_tools=
        do_tools_common=
+       do_tools_host=
 endif
 
 ifeq ($(do_zfs),false)
@@ -116,6 +129,9 @@ clean: debian/control
        # Install the copyright information.
        cp $(DEBIAN)/copyright debian/copyright
 
+       # Install the retpoline extractor.
+       cp $(DROOT)/scripts/retpoline-extract-one scripts/ubuntu-retpoline-extract-one
+
        # If we have a reconstruct script use it.
        [ -f $(DEBIAN)/reconstruct ] && bash $(DEBIAN)/reconstruct
 
@@ -124,7 +140,8 @@ clean: debian/control
 
 distclean: clean
        rm -rf $(DROOT)/control debian/changelog \
-               debian/control debian/control.stub debian/copyright
+               debian/control debian/control.stub debian/copyright \
+               scripts/ubuntu-retpoline-extract-one
 
 # Builds the image, arch headers and debug packages
 include $(DROOT)/rules.d/2-binary-arch.mk
@@ -155,7 +172,7 @@ $(DEBIAN)/control.stub:                             \
        done
        flavours="$(sort $(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars))";\
        for i in $$flavours; do                                                 \
-         $(SHELL) $(DROOT)/scripts/control-create $$i |                                \
+         $(SHELL) $(DROOT)/scripts/control-create $$i "$(any_signed)" |        \
                sed -e 's/PKGVER/$(release)/g'                                  \
                -e 's/ABINUM/$(abinum)/g'                                       \
                -e 's/SRCPKGNAME/$(src_pkg_name)/g'                             \