From 8863ede2581238ddf312fbdbf75fd134c81d963b Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 29 Oct 2024 05:12:06 +0300 Subject: [PATCH] drop Debian vendoring --- debian/patches/debian/version.patch | 153 ---------------------------- debian/patches/series | 1 - debian/rules.real | 10 +- 3 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 debian/patches/debian/version.patch diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch deleted file mode 100644 index 84c58c0..0000000 --- a/debian/patches/debian/version.patch +++ /dev/null @@ -1,153 +0,0 @@ -From: Ben Hutchings -Subject: Include package version along with kernel release in stack traces -Date: Tue, 24 Jul 2012 03:13:10 +0100 -Forwarded: not-needed - -For distribution binary packages we assume -$DISTRIBUTION_OFFICIAL_BUILD, $DISTRIBUTOR and $DISTRIBUTION_VERSION -are set. ---- - Makefile | 16 +++++++++++++++- - arch/powerpc/kernel/process.c | 6 ++++-- - arch/x86/um/sysrq_64.c | 6 ++++-- - kernel/hung_task.c | 6 ++++-- - lib/dump_stack.c | 7 +++++-- - 5 files changed, 32 insertions(+), 9 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -1186,7 +1186,8 @@ PHONY += prepare archprepare - - archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \ - asm-generic $(version_h) include/generated/utsrelease.h \ -- include/generated/compile.h include/generated/autoconf.h remove-stale-files -+ include/generated/compile.h include/generated/autoconf.h \ -+ include/generated/package.h remove-stale-files - - prepare0: archprepare - $(Q)$(MAKE) $(build)=scripts/mod -@@ -1244,6 +1245,16 @@ define filechk_version.h - echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) - endef - -+ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),) -+define filechk_package.h -+ echo \#define LINUX_PACKAGE_ID \" $(DISTRIBUTOR) $(DISTRIBUTION_VERSION)\" -+endef -+else -+define filechk_package.h -+ echo \#define LINUX_PACKAGE_ID \"\" -+endef -+endif -+ - $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) - $(version_h): private SUBLEVEL := $(or $(SUBLEVEL), 0) - $(version_h): FORCE -@@ -1258,6 +1269,9 @@ filechk_compile.h = $(srctree)/scripts/m - include/generated/compile.h: FORCE - $(call filechk,compile.h) - -+include/generated/package.h: $(srctree)/Makefile FORCE -+ $(call filechk,package.h) -+ - PHONY += headerdep - headerdep: - $(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \ ---- a/arch/powerpc/kernel/process.c -+++ b/arch/powerpc/kernel/process.c -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -1562,8 +1563,9 @@ static void __show_regs(struct pt_regs * - - printk("NIP: "REG" LR: "REG" CTR: "REG"\n", - regs->nip, regs->link, regs->ctr); -- printk("REGS: %px TRAP: %04lx %s (%s)\n", -- regs, regs->trap, print_tainted(), init_utsname()->release); -+ printk("REGS: %px TRAP: %04lx %s (%s%s)\n", -+ regs, regs->trap, print_tainted(), init_utsname()->release, -+ LINUX_PACKAGE_ID); - printk("MSR: "REG" ", regs->msr); - print_msr_bits(regs->msr); - pr_cont(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); ---- a/arch/x86/um/sysrq_64.c -+++ b/arch/x86/um/sysrq_64.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -18,8 +19,9 @@ void show_regs(struct pt_regs *regs) - { - printk("\n"); - print_modules(); -- printk(KERN_INFO "Pid: %d, comm: %.20s %s %s\n", task_pid_nr(current), -- current->comm, print_tainted(), init_utsname()->release); -+ printk(KERN_INFO "Pid: %d, comm: %.20s %s %s%s\n", task_pid_nr(current), -+ current->comm, print_tainted(), init_utsname()->release, -+ LINUX_PACKAGE_ID); - printk(KERN_INFO "RIP: %04lx:%pS\n", PT_REGS_CS(regs) & 0xffff, - (void *)PT_REGS_IP(regs)); - printk(KERN_INFO "RSP: %016lx EFLAGS: %08lx\n", PT_REGS_SP(regs), ---- a/kernel/hung_task.c -+++ b/kernel/hung_task.c -@@ -24,6 +24,7 @@ - #include - - #include -+#include - - /* - * The number of tasks checked: -@@ -132,10 +133,11 @@ static void check_hung_task(struct task_ - sysctl_hung_task_warnings--; - pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n", - t->comm, t->pid, (jiffies - t->last_switch_time) / HZ); -- pr_err(" %s %s %.*s\n", -+ pr_err(" %s %s %.*s%s\n", - print_tainted(), init_utsname()->release, - (int)strcspn(init_utsname()->version, " "), -- init_utsname()->version); -+ init_utsname()->version, -+ LINUX_PACKAGE_ID); - pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" - " disables this message.\n"); - sched_show_task(t); ---- a/lib/dump_stack.c -+++ b/lib/dump_stack.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - static char dump_stack_arch_desc_str[128]; - -@@ -54,7 +55,7 @@ void __init dump_stack_set_arch_desc(con - */ - void dump_stack_print_info(const char *log_lvl) - { -- printk("%sCPU: %d UID: %u PID: %d Comm: %.20s %s%s %s %.*s" BUILD_ID_FMT "\n", -+ printk("%sCPU: %d UID: %u PID: %d Comm: %.20s %s%s %s %.*s %s" BUILD_ID_FMT "\n", - log_lvl, raw_smp_processor_id(), - __kuid_val(current_real_cred()->euid), - current->pid, current->comm, -@@ -62,7 +63,9 @@ void dump_stack_print_info(const char *l - print_tainted(), - init_utsname()->release, - (int)strcspn(init_utsname()->version, " "), -- init_utsname()->version, BUILD_ID_VAL); -+ init_utsname()->version, -+ LINUX_PACKAGE_ID, -+ BUILD_ID_VAL); - - if (get_taint()) - printk("%s%s\n", log_lvl, print_tainted_verbose()); diff --git a/debian/patches/series b/debian/patches/series index 3cc9bed..074ab11 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,6 @@ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch debian/dfsg/documentation-fix-broken-link-to-cipso-draft.patch # Changes to support package build system -debian/version.patch debian/uname-version-timestamp.patch debian/kernelvariables.patch debian/mips-boston-disable-its.patch diff --git a/debian/rules.real b/debian/rules.real index 1582bc4..c620cfb 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -14,7 +14,6 @@ COMPILER ?= gcc ALL_KERNEL_ARCHES ?= x86 export COMPILER -MAINTAINER := $(shell sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p' debian/control) SOURCE_DATE_UTC_ISO := $(shell date -u -d '@$(SOURCE_DATE_EPOCH)' +%Y-%m-%d) ifdef ARCH @@ -38,13 +37,10 @@ cleanup_config = sed -E -e '/CONFIG_(BUILD_SALT|MODULE_SIG_(ALL|KEY)|SYSTEM_TRUS setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION # XXX: All the tools leak flags between host and build all the time, just don't care. See #1050991. setup_env += -u KBUILD_HOSTCFLAGS -u HOSTCFLAGS -u KBUILD_HOSTLDFLAGS -setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 -setup_env += DISTRIBUTOR="$(DEB_VENDOR)" -setup_env += DISTRIBUTION_VERSION="$(SOURCEVERSION)" setup_env += KBUILD_BUILD_TIMESTAMP="@$(SOURCE_DATE_EPOCH)" -setup_env += KBUILD_BUILD_VERSION_TIMESTAMP="$(DEB_VENDOR) $(SOURCEVERSION) ($(SOURCE_DATE_UTC_ISO))" -setup_env += KBUILD_BUILD_USER="$(word 1,$(subst @, ,$(MAINTAINER)))" -setup_env += KBUILD_BUILD_HOST="$(word 2,$(subst @, ,$(MAINTAINER)))" +setup_env += KBUILD_BUILD_VERSION_TIMESTAMP="KrD $(SOURCEVERSION) ($(SOURCE_DATE_UTC_ISO))" +setup_env += KBUILD_BUILD_USER="krd" +setup_env += KBUILD_BUILD_HOST="tempest" setup_env += KBUILD_VERBOSE=$(if $(filter verbose,$(DEB_BUILD_OPTIONS)),1,0) MAKE_CLEAN = $(setup_env) $(MAKE) KCFLAGS=-fdebug-prefix-map=$(CURDIR)/= KAFLAGS=-fdebug-prefix-map=$(CURDIR)/=