commit 73f1fdeed7d9f67d3eaac4719b9c48e130284d41 (HEAD -> cranky/master-next) Author: Andy Whitcroft <email address hidden> 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 <email address hidden>
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;
commit 73f1fdeed7d9f67 d3eaac4719b9c48 e130284d41 (HEAD -> cranky/master-next)
Author: Andy Whitcroft <email address hidden>
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 <email address hidden>
diff --git a/init/ version- timestamp. c b/init/ version- timestamp. c .649275e25ff4 100644 version- timestamp. c version- timestamp. c VERSION_ SIGNATURE VERSION_ SIGNATURE ")" .f117921811b4 100644 "hostname" , early_hostname); VERSION_ SIGNATURE VERSION_ SIGNATURE ")"
index 043cbf80a766.
--- a/init/
+++ b/init/
@@ -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_
+ " (" CONFIG_
+#endif
+ "\n";
diff --git a/init/version.c b/init/version.c
index 702100a4f6ab.
--- a/init/version.c
+++ b/init/version.c
@@ -35,11 +35,7 @@ early_param(
const char linux_proc_banner[] =
"%s version %s"
" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
- " (" LINUX_COMPILER ") %s"
-#ifdef CONFIG_
- " (" CONFIG_
-#endif
- "\n";
+ " (" LINUX_COMPILER ") %s\n";
BUILD_SALT;
BUILD_LTO_INFO;