diff options
author | Anton Blanchard <anton@ozlabs.org> | 2021-08-08 15:03:49 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-12 06:26:16 +0100 |
commit | bba3e17098d5ef64a47a898c358ec9847577e2cd (patch) | |
tree | 51de7816b0927418e3e54c029634078e7159b1c7 /meta | |
parent | 36d003898267f24acecc0d456c0b24cc22778045 (diff) | |
download | poky-bba3e17098d5ef64a47a898c358ec9847577e2cd.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: 63877226c09a674d3794fdc171adf12fe604a3c9)
Signed-off-by: Anton Blanchard <anton@ozlabs.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 853561a61e..eb5d176ded 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" |