aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2018-03-29 19:56:36 +0200
committerAndreas Oberritter <obi@opendreambox.org>2018-12-20 22:32:11 +0100
commit4b138d2d6ddf9fd7e985ec30236f7f90d9fa6be8 (patch)
tree76d14e800b76b28e98bf6103eed54082896a9d08
parent7e9909fba3ba871e0b3ee904a729af3e681214e3 (diff)
downloadopenembedded-core-contrib-4b138d2d6ddf9fd7e985ec30236f7f90d9fa6be8.tar.gz
openembedded-core-contrib-4b138d2d6ddf9fd7e985ec30236f7f90d9fa6be8.tar.bz2
openembedded-core-contrib-4b138d2d6ddf9fd7e985ec30236f7f90d9fa6be8.zip
util-linux: fix update-alternatives for switch_root
Commit 027f1782 moved switch_root to its own package, but failed to move the alternatives. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
1 files 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 0b7db529fd..df6e096a78 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -204,7 +204,7 @@ do_install_append_class-native () {
ALTERNATIVE_PRIORITY = "80"
-ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
+ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall"
ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset"
@@ -214,7 +214,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[nologin] = "${base_sbindir}/nologin"
@@ -282,6 +281,9 @@ ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
ALTERNATIVE_util-linux-mountpoint = "mountpoint"
ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
+ALTERNATIVE_util-linux-switch-root = "switch_root"
+ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+
BBCLASSEXTEND = "native nativesdk"
python do_package_prepend () {