summaryrefslogtreecommitdiffstats
path: root/meta
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:50:39 +0000
commit1cecbacdbef77a94f701abadba7527a53b775acb (patch)
treec23d5db7293ed1359fa5f1fadf53fcef69ff945d /meta
parent9f79f44d32bc796d0515d33af4e07e76e4c28837 (diff)
downloadpoky-1cecbacdbef77a94f701abadba7527a53b775acb.tar.gz
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. (From OE-Core rev: 0ed77fe790a76a530b173eefaba648b1c22a4a3e) Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
33 util-linux-mount util-linux-readprofile util-linux-libblkid \ 33 util-linux-mount util-linux-readprofile util-linux-libblkid \
34 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ 34 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
35 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 35 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
36 util-linux-mkfs util-linux-mcookie util-linux-systemd" 36 util-linux-mkfs util-linux-mcookie util-linux-systemd util-linux-reset"
37 37
38EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ 38EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
39 --disable-makeinstall-chown --enable-elvtune --enable-init \ 39 --disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -60,6 +60,7 @@ FILES_util-linux-mcookie = "${bindir}/mcookie"
60FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" 60FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
61FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" 61FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}"
62FILES_util-linux-uuidgen = "${bindir}/uuidgen" 62FILES_util-linux-uuidgen = "${bindir}/uuidgen"
63FILES_util-linux-reset = "${base_bindir}/reset"
63 64
64FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 65FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
65FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" 66FILES_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*"
75RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" 76RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
76RREPLACES_util-linux-blkid = "e2fsprogs-blkid" 77RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
77 78
79# reset calls 'tput'
80RDEPENDS_util-linux-reset += "ncurses"
81
78FILES_${PN}-systemd = "${systemd_unitdir}/system/" 82FILES_${PN}-systemd = "${systemd_unitdir}/system/"
79 83
80RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" 84RDEPENDS_${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
83RRECOMMENDS_${PN}_class-native = "" 87RRECOMMENDS_${PN}_class-native = ""
84RDEPENDS_${PN}_class-native = "" 88RDEPENDS_${PN}_class-native = ""
85 89
90
86do_compile () { 91do_compile () {
87 set -e 92 set -e
88 install ${WORKDIR}/MCONFIG ${S}/MCONFIG 93 install ${WORKDIR}/MCONFIG ${S}/MCONFIG
@@ -138,15 +143,13 @@ inherit update-alternatives
138 143
139ALTERNATIVE_PRIORITY = "100" 144ALTERNATIVE_PRIORITY = "100"
140 145
141ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" 146ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
142ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 147ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
143ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" 148ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject"
144 149
145ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 150ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
146ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 151ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
147ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" 152ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
148ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
149ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
150ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" 153ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
151ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" 154ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
152ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 155ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
@@ -185,4 +188,8 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck"
185ALTERNATIVE_util-linux-blkid = "blkid" 188ALTERNATIVE_util-linux-blkid = "blkid"
186ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 189ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid"
187 190
191ALTERNATIVE_util-linux-reset = "reset"
192ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
193ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
194
188BBCLASSEXTEND = "native" 195BBCLASSEXTEND = "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 @@
1MAJOR_VERSION = "2.22" 1MAJOR_VERSION = "2.22"
2PR = "r2" 2PR = "r3"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+