[elbe-devel] [PATCH v1] elbepack: makofiles: debianize: in_kernel_firmware

[viraj at linutronix.de]

From: Viraj Shah <viraj.shah at linutronix.de>

As per commit ef9bcc468ebc ("Debianize - Delete old code") and
commit 174fc85cc2d3c2a ("Make Debianize kernel firmware depending on
kernel's version"), kernels with version greater than 4.13 does not
need this check at all. And since the source code to see the check is
removed, it does not make sense to have a check in mako files.
Since there is no /lib/firmware, remove it from install files.

Upstream debian do not package the scripts files, so remove it from
install target. And these script files are build for host architeture,
so they shouldn't be packaged.

Signed-off-by: Viraj Shah <viraj.shah at linutronix.de>
---
 .../debianize/kernel/linux-image.install        |  1 -
 elbepack/makofiles/debianize/kernel/rules.mako  | 17 ++++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/elbepack/makofiles/debianize/kernel/linux-image.install b/elbepack/makofiles/debianize/kernel/linux-image.install
index aa29869ed..405ac912d 100644
--- a/elbepack/makofiles/debianize/kernel/linux-image.install
+++ b/elbepack/makofiles/debianize/kernel/linux-image.install
@@ -1,5 +1,4 @@
 ./boot/*
 ./lib/modules/*/modules.*
 ./lib/modules/*/kernel/*
-./lib/firmware/*
 ./usr/lib/*
diff --git a/elbepack/makofiles/debianize/kernel/rules.mako b/elbepack/makofiles/debianize/kernel/rules.mako
index 221a5fc6c..ee9d2d29e 100755
--- a/elbepack/makofiles/debianize/kernel/rules.mako
+++ b/elbepack/makofiles/debianize/kernel/rules.mako
@@ -16,11 +16,6 @@ TMP_DIR:=$(DEB_DIR)/tmp
 BUILD_DIR:=$(DEB_DIR)/build
 
 MOD_PATH:=$(TMP_DIR)
-ifeq ($(in_kernel_firmware), 1)
-FW_PATH:=$(TMP_DIR)/lib/firmware
-else
-FW_PATH:=
-endif
 KERNEL_PATH:=$(TMP_DIR)/boot
 HDR_PATH:=$(TMP_DIR)/usr
 KERNEL_HDR_PATH:=$(TMP_DIR)/usr/src/linux-headers-$(REL)
@@ -47,10 +42,6 @@ INSTALL_PATH=$(KERNEL_PATH) \
 INSTALL_DTBS_PATH=$(DTBS_PATH) \
 O=$(BUILD_DIR)
 
-ifeq ($(in_kernel_firmware), 1)
-MAKE_OPTS += INSTALL_FW_PATH=$(FW_PATH)
-endif
-
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKE_OPTS += -j$(NUMJOBS)
@@ -76,12 +67,9 @@ override_dh_auto_build:
 	fi
 
 override_dh_auto_install:
-	mkdir -p $(MOD_PATH) $(FW_PATH) $(HDR_PATH) $(KERNEL_PATH) $(DTBS_PATH)
+	mkdir -p $(MOD_PATH) $(HDR_PATH) $(KERNEL_PATH) $(DTBS_PATH)
 	$(MAKE) $(MAKE_OPTS) ${imgtype_install}
 	$(MAKE) $(MAKE_OPTS) INSTALL_MOD_STRIP=1 modules_install
-	if test $(in_kernel_firmware) -eq 1; then \
-		$(MAKE) $(MAKE_OPTS) firmware_install; \
-	fi
 	$(MAKE) $(MAKE_OPTS) headers_install
 	if test ${k_arch} = arm -o ${k_arch} = arm64; then \
 		make $(MAKE_OPTS) dtbs_install; \
@@ -106,6 +94,9 @@ override_dh_auto_install:
 	ln -sf "/usr/src/linux-headers-$(REL)" "$(TMP_DIR)/lib/modules/$(REL)/build"
 	rm -f "$(DEB_DIR)/hdrsrcfiles" "$(DEB_DIR)/hdrobjfiles"
 
+override_dh_install:
+	dh_install -X/scripts/
+
 override_dh_auto_test:
 
 %%:
-- 
2.30.2