diff options
| author | Anton Blanchard <anton@ozlabs.org> | 2021-08-08 15:03:49 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-26 08:32:13 +0100 |
| commit | eef8655e3c029b2d2dfbdb22c23b71951551d519 (patch) | |
| tree | 42e8c38bedceb0915d5c2f25158945ca59a469f6 | |
| parent | 8829faab3d8ef775e494e6cd9c13f77577f7415b (diff) | |
| download | poky-eef8655e3c029b2d2dfbdb22c23b71951551d519.tar.gz | |
kmod: use nonarch_base_libdir for depmod.d and modprobe.d
These should always be in /lib, regardless of the configuration.
(From OE-Core rev: 6fa724a55a4cb7eac7d4d50017b573af54fd6a34)
Signed-off-by: Anton Blanchard <anton@ozlabs.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 63877226c09a674d3794fdc171adf12fe604a3c9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index 4f2b037f2f..f6fe049d92 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb | |||
| @@ -24,13 +24,13 @@ do_install_append () { | |||
| 24 | lnr ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} | 24 | lnr ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} |
| 25 | done | 25 | done |
| 26 | # configuration directories | 26 | # configuration directories |
| 27 | install -dm755 ${D}${base_libdir}/depmod.d | 27 | install -dm755 ${D}${nonarch_base_libdir}/depmod.d |
| 28 | install -dm755 ${D}${base_libdir}/modprobe.d | 28 | install -dm755 ${D}${nonarch_base_libdir}/modprobe.d |
| 29 | install -dm755 ${D}${sysconfdir}/depmod.d | 29 | install -dm755 ${D}${sysconfdir}/depmod.d |
| 30 | install -dm755 ${D}${sysconfdir}/modprobe.d | 30 | install -dm755 ${D}${sysconfdir}/modprobe.d |
| 31 | 31 | ||
| 32 | # install depmod.d file for search/ dir | 32 | # install depmod.d file for search/ dir |
| 33 | install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" | 33 | install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | do_compile_prepend() { | 36 | do_compile_prepend() { |
| @@ -57,6 +57,6 @@ ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" | |||
| 57 | PACKAGES =+ "libkmod" | 57 | PACKAGES =+ "libkmod" |
| 58 | 58 | ||
| 59 | FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" | 59 | FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" |
| 60 | FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" | 60 | FILES_${PN} += "${nonarch_base_libdir}/depmod.d ${nonarch_base_libdir}/modprobe.d" |
| 61 | 61 | ||
| 62 | BBCLASSEXTEND = "nativesdk" | 62 | BBCLASSEXTEND = "nativesdk" |
