From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 655977458B for ; Sat, 13 Oct 2018 04:40:52 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id w9D4eqat020338 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Fri, 12 Oct 2018 21:40:53 -0700 (PDT) Received: from fidler.wrs.com (172.25.44.4) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.408.0; Fri, 12 Oct 2018 21:40:51 -0700 From: Randy MacLeod To: Date: Sat, 13 Oct 2018 00:40:51 -0400 Message-ID: <20181013044051.4298-1-Randy.MacLeod@windriver.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Subject: [PATCH] util-linux: fix alternatives setting for switch-root X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Oct 2018 04:40:52 -0000 Content-Type: text/plain The alternative setting for switch_root belongs to the util-linux-switch_root package instead of the util-linux package. Fix this problem to avoid a dangling symlink: /usr/bin/switch_root-> /usr/bin/switch_root.util-linux on target and in the sdk. Signed-off-by: Randy MacLeod --- meta/recipes-core/util-linux/util-linux.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 60ac9c2006..9d424158fd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -206,7 +206,7 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root switch_root \ + dmesg kill more mkswap blockdev pivot_root \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject nologin taskset fallocate \ fsfreeze nsenter \ @@ -218,7 +218,6 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" @@ -294,6 +293,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_util-linux-switch_root = "switch_root" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" + BBCLASSEXTEND = "native nativesdk" python do_package_prepend () { -- 2.17.0