summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <qi.chen@windriver.com>2013-12-05 10:54:33 -0500
committerChen Qi <Qi.Chen@windriver.com>2014-09-09 14:34:23 +0800
commit5f798bfff43c475d770b81a6ba653b0d9f8d98c0 (patch)
treef0ae95cf308adf2ad6b6db24bb2a13cbb1c089a9
parentb96a6f2a162ef49f6f0492337f7402e72e6d56c0 (diff)
downloadopenembedded-core-contrib-5f798bfff43c475d770b81a6ba653b0d9f8d98c0.tar.gz
openembedded-core-contrib-5f798bfff43c475d770b81a6ba653b0d9f8d98c0.tar.bz2
openembedded-core-contrib-5f798bfff43c475d770b81a6ba653b0d9f8d98c0.zip
kmod: install libkmod into base_libdir
[CQID: WIND00444742] Install libkmod into base_libdir because udevd requires it. The purpose is to make system boot into single user mode even if /usr is missing. This patch fixes the following QA issue about unsafe references in binaries. /lib/udevd requires libkmod.so.2 (=> /usr/lib/libkmod.so.2) (LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20131113 Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index d4c21a4387..090f5fb9bc 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -13,9 +13,7 @@ RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod mod
RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
# autotools set prefix to /usr, however we want them in /bin and /sbin
-bindir = "${base_bindir}"
-sbindir = "${base_sbindir}"
-# libdir = "${base_libdir}"
+EXTRA_OECONF += "--bindir=${base_bindir} --sbindir=${base_sbindir} --libdir=${base_libdir}"
do_install_append () {
install -dm755 ${D}${base_bindir}
@@ -34,6 +32,11 @@ do_install_append () {
# install depmod.d file for search/ dir
install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
+ if [ "${libdir}" != "${base_libdir}" ]; then
+ # mv the .pc file to ${libdir}
+ install -d ${D}${libdir}
+ mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ fi
}
do_compile_prepend() {