summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-kernel/kmod
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-04-08 18:23:27 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-04-08 18:24:52 +0300
commitde0582f0e7de86eaf8c8d90d86ed313273a73774 (patch)
tree9e7371e33b7eea92fcfff468681fd8396db41388 /poky/meta/recipes-kernel/kmod
parent76d114cab0113c54be8288785cda4ce230ad08a6 (diff)
downloadopenbmc-de0582f0e7de86eaf8c8d90d86ed313273a73774.tar.xz
subtree updates
meta-raspberrypi: 31c33d155c..cfbb192e5c: Andrei Gherzan (1): docs: Add information for RTC devices Andrew Penner (2): rpi-cmdline: Add ability to specify CPUs to add to the isolcpus list extra-build-config: Add documentation for the ISOLATED_CPUS configuration variable Jan Vermaete (1): docs: untabify the few tabs in the file Khem Raj (3): userland: Update to latest as of 20220323 picamera-libs: Adjust sourcedir omxplayer: Use internal version of ffmpeg meta-openembedded: af11f6ce73..b9e440ead8: Adrian Freihofer (1): srecord: build fix Andreas Müller (40): octave: upgrade 4.4.1 -> 6.4.0 and overhaul recipe mousepad: upgrade 0.5.8 -> 0.5.9 xfce4-terminal: upgrade 0.8.10 -> 1.0.0 orage: upgrade 4.12.1 -> 4.16.0 orage: enable notify PACKAGECONFIG by default ristretto: upgrade 0.12.1 -> 0.12.2 xarchiver: upgrade 0.5.4.14 -> 0.5.4.17 xfce4-cpufreq-plugin: upgrade 1.2.5 -> 1.2.7 xfce4-cpugraph-plugin: upgrade 1.2.5 -> 1.2.6 xfce4-diskperf-plugin: upgrade 2.6.3 -> 2.7.0 xfce4-notifyd: upgrade 0.6.2 -> 0.6.3 xfce4-screenshooter: upgrade 1.9.9 -> 1.9.10 xfce4-sensors-plugin: upgrade 1.4.2 -> 1.4.3 Allow several components notification meta-xfce: Add Andreas Müller back to maintainers list accountsservice: upgrade 0.6.55 -> 22.08.8 colord-gtk: upgrade 0.2.0 -> 0.3.0 evince: upgrade 41.4 -> 42.1 evolution-data-server: upgrade 3.43.1 -> 3.44.0 file-roller: upgrade 3.40.0 -> 3.42.0 gdm: upgrade 41.0 -> 42.0 gedit: upgrade 41.0 -> 42.0 gfbgraph: upgrade 0.2.4 -> 0.2.5 gnome-calculator upgrade 41.1 -> 42-0 libgweather4: initial add 4.0.0 gnome-calendar 41.2 -> 42.0 gnome-desktop: upgrade 41.2 -> 42.0 libnma: upgrade 1.8.34 -> 1.8.36 gnome-bluetooth4: initial add 42.0 gnome-font-viewer: upgrade 41.0 -> 42.0 yelp-xsl: upgrade 41.1 -> 42.0 yelp-tools: upgrade 41.0 -> 42.0 yelp: upgrade 41.2 -> 42.1 upower: upgrade 0.99.13 -> 0.99.17 / build with mesom upower: fix location of udev-rules with sysvinit gnome-commander: initial add 1.14.2 gnome-text-editor: initial add 42.0 evolution-data-server: re-enable gobject-introspection jack: upgrade 1.19.19 -> 1.19.20 fluidsynth: upgrade 2.2.4 -> 2.2.6 Chen Qi (1): blueman: fix python site-packages installation issue Craig McQueen (1): dnsmasq: Fix a typo in initscript Davide Gardenal (2): python3-wxgtk4: add distro feature check to match dependency fwupd: add COMPATIBLE_HOST to match dependency Jose Quaresma (2): srt: 1.4.2 -> 1.4.3 srt: 1.4.3 -> 1.4.4 Khem Raj (2): xfce4-screenshooter: Add dependency on libxml-parser-perl-native open-vm-tools: Use specific BSD-2-Clause for license Matsunaga-Shinji (2): samba: add 2 cves to allowlist libzip: add CVE-2017-12858 to allowlist Minjae Kim (1): multipath-tools: update SRC_URI Potin Lai (1): libimobiledevice-glue: update recipe Robert Yang (2): wxwidgets: Fix checking for PACKAGECONFIG and DISTRO_FEATURES wxwidgets: git -> gitsm to fix build when no x11 Samuli Piippo (1): python3-qface: upgrade 2.0.6 -> 2.0.7 Xu Huan (5): python3-cheetah: upgrade 3.2.6.post2 -> 3.2.6 python3-evdev: upgrade 1.4.0 -> 1.5.0 python3-google-api-python-client: upgrade 2.36.0 -> 2.42.0 python3-itsdangerous: upgrade 2.1.1 -> 2.1.2 python3-grpcio: upgrade 1.44.0 -> 1.45.0 Yi Zhao (1): dracut: upgrade 055 -> 056 wangmy (20): python3-bitarray: upgrade 2.4.0 -> 2.4.1 python3-click: upgrade 8.0.4 -> 8.1.2 python3-cppy: upgrade 1.2.0 -> 1.2.1 python3-pandas: upgrade 1.4.1 -> 1.4.2 python3-protobuf: upgrade 3.19.4 -> 3.20.0 python3-pychromecast: upgrade 10.3.0 -> 11.0.0 python3-pyparted: upgrade 3.11.7 -> 3.12.0 python3-redis: upgrade 4.2.0 -> 4.2.1 python3-sqlalchemy: upgrade 1.4.32 -> 1.4.34 python3-thrift: upgrade 0.15.0 -> 0.16.0 python3-trafaret: upgrade 2.1.0 -> 2.1.1 python3-twine: upgrade 3.8.0 -> 4.0.0 python3-tzlocal: upgrade 4.1 -> 4.2 python3-websocket-client: upgrade 1.3.1 -> 1.3.2 python3-werkzeug: upgrade 2.0.3 -> 2.1.1 zenity: upgrade 3.41.0 -> 3.42.0 ceres-solver: upgrade 2.0.0 -> 2.1.0 grpc: upgrade 1.45.0 -> 1.45.1 poppler: upgrade 22.03.0 -> 22.04.0 xorg-sgml-doctools: upgrade 1.11 -> 1.12 zhengrq.fnst (2): python3-jdatetime: upgrade 4.0.0 -> 4.1.0 python3-kiwisolver: upgrade 1.4.0 -> 1.4.2 meta-security: da93339112..498ca39cd6: Armin Kuster (5): openscap-daemon: use renamaed python_setuptools_build_meta python3-fail2ban: fix compile issue on some hosts lkrg-module: covert to git fetcher linux-yocto_security.inc: add lkrg kfrags samhain: update to 4.4.7 Ashish Sharma (1): meta-security : Use SPDX style licensing format Davide Gardenal (2): clamav: add COMPATIBLE_HOST to fix build error fscrypt: update dependecy from go-dep-native to go-native Robert Yang (1): LICENSE: adopt SPDX standard names poky: 1976521190..ed98f1a1ae: Abongwa Amahnui Bonalais (1): oe-init-build-env: add quotes around variables to prevent word splitting Alessio Igor Bogani (1): kernel.bbclass: Use KERNEL_IMAGEDEST instead of hardcoded boot path Alexandre Belloni (1): pseudo: Fix handling of absolute links Bruce Ashfield (6): linux-yocto/5.15: update to v5.15.32 linux-yocto/5.10: update to v5.10.109 linux-yocto/5.15: aufs: fixes and optimization linux-yocto-rt/5.15: aufs: compile fix linux-yocto/5.15: features/security: Move x86_64 configs to separate file linux-yocto/5.10: features/security: Move x86_64 configs to separate file Carlos Rafael Giani (1): libsdl2: Disable libunwind dependency in native builds Claudius Heine (1): os-release: add os-release-initrd package Ferry Toth (1): package_manager: sign DEB package feeds Joe Slater (1): unzip: fix CVE-2021-4217 Khem Raj (1): glib-2.0: Backport patches C++ variant of g_atomic_int_compare_and_exchange() Oleksandr Kravchuk (1): tzdata: update to 2022a Peter Kjellerstedt (5): python3-jinja2: Correct HOMEPAGE insane.bbclass: Make do_qa_patch() depend on if patch-fuzz is in ERROR_QA insane.bbclass: Make changes to QA_EMPTY_DIRS trigger package_qa to rerun bitbake.conf: Remove ERROR_QA from BB_HASHEXCLUDE_COMMON bitbake: knotty.py: Show elapsed time also for tasks with progress bars Richard Purdie (11): bitbake: parse: Ensure any existing siggen is closed down first bitbake: data: Ensure vardepsexclude or BB_BASEHASH_IGNORE_VARS covers contains items bitbake: server/process: Disable gc around critical section bitbake: cooker: Reset and rebuild inotify watches bitbake: pyinotify: Handle potential latent bug mirrors: Switch glibc and binutils to use shallow mirror tarballs bitbake: data: Fix accidentally added parameter bitbake.conf: Drop unexports from a different era vim: Upgrade 8.2.4524 -> 8.2.4681 Revert "meta: rust: Bug fix for target definitions returning 'NoneType'" build-appliance-image: Update to master head revision Robert Yang (1): waffle: The surfaceless-egl and gbm requires opengl Saul Wold (5): busybox: Exclude .debug from depmod kmod: Add an exclude directive to depmod depmodwrapper: Use nonarch_base_libdir for depmod.d kmod: Update exclude patch to Accepted depmodwrapper-cross: Fix missing $ Sean Anderson (1): u-boot: Fix condition for install_spl_helper Simone Weiss (1): popt: add ptest Sundeep KOKKONDA (3): gcc: sanitizer: Fix tsan against glibc 2.34 meta: rust: Bug fix for target definitions returning 'NoneType' meta: scripts - relocation script adapted to support big-endian machines Xavier Berger (1): gpg-sign: Add parameters to gpg signature function Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I294af706d7b96796ff360b402b9d011082cf36a7
Diffstat (limited to 'poky/meta/recipes-kernel/kmod')
-rw-r--r--poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb9
-rw-r--r--poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch172
-rw-r--r--poky/meta/recipes-kernel/kmod/kmod_29.bb4
3 files changed, 183 insertions, 2 deletions
diff --git a/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
index 04fc14a6d2..303026ad78 100644
--- a/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
+++ b/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
@@ -30,11 +30,16 @@ if [ -r "${PKGDATA_DIR}/kernel-depmod/kernel-abiversion" ]; then
kernelabi=\$(cat "${PKGDATA_DIR}/kernel-depmod/kernel-abiversion")
fi
+if [ ! -e "\$3${nonarch_base_libdir}/depmod.d/exclude.conf" ]; then
+ mkdir -p "\$3${nonarch_base_libdir}/depmod.d"
+ echo "exclude .debug" > "\$3${nonarch_base_libdir}/depmod.d/exclude.conf"
+fi
+
if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ] || [ "\$kernelabi" != "\$4" ]; then
echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2
- exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" "\$4"
+ exec env depmod -C "\$3${nonarch_base_libdir}/depmod.d" "\$1" "\$2" "\$3" "\$4"
else
- exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4"
+ exec env depmod -C "\$3${nonarch_base_libdir}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4"
fi
EOF
chmod +x ${D}${bindir_crossscripts}/depmodwrapper
diff --git a/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch b/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch
new file mode 100644
index 0000000000..ea0570af2b
--- /dev/null
+++ b/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch
@@ -0,0 +1,172 @@
+From f50e2d67575ac5f256fb853ca9d29aeac92d9a57 Mon Sep 17 00:00:00 2001
+From: Saul Wold <saul.wold@windriver.com>
+Date: Thu, 31 Mar 2022 14:56:28 -0700
+Subject: [PATCH] depmod: Add support for excluding a directory
+
+This adds support to depmod to enable a new exclude directive in
+the depmod.d/*.conf configuration file. Currently depmod
+already excludes directories named source or build. This change
+will allow additional directories like .debug to be excluded also
+via a new exclude directive.
+
+depmod.d/exclude.conf example:
+exclude .debug
+
+Upstream-Status: Accepted
+
+Signed-off-by: Saul Wold <saul.wold@windriver.com>
+[ Fix warnings and make should_exclude_dir() return bool ]
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+---
+ man/depmod.d.xml | 14 ++++++++++
+ tools/depmod.c | 66 +++++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 76 insertions(+), 4 deletions(-)
+
+diff --git a/man/depmod.d.xml b/man/depmod.d.xml
+index b315e93..76548e9 100644
+--- a/man/depmod.d.xml
++++ b/man/depmod.d.xml
+@@ -131,6 +131,20 @@
+ </para>
+ </listitem>
+ </varlistentry>
++ <varlistentry>
++ <term>exclude <replaceable>excludedir</replaceable>
++ </term>
++ <listitem>
++ <para>
++ This specifies the trailing directories that will be excluded
++ during the search for kernel modules.
++ </para>
++ <para>
++ The <replaceable>excludedir</replaceable> is the trailing directory
++ to exclude
++ </para>
++ </listitem>
++ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index 07a35ba..4117dd1 100644
+--- a/tools/depmod.c
++++ b/tools/depmod.c
+@@ -458,6 +458,11 @@ struct cfg_external {
+ char path[];
+ };
+
++struct cfg_exclude {
++ struct cfg_exclude *next;
++ char exclude_dir[];
++};
++
+ struct cfg {
+ const char *kversion;
+ char dirname[PATH_MAX];
+@@ -469,6 +474,7 @@ struct cfg {
+ struct cfg_override *overrides;
+ struct cfg_search *searches;
+ struct cfg_external *externals;
++ struct cfg_exclude *excludes;
+ };
+
+ static enum search_type cfg_define_search_type(const char *path)
+@@ -580,6 +586,30 @@ static void cfg_external_free(struct cfg_external *ext)
+ free(ext);
+ }
+
++static int cfg_exclude_add(struct cfg *cfg, const char *path)
++{
++ struct cfg_exclude *exc;
++ size_t len = strlen(path);
++
++ exc = malloc(sizeof(struct cfg_exclude) + len + 1);
++ if (exc == NULL) {
++ ERR("exclude add: out of memory\n");
++ return -ENOMEM;
++ }
++ memcpy(exc->exclude_dir, path, len + 1);
++
++ DBG("exclude add: %s\n", path);
++
++ exc->next = cfg->excludes;
++ cfg->excludes = exc;
++ return 0;
++}
++
++static void cfg_exclude_free(struct cfg_exclude *exc)
++{
++ free(exc);
++}
++
+ static int cfg_kernel_matches(const struct cfg *cfg, const char *pattern)
+ {
+ regex_t re;
+@@ -657,6 +687,11 @@ static int cfg_file_parse(struct cfg *cfg, const char *filename)
+ }
+
+ cfg_external_add(cfg, dir);
++ } else if (streq(cmd, "exclude")) {
++ const char *sp;
++ while ((sp = strtok_r(NULL, "\t ", &saveptr)) != NULL) {
++ cfg_exclude_add(cfg, sp);
++ }
+ } else if (streq(cmd, "include")
+ || streq(cmd, "make_map_files")) {
+ INF("%s:%u: command %s not implemented yet\n",
+@@ -857,6 +892,12 @@ static void cfg_free(struct cfg *cfg)
+ cfg->externals = cfg->externals->next;
+ cfg_external_free(tmp);
+ }
++
++ while (cfg->excludes) {
++ struct cfg_exclude *tmp = cfg->excludes;
++ cfg->excludes = cfg->excludes->next;
++ cfg_exclude_free(tmp);
++ }
+ }
+
+
+@@ -1229,6 +1270,25 @@ add:
+ return 0;
+ }
+
++static bool should_exclude_dir(const struct cfg *cfg, const char *name)
++{
++ struct cfg_exclude *exc;
++
++ if (name[0] == '.' && (name[1] == '\0' ||
++ (name[1] == '.' && name[2] == '\0')))
++ return true;
++
++ if (streq(name, "build") || streq(name, "source"))
++ return true;
++
++ for (exc = cfg->excludes; exc != NULL; exc = exc->next) {
++ if (streq(name, exc->exclude_dir))
++ return true;
++ }
++
++ return false;
++}
++
+ static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t baselen, struct scratchbuf *s_path)
+ {
+ struct dirent *de;
+@@ -1240,11 +1300,9 @@ static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t basel
+ size_t namelen;
+ uint8_t is_dir;
+
+- if (name[0] == '.' && (name[1] == '\0' ||
+- (name[1] == '.' && name[2] == '\0')))
+- continue;
+- if (streq(name, "build") || streq(name, "source"))
++ if (should_exclude_dir(depmod->cfg, name))
+ continue;
++
+ namelen = strlen(name);
+ if (scratchbuf_alloc(s_path, baselen + namelen + 2) < 0) {
+ err = -ENOMEM;
+--
+2.31.1
+
diff --git a/poky/meta/recipes-kernel/kmod/kmod_29.bb b/poky/meta/recipes-kernel/kmod/kmod_29.bb
index 91951edde1..9b66349066 100644
--- a/poky/meta/recipes-kernel/kmod/kmod_29.bb
+++ b/poky/meta/recipes-kernel/kmod/kmod_29.bb
@@ -20,6 +20,7 @@ SRCREV = "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1"
SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \
file://depmod-search.conf \
file://avoid_parallel_tests.patch \
+ file://0001-depmod-Add-support-for-excluding-a-directory.patch \
"
S = "${WORKDIR}/git"
@@ -64,6 +65,9 @@ do_install:append () {
# install depmod.d file for search/ dir
install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf"
+
+ # Add .debug to the exclude path for depmod
+ echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf
}
ALTERNATIVE_PRIORITY = "70"