* 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
Signed-off-by: Eric Bénard <[email protected]> --- recipes/util-linux-ng/util-linux-ng.inc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index a829b08..b9dbd7c 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 ?= "" @@ -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 } -- 1.6.3.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
