From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Joshua Lock <joshua.lock@collabora.co.uk>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH v2 1/9] kmod: fix link creation when base_bindir != /bin
Date: Fri, 04 Sep 2015 23:11:36 +0100 [thread overview]
Message-ID: <1441404696.24871.201.camel@linuxfoundation.org> (raw)
In-Reply-To: <73dacaee8b4314edec63ee5b383d2fa1d4cdfc87.1441374016.git.joshua.lock@collabora.co.uk>
On Fri, 2015-09-04 at 15:59 +0100, Joshua Lock wrote:
> 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@collabora.co.uk>
> ---
> 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
Not all our build machines appear to support ln -r, e.g.:
https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/479/steps/BuildImages/logs/stdio
(debian7)
We do however have a python script called "lnr" in scripts which might
help...
Cheers,
Richard
next prev parent reply other threads:[~2015-09-04 22:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-04 14:59 [PATCH v2 0/9] Fixes for a distro with a merged /usr Joshua Lock
2015-09-04 14:59 ` [PATCH v2 1/9] kmod: fix link creation when base_bindir != /bin Joshua Lock
2015-09-04 22:11 ` Richard Purdie [this message]
2015-09-04 14:59 ` [PATCH v2 2/9] busybox: fixes for " Joshua Lock
2015-09-04 14:59 ` [PATCH v2 3/9] systemd: remove hard-coded paths in FILES entries Joshua Lock
2015-09-04 14:59 ` [PATCH v2 4/9] alsa-utils: handle udev dir being 2 levels below / Joshua Lock
2015-09-04 14:59 ` [PATCH v2 5/9] pulseaudio: " Joshua Lock
2015-09-04 14:59 ` [PATCH v2 6/9] bluez: " Joshua Lock
2015-09-04 14:59 ` [PATCH v2 7/9] pcmciautils: " Joshua Lock
2015-09-04 14:59 ` [PATCH v2 8/9] nfs-utils: don't force use of /sbin as sbindir Joshua Lock
2015-09-04 14:59 ` [PATCH v2 9/9] procps: fix for base_sbindir == sbindir Joshua Lock
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441404696.24871.201.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=joshua.lock@collabora.co.uk \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox