From 3a8cf86a60a78da66cd17c9670b961bf9fa11aa4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 28 Nov 2015 19:15:17 +0100 Subject: Minor merged-usr updates --- recipes-core/busybox/busybox_%.bbappend | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'recipes-core/busybox/busybox_%.bbappend') diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend index 3c3d7f0..87a275d 100644 --- a/recipes-core/busybox/busybox_%.bbappend +++ b/recipes-core/busybox/busybox_%.bbappend @@ -146,11 +146,8 @@ pkg_postinst_${PN} () { if test ! -e "$link"; then # we can use busybox here because even if we are using splitted busybox # we've made a symlink from /bin/busybox to /bin/busybox.nosuid. - # The sed expression will fail if ${base_bindir}, ${base_sbindir}, ${bindir} or - # ${sbindir} contains . or .., so don't do that! - to="$(echo -n "$link" | busybox sed -r -e 's@^/[^/]+/@@' -e 's@[^/]+@..@g')${base_bindir}/busybox$suffix" busybox rm -f $link - busybox ln -s $to $link + busybox ln -s "${base_bindir}/busybox$suffix" $link fi done < /etc/busybox.links$suffix fi -- cgit v1.2.3