[oe-commits] Martyn Welch : util-linux-ng: Correct vi error

git version control git at git.openembedded.org
Fri Mar 12 06:04:14 UTC 2010


Module: openembedded.git
Branch: shr/unstable
Commit: 964958b0b126c38b1ce81e653c5f7d3eafcce023
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=964958b0b126c38b1ce81e653c5f7d3eafcce023

Author: Martyn Welch <martyn.welch at ge.com>
Date:   Thu Mar 11 05:41:03 2010 +0000

util-linux-ng: Correct vi error

Commit bbd436a98df5d4a439e519651c38fb48d81e5a78 appears to have added a via
error to "pkg_prerm_${PN}":

  - update-alternatives --remove pivot_root pivot_root.${PN}
  + update-alternatives --remove pivot_root pivot_root.${PN}i

Signed-off-by: Martyn Welch <martyn.welch at ge.com>
Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 recipes/util-linux-ng/util-linux-ng.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 3073cfe..1c6e8a8 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -7,7 +7,7 @@ inherit autotools
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r15"
+INC_PR = "r16"
 
 # allows for a release candidate
 RC ?= ""
@@ -211,7 +211,7 @@ pkg_postinst_${PN} () {
 
 pkg_prerm_${PN} () {
 	test -x ${base_sbindir}/pivot_root.${PN} && \
-	update-alternatives --remove pivot_root pivot_root.${PN}i
+	update-alternatives --remove pivot_root pivot_root.${PN}
 
 	for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hecdump last logger mesg renice wall vipw vigr chfn newgrp chsh login ; do
 		update-alternatives --remove $i $i.${PN}





More information about the Openembedded-commits mailing list