sync with Debian

2025-03-27 01:51:30 +03:00
parent 06a5da3214
commit 3d597650a9
75 changed files with 405 additions and 976 deletions
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -71,7 +71,9 @@ source: $(STAMPS_DIR)/source_$(FEATURESET)

 $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
 	mkdir -p '$(dir $@)'
-	debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS)
+	debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS) \
+	  -o MODULE_SIG_KEY=\"output/signing_key.pem\" \
+	  $(call if_profile, pkg.linux.quick,-o DEBUG_INFO_NONE=y -o DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=n)

 define copy_source
 mkdir -p '$(1)'
@@ -83,15 +85,17 @@ $(BUILD_DIR)/$(SOURCE_BASENAME)-source-$(UPSTREAMVERSION).tar.xz: $(STAMPS_DIR)/
 	rm -rf '$@' '$(DIR)'
 	$(call copy_source,$(DIR))
 	chmod -R u+rw,go=rX '$(DIR)'
-	find $(DIR)/ -name __pycache__ -type d -exec rm -rf {} +
-	find $(DIR)/ -name '*.pyc' -type f -exec rm -f {} +
-	find $(DIR)/ -depth -newermt '@$(SOURCE_DATE_EPOCH)' -print0 \
-	| xargs -0r touch --no-dereference --date='@$(SOURCE_DATE_EPOCH)'
+	find '$(DIR)' -depth -newermt '@$(SOURCE_DATE_EPOCH)' -print0 | \
+	  xargs -0r touch --no-dereference --date='@$(SOURCE_DATE_EPOCH)'
 	n='$(SOURCE_BASENAME)-source-$(UPSTREAMVERSION)' ; \
-	cd $(BUILD_DIR) ; \
-	find $$n/ -print0 | sort -z \
+	cd '$(BUILD_DIR)'; \
+	find "$$n/" -print0 \
+	| grep -zEv \
+	  -e '__pycache__' \
+	  -e '\.pyc$$' \
+	| sort -zuV \
 	| tar --owner=root --group=root --numeric-owner --no-recursion --null -T - -c \
-	| xz -T$(THREAD_COUNT) > $$n.tar.xz
+	| xz -T$(THREAD_COUNT) > "$$n.tar.xz"
 	rm -rf '$(DIR)'

 $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.xz: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_%
@@ -117,10 +121,7 @@ $(STAMPS_DIR)/source_%: SOURCE_DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/source_%: DIR=$(BUILD_DIR)/source_$*
 $(STAMPS_DIR)/source_%: $(STAMPS_DIR)/source
 	mkdir -p '$(BUILD_DIR)'
-	rm -rf '$(DIR)'
-	$(call copy_source,$(DIR))
-	cd '$(DIR)' \
-	  && QUILT_PATCHES='$(CURDIR)/debian/patches-$*' QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
+	set +e ; QUILT_PC=.pc quilt unapplied --quiltrc - >/dev/null && echo 'Patch series not fully applied' ; test $$? -eq 1
 	@$(stamp)
 .PRECIOUS: $(STAMPS_DIR)/source_%

@@ -167,31 +168,41 @@ endif
 	+yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null
 	@$(stamp)

+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source_$(FEATURESET)
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): OUTPUT_DIR=$(DIR)/output/image
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DT_INSTALL_DIR = /usr/lib/linux-image-$(REAL_VERSION)
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): export KBUILD_SIGN_PIN = $(shell dd if=/dev/random bs=16 count=1 status=none | base64)
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+	rm -rf '$(DIR)/output'
+	install -d '$(DIR)/output'
+
+# Make sure the support for the used key type is built-in, CRYPTO_ECDSA for ecdsa keys.
+	openssl req -new -utf8 -sha256 -days 36500 \
+	  -batch -x509 -config certs/default_x509.genkey \
+	  -passout env:KBUILD_SIGN_PIN \
+	  -outform PEM -out $(DIR)/output/signing_key.pem \
+	  -keyout $(DIR)/output/signing_key.pem \
+	  -newkey ec -pkeyopt ec_paramgen_curve:secp384r1 2>&1

-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
 	+$(MAKE_CLEAN) -C '$(DIR)'
-	@$(stamp)

