commit 73f1fdeed7d9f67d3eaac4719b9c48e130284d41 (HEAD -> cranky/master-next) Author: Andy Whitcroft <a...@canonical.com> Date: Wed Mar 8 16:09:07 2023 +0000
UBUNTU: SAUCE: (no-up) version: fix concatenation of CONFIG_VERSION_SIGNATURE to banner Signed-off-by: Andy Whitcroft <a...@canonical.com> diff --git a/init/version-timestamp.c b/init/version-timestamp.c index 043cbf80a766..649275e25ff4 100644 --- a/init/version-timestamp.c +++ b/init/version-timestamp.c @@ -27,4 +27,8 @@ struct uts_namespace init_uts_ns = { /* FIXED STRINGS! Don't touch! */ const char linux_banner[] = "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" - LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; + LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION +#ifdef CONFIG_VERSION_SIGNATURE + " (" CONFIG_VERSION_SIGNATURE ")" +#endif + "\n"; diff --git a/init/version.c b/init/version.c index 702100a4f6ab..f117921811b4 100644 --- a/init/version.c +++ b/init/version.c @@ -35,11 +35,7 @@ early_param("hostname", early_hostname); const char linux_proc_banner[] = "%s version %s" " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" - " (" LINUX_COMPILER ") %s" -#ifdef CONFIG_VERSION_SIGNATURE - " (" CONFIG_VERSION_SIGNATURE ")" -#endif - "\n"; + " (" LINUX_COMPILER ") %s\n"; BUILD_SALT; BUILD_LTO_INFO; -- You received this bug notification because you are a member of Kernel Packages, which is subscribed to crash in Ubuntu. https://bugs.launchpad.net/bugs/2009595 Title: DEP8 failure in lunar Status in crash package in Ubuntu: Confirmed Status in linux package in Ubuntu: Confirmed Bug description: I don't know what's wrong with this package, or with the kernel package: ubuntu@l-crash:~$ sudo crash -st /usr/lib/debug/boot/vmlinux-6.1.0-16-generic WARNING: /usr/lib/debug/boot/vmlinux-6.1.0-16-generic and /proc/version do not match! WARNING: /proc/version indicates kernel version: 6.1.0-16-generic crash: please use the vmlinux file for that kernel version, or try using the System.map for that kernel version as an additional argument. It is the same version: ubuntu@l-crash:~$ uname -a Linux l-crash 6.1.0-16-generic #16-Ubuntu SMP PREEMPT_DYNAMIC Fri Feb 24 14:37:30 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux $ dpkg -l|grep linux- ii binutils-x86-64-linux-gnu 2.40-2ubuntu1 ii linux-base 4.5ubuntu9 ii linux-firmware 20230302.git60971a64-0ubuntu1 ii linux-headers-6.1.0-16 6.1.0-16.16 ii linux-headers-6.1.0-16-generic 6.1.0-16.16 ii linux-headers-generic 6.1.0.16.16 ii linux-image-6.1.0-16-generic 6.1.0-16.16 ii linux-image-6.1.0-16-generic-dbgsym 6.1.0-16.16 ii linux-image-generic 6.1.0.16.16 ii linux-image-unsigned-6.1.0-16-generic-dbgsym 6.1.0-16.16 ii linux-libc-dev:amd64 6.1.0-16.16 ii linux-modules-6.1.0-16-generic 6.1.0-16.16 ii linux-modules-extra-6.1.0-16-generic 6.1.0-16.16 ii util-linux-extra 2.38.1-4ubuntu1 $ apt-cache policy linux-image-unsigned-6.1.0-16-generic-dbgsym linux-image-unsigned-6.1.0-16-generic-dbgsym: Installed: 6.1.0-16.16 Candidate: 6.1.0-16.16 Version table: *** 6.1.0-16.16 500 500 http://ddebs.ubuntu.com lunar/main amd64 Packages 100 /var/lib/dpkg/status To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/crash/+bug/2009595/+subscriptions -- Mailing list: https://launchpad.net/~kernel-packages Post to : kernel-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~kernel-packages More help : https://help.launchpad.net/ListHelp