summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2005-08-05 02:10:32 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-05 02:10:32 +0000
commit1127d88552ff3b718d3435777f5a3085425935a8 (patch)
tree34a4bb9464d19e35076f4a5c56bf13994a7b8585 /packages
parentea27c6fa6cf8609bb23cdd6d9bf517297208ba28 (diff)
Change priority on broken uptime to be lower than busybox's working uptime. Add hostname to u-a postrm, since that had been forgotten. Oh yeah, and bump that PR ;)
Diffstat (limited to 'packages')
-rw-r--r--packages/coreutils/coreutils_5.1.3.bb13
1 files changed, 10 insertions, 3 deletions
diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb
index cced8b00e7..0862c8f99c 100644
--- a/packages/coreutils/coreutils_5.1.3.bb
+++ b/packages/coreutils/coreutils_5.1.3.bb
@@ -3,7 +3,7 @@ SECTION = "base"
DESCRIPTION = "A collection of core GNU utilities."
RREPLACES = "textutils shellutils fileutils"
RPROVIDES = "textutils shellutils fileutils"
-PR = "r4"
+PR = "r5"
SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
file://install-cross.patch;patch=1;pnum=0 \
@@ -17,7 +17,7 @@ bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
join link logname md5sum mkfifo nice nl nohup od paste pathchk \
pinky pr printenv printf ptx readlink seq sha1sum shred sort \
split stat sum tac tail tee test tr tsort tty unexpand uniq \
- unlink uptime users vdir wc who whoami yes \
+ unlink users vdir wc who whoami yes \
"
# hostname gets a special treatment and is not included in this
@@ -42,6 +42,7 @@ do_install () {
install -d ${D}${base_bindir}
for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
+ mv ${D}${bindir}/uptime ${D}${base_bindir}/uptime.${PN}
# Renaming and moving the utilities that should go in /usr/sbin (FHS)
install -d ${D}${sbindir}
@@ -52,7 +53,9 @@ pkg_postinst_${PN} () {
# The utilities in /usr/bin
for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-
+ # coreutils uptime is broken but busybox uptime works, put at priority 10
+ update-alternatives --install ${base_bindir}/uptime uptime uptime.${PN} 10
+
# The utilities in /bin
for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
# coreutils hostname is retarded and doesn't know about -F, put at priority 10
@@ -73,4 +76,8 @@ pkg_prerm_${PN} () {
# The utilities in /usr/sbin
for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+ # The special cases
+ update-alternatives --remove ${bindir}/hostname hostname.${PN}
+ update-alternatives --remove ${base_bindir}/uptime uptime.${PN}
}