From 57c24f79d0a1f86484d015a0029a7b3a22db00e5 Mon Sep 17 00:00:00 2001 From: Jianping Liu Date: Wed, 25 Sep 2024 19:07:13 +0800 Subject: [PATCH] dist,Makefile: generic-debug config only build kernel rpm We intend to archive kernle-debug rpm in yum. Release kernel will build perf/tools/bpf-tools rpm, to avoid kernle-debug build the same rpm, disable them. Signed-off-by: Jianping Liu --- dist/Makefile | 12 ++++++++---- kernel/configs/debug.config | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dist/Makefile b/dist/Makefile index 299406cb466b..e2077685a203 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -100,11 +100,15 @@ endif ### RPM build options # All params enabled by default (except kABI check, see below), ENABLED overrides DEFAULT_DISABLE. -DISABLED=$(DEFAULT_DISABLED) -ENABLED=$(DEFAULT_ENABLED) -# Automatically disable non core package for non standard build +DISABLED = $(DEFAULT_DISABLED) +ENABLED = $(DEFAULT_ENABLED) +# Automatically disable non core package for non standard build, such as eks/cloudgame ifneq ($(CONFIG),generic-release) -DISABLED=ofed bpftool perf tools +override DISABLED := ofed $(DISABLED) +endif +# generic-debug only build kernel rpm, disable other rpms +ifeq ($(CONFIG),generic-debug) +override DISABLED := bpftool perf tools headers keypkg doc $(DISABLED) endif ## A few shortcut for commonly used params: diff --git a/kernel/configs/debug.config b/kernel/configs/debug.config index 29aaff21659b..7d7d4b19ef5d 100644 --- a/kernel/configs/debug.config +++ b/kernel/configs/debug.config @@ -1,3 +1,5 @@ +CONFIG_LOCALVERSION="+debug" + # CONFIG_MODULE_SIG_FORCE is not set CONFIG_KASAN=y