[oe-commits] Joshua Lock : kmod: fix link creation when base_bindir != /bin

git at git.openembedded.org git at git.openembedded.org
Fri Sep 4 16:43:37 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: ba2f38abcd1404309a5df8634c605ceb86b6856d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ba2f38abcd1404309a5df8634c605ceb86b6856d

Author: Joshua Lock <joshua.lock at collabora.co.uk>
Date:   Fri Sep  4 15:59:38 2015 +0100

kmod: fix link creation when base_bindir != /bin

If base_bindir is not a direct child of / the link creation in
do_install_append creates incorrect relative links.

Instead pass a full path to the link source and use the -r flag
to ln to ensure the link is relative.

Signed-off-by: Joshua Lock <joshua.lock at collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-kernel/kmod/kmod_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index ba4d85e..120fd87 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -21,9 +21,9 @@ do_install_append () {
         install -dm755 ${D}${base_bindir}
         install -dm755 ${D}${base_sbindir}
         # add symlinks to kmod
-        ln -s ..${base_bindir}/kmod ${D}${base_bindir}/lsmod
+        ln -sr ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod
         for tool in insmod rmmod depmod modinfo modprobe; do
-                ln -s ..${base_bindir}/kmod ${D}${base_sbindir}/${tool}
+                ln -sr ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool}
         done
         # configuration directories
         install -dm755 ${D}${base_libdir}/depmod.d



More information about the Openembedded-commits mailing list