-$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
-$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): INSTALL_DIR=$(BUILD_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DT_INSTALL_DIR = $(INSTALL_DIR)/usr/lib/krd-linux-image-$(REAL_VERSION)
-$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-	install -D -m644 '$(DIR)/$(IMAGE_FILE)' $(INSTALL_DIR)/boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
+	install -D -m644 '$(DIR)/$(IMAGE_FILE)' $(OUTPUT_DIR)/boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
 ifeq ($(IMAGE_FILE),vmlinux)
 # This is the unprocessed ELF image, so we need to strip debug symbols
-	$(CROSS_COMPILE)strip --strip-debug $(INSTALL_DIR)/boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
+	$(CROSS_COMPILE)strip --strip-debug $(OUTPUT_DIR)/boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
 endif
-	+$(MAKE_CLEAN) -C $(DIR) modules_install DEPMOD='$(CURDIR)/debian/bin/no-depmod' INSTALL_MOD_PATH='$(CURDIR)/$(INSTALL_DIR)' INSTALL_MOD_STRIP=1
+	+$(MAKE_CLEAN) -C $(DIR) modules_install \
+	  DEPMOD='$(CURDIR)/debian/bin/no-depmod' \
+	  INSTALL_MOD_PATH='$(CURDIR)/$(OUTPUT_DIR)' \
+	  INSTALL_MOD_STRIP=1
 ifneq ($(filter arm64 armel armhf mipsel mips64el mipsr6 mipsr6el mips64r6 mips64r6el riscv64,$(ARCH)),)
 	+$(MAKE_CLEAN) -C $(DIR) dtbs
-	+$(MAKE_CLEAN) -C $(DIR) dtbs_install INSTALL_DTBS_PATH='$(CURDIR)/$(DT_INSTALL_DIR)'
+	+$(MAKE_CLEAN) -C $(DIR) dtbs_install INSTALL_DTBS_PATH='$(CURDIR)/$(OUTPUT_DIR)/$(DT_INSTALL_DIR)'
 endif
-	rm -f $(INSTALL_DIR)/lib/modules/$(REAL_VERSION)/build
-	rm -f $(INSTALL_DIR)/lib/modules/$(REAL_VERSION)/source
+	rm -f $(OUTPUT_DIR)/lib/modules/$(REAL_VERSION)/build
+	rm -f $(OUTPUT_DIR)/lib/modules/$(REAL_VERSION)/source
 	@$(stamp)

 define dh_binary_pre
@@ -291,6 +302,7 @@ binary_headers: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)

 	cp -a $(SOURCE_DIR)/scripts/module.lds $(DIR)/arch/$(KERNEL_ARCH)

+	@echo 'KBUILD_OUTPUT=$(BASE_DIR)' >> $(DIR)/Makefile
 	@echo 'include $(BASE_DIR_COMMON)/Makefile' >> $(DIR)/Makefile

 	dh_link /usr/lib/$(PACKAGE_NAME_KBUILD)/scripts $(BASE_DIR)/scripts
@@ -366,8 +378,8 @@ binary_image: REAL_VERSION = $(ABINAME)$(LOCALVERSION)
 binary_image: SYSTEM_MAP_PATH = lib/modules/$(REAL_VERSION)/System.map.xz
 binary_image: INSTALL_DIR = $(DESTDIR)/boot
 binary_image: DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-binary_image: DIR2 = $(BUILD_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-binary_image: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+binary_image: DIR2 = $(DIR)/output/image
+binary_image: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 binary_image:
 	$(dh_binary_pre)
 	dh_install --sourcedir=$(DIR2) boot
@@ -416,12 +428,13 @@ define make-tools
     KERNEL_ARCH=$(KERNEL_ARCH)
 endef

+$(STAMPS_DIR)/build-tools-headers: BUILD_DIR_TOOLS = $(BUILD_DIR)/build-tools
 $(STAMPS_DIR)/build-tools-headers:
-	mkdir -p $(BUILD_DIR)/build-tools/headers-tools
+	mkdir -p $(BUILD_DIR_TOOLS)/headers-tools
 	$(MAKE) \
 	  ARCH=$(KERNEL_ARCH) \
-	  O=$(BUILD_DIR)/build-tools/headers-tools \
-	  INSTALL_HDR_PATH=$(CURDIR)/$(BUILD_DIR)/build-tools \
+	  O=$(BUILD_DIR_TOOLS)/headers-tools \
+	  INSTALL_HDR_PATH=$(CURDIR)/$(BUILD_DIR_TOOLS) \
 	  headers_install
 	@$(stamp)