aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>2013-01-07 14:00:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 13:41:17 +0000
commit0ed77fe790a76a530b173eefaba648b1c22a4a3e (patch)
treeccd1a3e6f0ed9eb1cae2e766aa634c7226232659 /meta/recipes-core
parenta746cf196792d1c0646f5e97e87055e0974d753e (diff)
downloadopenembedded-core-contrib-0ed77fe790a76a530b173eefaba648b1c22a4a3e.tar.gz
openembedded-core-contrib-0ed77fe790a76a530b173eefaba648b1c22a4a3e.tar.bz2
openembedded-core-contrib-0ed77fe790a76a530b173eefaba648b1c22a4a3e.zip
util-linux: moved 'reset' into own subpackage
The 'reset' tool from util-linux is a shell script calling 'tput' which is provided by 'ncurses'. To avoid a 'util-linux' -> 'ncurses' dependency, 'reset' is put into an own subpackage which can be installed on demand. Because most (all) systems are using 'busybux' which provides an alternative 'reset' implementation, this should not cause too much regressions. Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc15
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.22.1.bb2
2 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index cd79895af6..667232c342 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -33,7 +33,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-mkfs util-linux-mcookie util-linux-systemd"
+ util-linux-mkfs util-linux-mcookie util-linux-systemd util-linux-reset"
EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
--disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -60,6 +60,7 @@ FILES_util-linux-mcookie = "${bindir}/mcookie"
FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
+FILES_util-linux-reset = "${base_bindir}/reset"
FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
@@ -75,6 +76,9 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid*"
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
+# reset calls 'tput'
+RDEPENDS_util-linux-reset += "ncurses"
+
FILES_${PN}-systemd = "${systemd_unitdir}/system/"
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
@@ -83,6 +87,7 @@ RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-l
RRECOMMENDS_${PN}_class-native = ""
RDEPENDS_${PN}_class-native = ""
+
do_compile () {
set -e
install ${WORKDIR}/MCONFIG ${S}/MCONFIG
@@ -138,15 +143,13 @@ inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root"
+ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject"
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
-ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
-ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
@@ -185,4 +188,8 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck"
ALTERNATIVE_util-linux-blkid = "blkid"
ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid"
+ALTERNATIVE_util-linux-reset = "reset"
+ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
+ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
+
BBCLASSEXTEND = "native"
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 f5d777f686..d734951eda 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 @@
MAJOR_VERSION = "2.22"
-PR = "r2"
+PR = "r3"
require util-linux.inc
# note that `lscpu' is under GPLv3+