summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc3
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.22.1.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 058f06fbc2..30d80e5fc5 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -136,7 +136,7 @@ ALTERNATIVE_PRIORITY = "100"
136 136
137ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" 137ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root"
138ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 138ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
139ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump" 139ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject"
140 140
141ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 141ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
142ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 142ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -147,6 +147,7 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
147ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" 147ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
148ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 148ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
149ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 149ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
150ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
150 151
151# There seems to be problem, atleast on nslu2, with these, untill they are 152# There seems to be problem, atleast on nslu2, with these, untill they are
152# fixed the busybox ones have higher priority 153# fixed the busybox ones have higher priority
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.1.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
index c72634dc96..0177bba260 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.22" 1MAJOR_VERSION = "2.22"
2PR = "r0" 2PR = "r1"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+