From 46f53dd76c048bd180a08326c26137812e03e263 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 17 Jun 2023 11:54:43 +0200 Subject: [PATCH] buildsys: use annotations script to generate the base kernel build config Since ubuntu-kernel commit 7ebda4aca852 ("UBUNTU: [Config] migrate all configs into annotations") the Jammy based kernel now also dropped the pre-generated config snippets in favor of their annotation system. Do as for Lunar, adapt from commit 880dc10 ("buildsys: use annotations script to generate the base kernel build config") Signed-off-by: Thomas Lamprecht --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b5f7d7a..ac9d572 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ $(KERNEL_SRC).prepared: $(KERNEL_SRC_SUBMODULE) | submodule mkdir -p $(BUILD_DIR) cp -a $(KERNEL_SRC_SUBMODULE) $(BUILD_DIR)/$(KERNEL_SRC) # TODO: split for archs, track and diff in our repository? - cat $(BUILD_DIR)/$(KERNEL_SRC)/debian.master/config/config.common.ubuntu $(BUILD_DIR)/$(KERNEL_SRC)/debian.master/config/$(ARCH)/config.common.$(ARCH) $(BUILD_DIR)/$(KERNEL_SRC)/debian.master/config/$(ARCH)/config.flavour.generic > $(KERNEL_CFG_ORG) + cd $(BUILD_DIR)/$(KERNEL_SRC); python3 debian/scripts/misc/annotations --arch amd64 --export >../../$(KERNEL_CFG_ORG) cp $(KERNEL_CFG_ORG) $(BUILD_DIR)/$(KERNEL_SRC)/.config sed -i $(BUILD_DIR)/$(KERNEL_SRC)/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=$(EXTRAVERSION)/' rm -rf $(BUILD_DIR)/$(KERNEL_SRC)/debian $(BUILD_DIR)/$(KERNEL_SRC)/debian.master