Skip to contentSkip to conversation

util-linux-ng: handle reset problem

PATCH In review Eric Bénard 3 participants 6 messages Sep 13, 2010 – Sep 14, 2010

lore
Share & tools
lore
#0 lore raw

Hi,

util-linux-ng's reset is a script which is using tput which is provided by ncurses-tools (which also provides reset). 2 patches will follow :
- first one creates a util-linux-ng-reset package which rdepends on ncurses-utils
- second one remove util-linux-ng's reset to use ncurses-tools' one.

Which solution is preferred ?

Eric

#1 lore raw

PATCH 1/1 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"

---
 recipes/util-linux-ng/util-linux-ng.inc |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
recipes/util-linux-ng/util-linux-ng.inc +13 -4
index a829b08..b5dd25b 100644
@@ -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
 }
Signature · 1 line
1.6.3.3
#2 lore raw

PATCH 1/1 util-linux-ng: remove reset

* reset is a script using tput so it rdepends on ncurses-tools which also provided reset
* prefer using the original and remove util-linux-ng's reset

---
 recipes/util-linux-ng/util-linux-ng.inc |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
recipes/util-linux-ng/util-linux-ng.inc +4 -5
index a829b08..b9dbd7c 100644
@@ -8,7 +8,7 @@ inherit autotools gettext
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r29"
+INC_PR = "r30"
 
 # allows for a release candidate
 RC ?= ""
@@ -69,7 +69,7 @@ EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \
 --enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \
 --enable-arch --enable-init --enable-partx --enable-schedutils \
 --with-fsprobe=builtin --enable-libuuid --enable-libblkid \
---enable-fsck --enable-reset"
+--enable-fsck"
 
 LDFLAGS_append_libc-uclibc = "${@['',' -lintl'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
 LDFLAGS_virtclass-native = "${BUILD_LDFLAGS}"
@@ -125,7 +125,7 @@ do_install () {
 
         sbinprogs="agetty blockdev ctrlaltdel cfdisk"
         sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw"
-        usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset"
+        usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
         usrsbinprogs_a="readprofile"
         binprogs_a="dmesg kill more umount mount login"
 
@@ -214,7 +214,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,7 +229,7 @@ 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
 }
Signature · 1 line
1.6.3.3
#3 lore raw

Re: [PATCH] util-linux-ng: remove reset

2010/9/13 Eric Bénard <[email protected]>:

Quoted 5 lines

* reset is a script using tput so it rdepends on ncurses-tools which also provided reset
* prefer using the original and remove util-linux-ng's reset

If they are functionally identical I have a slight preference for removing it and use the original.
No strong feelings on it though.

Frans

#4 lore raw

Re: [PATCH] util-linux-ng: remove reset

Am 13.09.2010 18:41, schrieb Frans Meulenbroeks:

Quoted 10 lines

2010/9/13 Eric Bénard <[email protected]>:

Quoted 5 lines

* reset is a script using tput so it rdepends on ncurses-tools which also provided reset
* prefer using the original and remove util-linux-ng's reset

If they are functionally identical I have a slight preference for removing it and use the original.
No strong feelings on it though.

What about update-alternatives?

Steffen

#5 lore raw

Re: [PATCH] util-linux-ng: remove reset

Hi,

Quoted 6 lines · Steffen Sledz

Am 13.09.2010 18:41, schrieb Frans Meulenbroeks:

Quoted 5 lines

2010/9/13 Eric Bénard<[email protected]>:

Quoted 4 lines

* reset is a script using tput so it rdepends on ncurses-tools which also provided reset
* prefer using the original and remove util-linux-ng's reset

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

If they are functionally identical I have a slight preference for removing it and use the original.
No strong feelings on it though.

What about update-alternatives?

is it an ack for the first patch ?
http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-September/024167.html

Thanks,
Eric