Skip to contentSkip to conversation

Fixes for a distro with a merged /usr

PATCH New Joshua Lock 1 participant 2 messages Sep 14, 2015

lore
Share & tools
lore
#0 lore raw

v2 cover Fixes for a distro with a merged /usr

This fixes the previous kmod submission to use the lnr script from OE-Core rather than requiring a version of coreutils where ln supports the -r switch, thus ensuring compatibility with Debian 7 (though only tested locally on Ubuntu 15.04).

The following changes since commit 2c8c3d9c4b65d2a5c7976d530138ebcaac2b1447:

gcc: reformat 0063-nativesdk-gcc-support.patch (2015-09-12 23:01:31 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib joshuagl/merged-usr
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/merged-usr

Joshua Lock (1):
kmod: fix link creation when base_bindir != /bin

 meta/recipes-kernel/kmod/kmod_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 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 too the lnr script to create a relative link.

---
 meta/recipes-kernel/kmod/kmod_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/kmod/kmod_git.bb +2 -2
index ba4d85e..e0bb95c 100644
@@ -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
+        lnr ${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}
+                lnr ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool}
         done
         # configuration directories
         install -dm755 ${D}${base_libdir}/depmod.d
Signature · 1 line
2.1.4