]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
busybox: Exclude .debug from depmod
authorSaul Wold <Saul.Wold@windriver.com>
Thu, 31 Mar 2022 22:21:51 +0000 (15:21 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 3 Apr 2022 09:40:27 +0000 (10:40 +0100)
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.

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>
meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch [new file with mode: 0644]
meta/recipes-core/busybox/busybox_1.35.0.bb

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 (file)
index 0000000..354f83a
--- /dev/null
@@ -0,0 +1,32 @@
+From 5f6ed003f10ee0bd4a508d5f59129a29f0920dfc Mon Sep 17 00:00:00 2001
+From: Saul Wold <saul.wold@windriver.com>
+Date: Thu, 31 Mar 2022 11:21:45 -0700
+Subject: [PATCH] depmod: Ignore .debug directories
+
+The .debug/<module>.ko files do not have the correct symbol information
+since it's split away from the actual <module>.ko file. Just ignore it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <saul.wold@windriver.com>
+---
+ modutils/depmod.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/modutils/depmod.c b/modutils/depmod.c
+index bb42bbe..aa5a2de 100644
+--- a/modutils/depmod.c
++++ b/modutils/depmod.c
+@@ -43,6 +43,9 @@ static int FAST_FUNC parse_module(struct recursive_state *state,
+       /* Arbitrary. Was sb->st_size, but that breaks .gz etc */
+       size_t len = (64*1024*1024 - 4096);
++      if (strstr(fname, ".debug") == NULL)
++              return TRUE;
++
+       if (strrstr(fname, ".ko") == NULL)
+               return TRUE;
+-- 
+2.31.1
+
index 7ce171704629727c3f4f6dc65eeb8398e9aeab1f..ab11f3d89a89c5e53644496bc3f995b32eaf3063 100644 (file)
@@ -1,6 +1,7 @@
 require busybox.inc
 
 SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
+           file://0001-depmod-Ignore-.debug-directories.patch \
            file://busybox-udhcpc-no_deconfig.patch \
            file://find-touchscreen.sh \
            file://busybox-cron \