summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@windriver.com>2022-03-31 15:21:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-03 10:40:31 +0100
commitd0a05c2cf9a4e3329d7bbd798415e94a3a9caa55 (patch)
treed726ab8ef43ded383a2130a6fdfbc7b801366c8b /meta/recipes-core/busybox
parent197652119006074f655704da113c57ab3f34e039 (diff)
downloadpoky-d0a05c2cf9a4e3329d7bbd798415e94a3a9caa55.tar.gz
busybox: Exclude .debug from depmod
As with the kmod version of depmod, exclude .debug from being searched. Since busybox does not use the depmod.d and any configuration file option is ignored we just hardcode it. (From OE-Core rev: c082752c06d5723433886cbf7ce2d88a51fb64f1) Signed-off-by: Saul Wold <saul.wold@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch32
-rw-r--r--meta/recipes-core/busybox/busybox_1.35.0.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch
new file mode 100644
index 0000000000..354f83a4a5
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch
@@ -0,0 +1,32 @@
1From 5f6ed003f10ee0bd4a508d5f59129a29f0920dfc Mon Sep 17 00:00:00 2001
2From: Saul Wold <saul.wold@windriver.com>
3Date: Thu, 31 Mar 2022 11:21:45 -0700
4Subject: [PATCH] depmod: Ignore .debug directories
5
6The .debug/<module>.ko files do not have the correct symbol information
7since it's split away from the actual <module>.ko file. Just ignore it.
8
9Upstream-Status: Pending
10
11Signed-off-by: Saul Wold <saul.wold@windriver.com>
12---
13 modutils/depmod.c | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/modutils/depmod.c b/modutils/depmod.c
17index bb42bbe..aa5a2de 100644
18--- a/modutils/depmod.c
19+++ b/modutils/depmod.c
20@@ -43,6 +43,9 @@ static int FAST_FUNC parse_module(struct recursive_state *state,
21 /* Arbitrary. Was sb->st_size, but that breaks .gz etc */
22 size_t len = (64*1024*1024 - 4096);
23
24+ if (strstr(fname, ".debug") == NULL)
25+ return TRUE;
26+
27 if (strrstr(fname, ".ko") == NULL)
28 return TRUE;
29
30--
312.31.1
32
diff --git a/meta/recipes-core/busybox/busybox_1.35.0.bb b/meta/recipes-core/busybox/busybox_1.35.0.bb
index 7ce1717046..ab11f3d89a 100644
--- a/meta/recipes-core/busybox/busybox_1.35.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.35.0.bb
@@ -1,6 +1,7 @@
1require busybox.inc 1require busybox.inc
2 2
3SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 3SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
4 file://0001-depmod-Ignore-.debug-directories.patch \
4 file://busybox-udhcpc-no_deconfig.patch \ 5 file://busybox-udhcpc-no_deconfig.patch \
5 file://find-touchscreen.sh \ 6 file://find-touchscreen.sh \
6 file://busybox-cron \ 7 file://busybox-cron \