Skip to content

Commit ab3afad

Browse files
committed
patches: Force disable CONFIG_BUILTIN_MODULE_RANGES in trees that have it
A recent change in mainline introduced a dependency on GNU awk, which is not present in the TuxMake containers, so the build fails. While Linaro works on resolving this, add a patch to disable this configuration. Link: https://gitlab.com/Linaro/tuxmake/-/issues/220 Signed-off-by: Nathan Chancellor <[email protected]>
1 parent bb08f0f commit ab3afad

File tree

4 files changed

+74
-0
lines changed

4 files changed

+74
-0
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 7d7e669c606e72ce8c20f19a0eacacd47522ca1a Mon Sep 17 00:00:00 2001
2+
From: Nathan Chancellor <[email protected]>
3+
Date: Sat, 28 Sep 2024 11:32:49 -0700
4+
Subject: [PATCH] lib/Kconfig.debug: Force disable BUILTIN_MODULE_RANGES
5+
6+
Commit 5f5e7344322f ("kbuild: generate offset range data for builtin
7+
modules") introduced a dependency on gawk, which causes allmodconfig
8+
builds in TuxSuite to fail because gawk is not present:
9+
10+
/bin/sh: 1: gawk: not found
11+
make[3]: *** [/builds/linux/scripts/Makefile.vmlinux:47: modules.builtin.ranges] Error 127
12+
13+
While this is fixed in TuxSuite, force disable
14+
CONFIG_BUILTIN_MODULE_RANGES, as it is not critical to test.
15+
16+
Link: https://gitlab.com/Linaro/tuxmake/-/issues/220
17+
Signed-off-by: Nathan Chancellor <[email protected]>
18+
---
19+
lib/Kconfig.debug | 1 +
20+
1 file changed, 1 insertion(+)
21+
22+
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
23+
index 7315f643817a..0a1fbf9ebfd6 100644
24+
--- a/lib/Kconfig.debug
25+
+++ b/lib/Kconfig.debug
26+
@@ -575,6 +575,7 @@ config VMLINUX_MAP
27+
28+
config BUILTIN_MODULE_RANGES
29+
bool "Generate address range information for builtin modules"
30+
+ depends on BROKEN
31+
depends on !LTO
32+
depends on VMLINUX_MAP
33+
help
34+
--
35+
2.46.1
36+

patches/mainline/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
0001-lib-Kconfig.debug-Force-disable-BUILTIN_MODULE_RANGE.patch
12
v2_20240916_dan_carpenter_iio_bmi323_fix_copy_and_paste_bugs_in_suspend_resume.patch
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 7d7e669c606e72ce8c20f19a0eacacd47522ca1a Mon Sep 17 00:00:00 2001
2+
From: Nathan Chancellor <[email protected]>
3+
Date: Sat, 28 Sep 2024 11:32:49 -0700
4+
Subject: [PATCH] lib/Kconfig.debug: Force disable BUILTIN_MODULE_RANGES
5+
6+
Commit 5f5e7344322f ("kbuild: generate offset range data for builtin
7+
modules") introduced a dependency on gawk, which causes allmodconfig
8+
builds in TuxSuite to fail because gawk is not present:
9+
10+
/bin/sh: 1: gawk: not found
11+
make[3]: *** [/builds/linux/scripts/Makefile.vmlinux:47: modules.builtin.ranges] Error 127
12+
13+
While this is fixed in TuxSuite, force disable
14+
CONFIG_BUILTIN_MODULE_RANGES, as it is not critical to test.
15+
16+
Link: https://gitlab.com/Linaro/tuxmake/-/issues/220
17+
Signed-off-by: Nathan Chancellor <[email protected]>
18+
---
19+
lib/Kconfig.debug | 1 +
20+
1 file changed, 1 insertion(+)
21+
22+
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
23+
index 7315f643817a..0a1fbf9ebfd6 100644
24+
--- a/lib/Kconfig.debug
25+
+++ b/lib/Kconfig.debug
26+
@@ -575,6 +575,7 @@ config VMLINUX_MAP
27+
28+
config BUILTIN_MODULE_RANGES
29+
bool "Generate address range information for builtin modules"
30+
+ depends on BROKEN
31+
depends on !LTO
32+
depends on VMLINUX_MAP
33+
help
34+
--
35+
2.46.1
36+

patches/tip/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0001-lib-Kconfig.debug-Force-disable-BUILTIN_MODULE_RANGE.patch

0 commit comments

Comments
 (0)