Drop kernel-wedge stuff and don't build installer stuff for Grml
authorMichael Prokop <mika@grml.org>
Tue, 11 Dec 2018 21:44:07 +0000 (22:44 +0100)
committerMichael Prokop <mika@grml.org>
Thu, 13 Dec 2018 12:41:42 +0000 (13:41 +0100)
linux/debian/bin/gencontrol.py
linux/debian/bin/gencontrol_signed.py
linux/debian/rules.real

index 32e3773..d40ba65 100755 (executable)
@@ -100,7 +100,8 @@ class Gencontrol(Base):
                     'Unable to disable installer modules in release build '
                     '(DEBIAN_KERNEL_DISABLE_INSTALLER set)')
         elif re.match(r"grml.*", self.changelog[0].distribution):
-            print("Disabling installer modules since we are building for Grml.")
+            import warnings
+            warnings.warn('Disabling installer modules since we are building for Grml.')
         elif self.config.merge('packages').get('installer', True):
             # Add udebs using kernel-wedge
             kw_env = os.environ.copy()
index 6b53e06..88d0853 100755 (executable)
@@ -76,6 +76,9 @@ class Gencontrol(Base):
                 raise RuntimeError(
                     'Unable to disable installer modules in release build '
                     '(DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+        elif re.match(r"grml.*", self.changelog[0].distribution):
+            import warnings
+            warnings.warn('Disabling installer modules since we are building for Grml.')
         elif self.config.merge('packages').get('installer', True):
             # Add udebs using kernel-wedge
             kw_env = os.environ.copy()
index faa40f0..9e0d835 100644 (file)
@@ -545,31 +545,6 @@ install-signed-template_$(ARCH):
                $(CODE_SIGNING_DIR)/source-template/debian/
        +$(MAKE_SELF) install-base
 
-install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
-install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer
-install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%)
-ifeq ($(UDEB_UNSIGNED_TEST_BUILD),True)
-install-udeb_$(ARCH): export DEB_BUILD_PROFILES=pkg.linux.udeb-unsigned-test-build
-endif
-install-udeb_$(ARCH):
-       dh_testdir
-       dh_prep
-ifeq ($(UDEB_UNSIGNED_TEST_BUILD),True)
-# kernel-wedge doesn't expect a -unsigned suffix; work around that for now
-       while read flavour; do \
-               rm -f debian/linux-image-$(ABINAME)-$$flavour; \
-               ln -s linux-image-$(ABINAME)-$$flavour-unsigned \
-                       debian/linux-image-$(ABINAME)-$$flavour; \
-       done < <(awk '!/^#/ { print $$3 }' $(KW_CONFIG_DIR)/kernel-versions)
-endif
-       kernel-wedge install-files $(ABINAME)
-       kernel-wedge check $(PACKAGE_NAMES)
-       dh_fixperms
-ifeq ($(UDEB_UNSIGNED_TEST_BUILD),False)
-       dh_gencontrol
-       dh_builddeb
-endif
-
 install-source: PACKAGE_NAME = $(SOURCE_BASENAME)-source-$(VERSION)
 install-source: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-source: $(BUILD_DIR)/$(SOURCE_BASENAME)-source-$(UPSTREAMVERSION).tar.xz $(foreach FEATURESET,$(filter-out none,$(ALL_FEATURESETS)),$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-$(FEATURESET).patch.xz)