aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-09-13 12:57:21 +0200
committerKhem Raj <raj.khem@gmail.com>2010-09-26 09:43:16 -0700
commit00e288c94f81a016ca2161334614b5edf7470afc (patch)
treec7f84c543c9bce1308d004b90ce016bc6522b11f
parent18f06253366c954ce6c20a8ddf494fabb153a140 (diff)
downloadopenembedded-00e288c94f81a016ca2161334614b5edf7470afc.zip
openembedded-00e288c94f81a016ca2161334614b5edf7470afc.tar.gz
openembedded-00e288c94f81a016ca2161334614b5edf7470afc.tar.bz2
util-linux-ng: reset rdepends on ncurses-tools
* reset is a script which is using tput provided by ncurses-tools (which also provides reset) so util-linux-ng's reset command fails if ncurses-tools is not installed on the target * this patch creates a utils-linux-ng-reset package with RDEPENDS="ncurses-tools" Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r--recipes/util-linux-ng/util-linux-ng.inc17
1 files changed, 13 insertions, 4 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index a829b08..b5dd25b 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -8,7 +8,7 @@ inherit autotools gettext
DEFAULT_PREFERENCE = "-1"
-INC_PR = "r29"
+INC_PR = "r30"
# allows for a release candidate
RC ?= ""
@@ -19,7 +19,7 @@ SRC_URI_append_chinook-compat = " file://chinook_libtool.patch "
PACKAGES =+ "${PN}-fdisk ${PN}-cfdisk ${PN}-sfdisk ${PN}-swaponoff \
${PN}-losetup ${PN}-umount ${PN}-mount ${PN}-readprofile \
- ${PN}-fsck ${PN}-blkid ${PN}-mountall"
+ ${PN}-fsck ${PN}-blkid ${PN}-mountall ${PN}-reset"
PACKAGES_virtclass-native = ""
@@ -55,12 +55,14 @@ FILES_util-linux-ng-readprofile = "${sbindir}/readprofile.${PN}"
FILES_util-linux-ng-fsck = "${base_sbindir}/fsck.${PN}"
FILES_util-linux-ng-blkid = "${base_sbindir}/blkid.${PN}"
FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"
+FILES_${PN}-reset = "${bindir}/reset.${PN}"
RREPLACES_util-linux-ng-blkid = "e2fsprogs-blkid"
RREPLACES_${PN}-mountall = "busybox-mountall"
RRECOMMENDS_${PN} = "${PN}-fdisk ${PN}-cfdisk ${PN}-sfdisk ${PN}-mount ${PN}-readprofile"
RDEPENDS_${PN} = "${PN}-mountall ${PN}-umount ${PN}-swaponoff ${PN}-losetup ${PN}-fsck ${PN}-blkid"
+RDEPENDS_${PN}-reset = "ncurses-tools"
RRECOMMENDS_${PN}_virtclass-native = ""
RDEPENDS_${PN}_virtclass-native = ""
@@ -214,7 +216,6 @@ pkg_postinst_${PN} () {
update-alternatives --install ${base_bindir}/login login login.${PN} 100
update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100
update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100
- update-alternatives --install ${bindir}/reset reset reset.${PN} 100
update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
@@ -230,11 +231,19 @@ pkg_prerm_${PN} () {
test -x ${base_sbindir}/pivot_root.${PN} && \
update-alternatives --remove pivot_root pivot_root.${PN}
- for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login reset; do
+ for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login; do
update-alternatives --remove $i $i.${PN}
done
}
+pkg_postinst_util-linux-ng-reset() {
+ update-alternatives --install ${bindir}/reset reset reset.${PN} 100
+}
+
+pkg_prerm_util-linux-ng-reset () {
+ update-alternatives --remove reset reset.${PN}
+}
+
pkg_postinst_util-linux-ng-fdisk () {
update-alternatives --install ${base_sbindir}/fdisk fdisk fdisk.${PN} 100
}