coreutils: make 6.0 the new default

remove older ones

19 files changed, 8 insertions, 537 deletions

diff --git a/packages/coreutils/coreutils-5.0/configure.patch b/packages/coreutils/coreutils-5.0/configure.patch
deleted file mode 100644
index 5678c97997..0000000000
--- a/packages/coreutils/coreutils-5.0/configure.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- coreutils-5.0/configure.ac~configure
-+++ coreutils-5.0/configure.ac
-@@ -15,6 +15,7 @@
- AC_PROG_GCC_TRADITIONAL
- AC_PROG_RANLIB
- AC_PROG_LN_S
-+AC_PROG_YACC
- AC_AIX
- AC_MINIX
- 
-@@ -28,6 +29,8 @@
- 	OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS hostid\$(EXEEXT)"
- 	MAN="$MAN hostid.1")
- 
-+AC_FUNC_ALLOCA
-+
- jm_MACROS
- 
- AC_HEADER_TIOCGWINSZ()
---- coreutils-5.0/configure.ac	2004-01-23 14:49:55.000000000 -0500
-+++ coreutils-5.0/configure.ac	2004-01-23 14:41:46.000000000 -0500
-@@ -147,7 +147,7 @@
-   fi
- fi
- 
--AC_DEFUN(jm_DUMMY_1,
-+AC_DEFUN([jm_DUMMY_1],
- [
-   AC_REQUIRE([jm_PREREQ_READUTMP])
-   if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
---- coreutils-5.0/m4/nanosleep.m4	2001-09-17 17:44:03.000000000 -0400
-+++ coreutils-5.0/m4/nanosleep.m4	2004-01-23 14:47:18.000000000 -0500
-@@ -12,6 +12,9 @@
-  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
-  # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
-  AC_SEARCH_LIBS(nanosleep, [rt posix4], [LIB_NANOSLEEP=$ac_cv_search_nanosleep])
-+ if test "$ac_cv_search_nanosleep" = "none required"; then
-+  LIB_NANOSLEEP=
-+ fi
-  AC_SUBST(LIB_NANOSLEEP)
- 
-  AC_CACHE_CHECK([whether nanosleep works],
diff --git a/packages/coreutils/coreutils-5.0/malloc.patch b/packages/coreutils/coreutils-5.0/malloc.patch
deleted file mode 100644
index 079b57b94e..0000000000
--- a/packages/coreutils/coreutils-5.0/malloc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- coreutils-5.0/lib/putenv.c~malloc
-+++ coreutils-5.0/lib/putenv.c
-@@ -34,9 +34,11 @@
- char *malloc ();
- void free ();
- 
-+#if 0
- #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
- # include <string.h>
- #endif
-+#endif
- #if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
- # include <unistd.h>
- #endif
diff --git a/packages/coreutils/coreutils-5.1.3/install-cross.patch b/packages/coreutils/coreutils-5.1.3/install-cross.patch
deleted file mode 100644
index 98ba3d916c..0000000000
--- a/packages/coreutils/coreutils-5.1.3/install-cross.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/install.c~	2003-08-09 18:46:45.000000000 +0100
-+++ src/install.c	2004-03-27 18:38:45.000000000 +0000
-@@ -516,7 +516,14 @@
- strip (const char *path)
- {
-   int status;
--  pid_t pid = fork ();
-+  pid_t pid;
-+  char *strip_name;
-+
-+  strip_name = getenv ("STRIP");
-+  if (strip_name == NULL)
-+    strip_name = "strip";
-+
-+  pid = fork ();
- 
-   switch (pid)
-     {
-@@ -524,7 +531,7 @@
-       error (EXIT_FAILURE, errno, _("fork system call failed"));
-       break;
-     case 0:			/* Child. */
--      execlp ("strip", "strip", path, NULL);
-+      execlp (strip_name, "strip", path, NULL);
-       error (EXIT_FAILURE, errno, _("cannot run strip"));
-       break;
-     default:			/* Parent. */
diff --git a/packages/coreutils/coreutils-5.1.3/man.patch b/packages/coreutils/coreutils-5.1.3/man.patch
deleted file mode 100644
index b067c380e2..0000000000
--- a/packages/coreutils/coreutils-5.1.3/man.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- coreutils-5.1.3/configure.ac~man	2004-01-25 16:57:15.000000000 -0600
-+++ coreutils-5.1.3/configure.ac	2004-06-29 14:22:10.000000000 -0500
-@@ -232,6 +232,20 @@
- AM_GNU_GETTEXT([external], [need-ngettext])
- AM_GNU_GETTEXT_VERSION(0.13.1)
- 
-+AC_MSG_CHECKING([whether to build man pages])
-+AC_ARG_WITH(manpages, 
-+	AS_HELP_STRING([--with-manpages],
-+		[Enable building of manpages (default=yes)]),
-+	[cu_cv_build_manpages=$enableval],
-+	[cu_cv_build_manpages=yes])
-+# help2man doesn't work when crosscompiling, as it needs to run the
-+# binary that was built.
-+if test x"$cross_compiling" = x"yes"; then
-+  cu_cv_build_manpages=no
-+fi
-+AC_MSG_RESULT($cu_cv_build_manpages)
-+AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes")
-+
- AC_CONFIG_FILES(
-   Makefile
-   doc/Makefile
---- coreutils-5.1.3/Makefile.am~man	2003-11-09 14:23:02.000000000 -0600
-+++ coreutils-5.1.3/Makefile.am	2004-06-29 14:18:14.000000000 -0500
-@@ -1,6 +1,11 @@
- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
- 
-+if ENABLE_MANPAGES
- SUBDIRS = lib src doc man m4 po tests
-+else
-+SUBDIRS = lib src doc m4 po tests
-+endif
-+
- EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
-   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
-   .x-sc_space_tab .x-sc_sun_os_names \
diff --git a/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch b/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch
deleted file mode 100644
index cde2731477..0000000000
--- a/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# On Ubuntu edgy (and perhaps other distributions), eaccess is provided by
-# unistd.h - This renames the function so as not to conflict.
-
---- coreutils-5.1.3/src/test.c.old	2006-08-17 15:29:41.000000000 +0100
-+++ coreutils-5.1.3/src/test.c	2006-08-17 15:30:44.000000000 +0100
-@@ -125,7 +125,7 @@
- /* Do the same thing access(2) does, but use the effective uid and gid.  */
- 
- static int
--eaccess (char const *file, int mode)
-+_eaccess (char const *file, int mode)
- {
-   static int have_ids;
-   static uid_t uid, euid;
-@@ -158,7 +158,7 @@
-   return result;
- }
- #else
--# define eaccess(F, M) euidaccess (F, M)
-+# define _eaccess(F, M) euidaccess (F, M)
- #endif
- 
- /* Increment our position in the argument list.  Check that we're not
-@@ -623,17 +623,17 @@
- 
-     case 'r':			/* file is readable? */
-       unary_advance ();
--      value = -1 != eaccess (argv[pos - 1], R_OK);
-+      value = -1 != _eaccess (argv[pos - 1], R_OK);
-       return (TRUE == value);
- 
-     case 'w':			/* File is writable? */
-       unary_advance ();
--      value = -1 != eaccess (argv[pos - 1], W_OK);
-+      value = -1 != _eaccess (argv[pos - 1], W_OK);
-       return (TRUE == value);
- 
-     case 'x':			/* File is executable? */
-       unary_advance ();
--      value = -1 != eaccess (argv[pos - 1], X_OK);
-+      value = -1 != _eaccess (argv[pos - 1], X_OK);
-       return (TRUE == value);
- 
-     case 'O':			/* File is owned by you? */
diff --git a/packages/coreutils/coreutils-5.3.0/futimens.patch b/packages/coreutils/coreutils-5.3.0/futimens.patch
deleted file mode 100644
index 3cb2b6ab32..0000000000
--- a/packages/coreutils/coreutils-5.3.0/futimens.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: coreutils-5.3.0/lib/utimens.c
-===================================================================
---- coreutils-5.3.0.orig/lib/utimens.c	2005-01-03 22:19:15.000000000 +0000
-+++ coreutils-5.3.0/lib/utimens.c	2007-07-01 19:12:32.000000000 +0000
-@@ -55,8 +55,8 @@
-    If TIMESPEC is null, set the time stamps to the current time.  */
- 
- int
--futimens (int fd ATTRIBUTE_UNUSED,
--	  char const *file, struct timespec const timespec[2])
-+gl_futimens (int fd ATTRIBUTE_UNUSED,
-+	     char const *file, struct timespec const timespec[2])
- {
-   /* There's currently no interface to set file timestamps with
-      nanosecond resolution, so do the best we can, discarding any
-@@ -117,5 +117,5 @@
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
--  return futimens (-1, file, timespec);
-+  return gl_futimens (-1, file, timespec);
- }
-Index: coreutils-5.3.0/lib/utimens.h
-===================================================================
---- coreutils-5.3.0.orig/lib/utimens.h	2004-11-23 20:54:33.000000000 +0000
-+++ coreutils-5.3.0/lib/utimens.h	2007-07-01 19:12:37.000000000 +0000
-@@ -1,3 +1,3 @@
- #include "timespec.h"
--int futimens (int, char const *, struct timespec const [2]);
-+int gl_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
-Index: coreutils-5.3.0/src/touch.c
-===================================================================
---- coreutils-5.3.0.orig/src/touch.c	2004-11-23 20:54:35.000000000 +0000
-+++ coreutils-5.3.0/src/touch.c	2007-07-01 19:11:52.000000000 +0000
-@@ -191,7 +191,7 @@
-       t = timespec;
-     }
- 
--  ok = (futimens (fd, file, t) == 0);
-+  ok = (gl_futimens (fd, file, t) == 0);
-   if (fd != -1)
-     ok &= (close (fd) == 0);
- 
diff --git a/packages/coreutils/coreutils-5.3.0/install-cross.patch b/packages/coreutils/coreutils-5.3.0/install-cross.patch
deleted file mode 100644
index 98ba3d916c..0000000000
--- a/packages/coreutils/coreutils-5.3.0/install-cross.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/install.c~	2003-08-09 18:46:45.000000000 +0100
-+++ src/install.c	2004-03-27 18:38:45.000000000 +0000
-@@ -516,7 +516,14 @@
- strip (const char *path)
- {
-   int status;
--  pid_t pid = fork ();
-+  pid_t pid;
-+  char *strip_name;
-+
-+  strip_name = getenv ("STRIP");
-+  if (strip_name == NULL)
-+    strip_name = "strip";
-+
-+  pid = fork ();
- 
-   switch (pid)
-     {
-@@ -524,7 +531,7 @@
-       error (EXIT_FAILURE, errno, _("fork system call failed"));
-       break;
-     case 0:			/* Child. */
--      execlp ("strip", "strip", path, NULL);
-+      execlp (strip_name, "strip", path, NULL);
-       error (EXIT_FAILURE, errno, _("cannot run strip"));
-       break;
-     default:			/* Parent. */
diff --git a/packages/coreutils/coreutils-5.3.0/man.patch b/packages/coreutils/coreutils-5.3.0/man.patch
deleted file mode 100644
index 5060e4fdff..0000000000
--- a/packages/coreutils/coreutils-5.3.0/man.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- coreutils-5.3.0/configure.ac~man
-+++ coreutils-5.3.0/configure.ac
-@@ -237,6 +237,20 @@
- AM_GNU_GETTEXT([external], [need-ngettext])
- AM_GNU_GETTEXT_VERSION(0.13.1)
- 
-+AC_MSG_CHECKING([whether to build man pages])
-+AC_ARG_WITH(manpages, 
-+	AS_HELP_STRING([--with-manpages],
-+		[Enable building of manpages (default=yes)]),
-+	[cu_cv_build_manpages=$enableval],
-+	[cu_cv_build_manpages=yes])
-+# help2man doesn't work when crosscompiling, as it needs to run the
-+# binary that was built.
-+if test x"$cross_compiling" = x"yes"; then
-+  cu_cv_build_manpages=no
-+fi
-+AC_MSG_RESULT($cu_cv_build_manpages)
-+AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes")
-+
- AC_CONFIG_FILES(
-   Makefile
-   doc/Makefile
---- coreutils-5.3.0/Makefile.am~man
-+++ coreutils-5.3.0/Makefile.am
-@@ -1,6 +1,11 @@
- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
- 
-+if ENABLE_MANPAGES
- SUBDIRS = lib src doc man po tests
-+else
-+SUBDIRS = lib src doc po tests
-+endif
-+
- EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
-   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
-   .x-sc_space_tab .x-sc_sun_os_names \
diff --git a/packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch b/packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch
deleted file mode 100644
index 148a5f4f8f..0000000000
--- a/packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Glibc 2.5 has a function called tee which conflicts with the same function
-in coreutils. This patch renames the function to tee_files (as is done in
-the newer coreutils versions.)
-
---- coreutils-5.3.0/src/tee.c	2006/10/23 07:35:00	1.1
-+++ coreutils-5.3.0/src/tee.c	2006/10/23 07:35:16
-@@ -31,7 +31,7 @@
- 
- #define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
- 
--static bool tee (int nfiles, const char **files);
-+static bool tee_files (int nfiles, const char **files);
- 
- /* If true, append to output files rather than truncating them. */
- static bool append;
-@@ -121,7 +121,7 @@
-   /* Do *not* warn if tee is given no file arguments.
-      POSIX requires that it work when given no arguments.  */
- 
--  ok = tee (argc - optind, (const char **) &argv[optind]);
-+  ok = tee_files (argc - optind, (const char **) &argv[optind]);
-   if (close (STDIN_FILENO) != 0)
-     error (EXIT_FAILURE, errno, _("standard input"));
- 
-@@ -133,7 +133,7 @@
-    Return true if successful.  */
- 
- static bool
--tee (int nfiles, const char **files)
-+tee_files (int nfiles, const char **files)
- {
-   FILE **descriptors;
-   char buffer[BUFSIZ];
diff --git a/packages/coreutils/coreutils-5.3.0/uptime-pow-lib.patch b/packages/coreutils/coreutils-5.3.0/uptime-pow-lib.patch
deleted file mode 100644
index 5eb3fca676..0000000000
--- a/packages/coreutils/coreutils-5.3.0/uptime-pow-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- coreutils-5.3.0/src/Makefile.am.orig	2005-09-27 22:34:35.659272058 -0700
-+++ coreutils-5.3.0/src/Makefile.am	2005-09-27 22:34:39.403507668 -0700
-@@ -74,7 +74,7 @@
- sleep_LDADD = $(nanosec_libs)
- tail_LDADD = $(nanosec_libs)
- 
--uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
-+uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
- 
- su_LDADD = $(LDADD) $(LIB_CRYPT)
- 
diff --git a/packages/coreutils/coreutils-native_5.1.3.bb b/packages/coreutils/coreutils-native_5.1.3.bb
deleted file mode 100644
index ee90981895..0000000000
--- a/packages/coreutils/coreutils-native_5.1.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "base"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
-S = "${WORKDIR}/coreutils-${PV}"
-
-require coreutils_${PV}.bb
-inherit native
diff --git a/packages/coreutils/coreutils-native_5.3.0.bb b/packages/coreutils/coreutils-native_5.3.0.bb
deleted file mode 100644
index ee90981895..0000000000
--- a/packages/coreutils/coreutils-native_5.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "base"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
-S = "${WORKDIR}/coreutils-${PV}"
-
-require coreutils_${PV}.bb
-inherit native
diff --git a/packages/coreutils/coreutils-native_6.0.bb b/packages/coreutils/coreutils-native_6.0.bb
index ee90981895..057dfa6d80 100644
--- a/packages/coreutils/coreutils-native_6.0.bb
+++ b/packages/coreutils/coreutils-native_6.0.bb
@@ -1,5 +1,3 @@
-SECTION = "base"
-
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
 S = "${WORKDIR}/coreutils-${PV}"
 
diff --git a/packages/coreutils/coreutils.inc b/packages/coreutils/coreutils.inc
index 481c32bb3d..38dbd1d4f2 100644
--- a/packages/coreutils/coreutils.inc
+++ b/packages/coreutils/coreutils.inc
@@ -1,4 +1,5 @@
 DESCRIPTION = "A collection of core GNU utilities."
+HOMEPAGE = "http://www.gnu.org/software/coreutils"
 LICENSE = "GPL"
 SECTION = "base"
 RREPLACES = "textutils shellutils fileutils"
diff --git a/packages/coreutils/coreutils_5.0.bb b/packages/coreutils/coreutils_5.0.bb
deleted file mode 100644
index 74e27a8d70..0000000000
--- a/packages/coreutils/coreutils_5.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require coreutils.inc
-
-PR = "r1"
-
-SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \
-	   file://malloc.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-export EXTRA_OEMAKE="'SUBDIRS=lib src doc m4 po tests' MAKEFLAGS="
diff --git a/packages/coreutils/coreutils_5.1.1.bb b/packages/coreutils/coreutils_5.1.1.bb
deleted file mode 100644
index e8ae798691..0000000000
--- a/packages/coreutils/coreutils_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require coreutils.inc
-
-PR = "r1"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2"
diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb
deleted file mode 100644
index da9b214af5..0000000000
--- a/packages/coreutils/coreutils_5.1.3.bb
+++ /dev/null
@@ -1,81 +0,0 @@
-require coreutils.inc
-
-PR = "r8"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
-           file://install-cross.patch;patch=1;pnum=0 \
-           file://man.patch;patch=1 \
-	   file://rename-eaccess.patch;patch=1"
-
-# [ gets a special treatment and is not included in this
-bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
-		env expand expr factor fmt fold groups head hostid id install \
-		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 users vdir wc who whoami yes \
-		"
-
-# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \
-		     ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \
-		     true uname \
-		     "
-
-sbindir_progs= "chroot"
-
-do_install () {
-	autotools_do_install
-
-	# Renaming the utilities that should go in /usr/bin
-	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /bin (FHS)
-	install -d ${D}${base_bindir}
-	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
-	install -d ${D}${sbindir}
-	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
-
-	# [ requires special handling because [.coreutils will cause the sed stuff
-	# in update-alternatives to fail, therefore use lbracket - the name used
-	# for the actual source file.
-	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
-	# hostname and uptime separated. busybox's versions are preferred
-	mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
-	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-
-}
-
-pkg_postinst_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
-	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
-	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
-	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-}
-
-pkg_prerm_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The special cases
-	update-alternatives --remove hostname hostname.${PN}
-	update-alternatives --remove uptime uptime.${PN}
-	update-alternatives --remove '[' 'lbracket.${PN}'
-}
diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb
deleted file mode 100644
index 521038dbe1..0000000000
--- a/packages/coreutils/coreutils_5.3.0.bb
+++ /dev/null
@@ -1,83 +0,0 @@
-require coreutils.inc
-
-PR = "r4"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
-           file://install-cross.patch;patch=1;pnum=0 \
-           file://man.patch;patch=1 \
-           file://rename-tee-for-glibc2.5.patch;patch=1 \
-           file://uptime-pow-lib.patch;patch=1 \
-           file://futimens.patch;patch=1"
-
-# [ gets a special treatment and is not included in this
-bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
-		env expand expr factor fmt fold groups head hostid id install \
-		join link logname md5sum mkfifo 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 users vdir wc who whoami yes \
-		"
-
-# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd df echo false kill \
-		     ln ls mkdir mknod mv nice pwd rm rmdir sleep stty sync touch \
-		     true uname \
-		     "
-
-sbindir_progs= "chroot"
-
-do_install () {
-	autotools_do_install
-
-	# Renaming the utilities that should go in /usr/bin
-	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /bin (FHS)
-	install -d ${D}${base_bindir}
-	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
-	install -d ${D}${sbindir}
-	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
-
-	# [ requires special handling because [.coreutils will cause the sed stuff
-	# in update-alternatives to fail, therefore use lbracket - the name used
-	# for the actual source file.
-	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
-	# hostname and uptime separated. busybox's versions are preferred
-	mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
-	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-
-}
-
-pkg_postinst_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
-	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
-	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
-	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-}
-
-pkg_prerm_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The special cases
-	update-alternatives --remove hostname hostname.${PN}
-	update-alternatives --remove uptime uptime.${PN}
-	update-alternatives --remove '[' 'lbracket.${PN}'
-}
diff --git a/packages/coreutils/coreutils_6.0.bb b/packages/coreutils/coreutils_6.0.bb
index 02fc70efb5..4d4c049465 100644
--- a/packages/coreutils/coreutils_6.0.bb
+++ b/packages/coreutils/coreutils_6.0.bb
@@ -2,13 +2,13 @@ require coreutils.inc
 
 PR = "r2"
 
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
-           file://man.patch;patch=1 \
-	   file://oe-old-tools.patch;patch=1 \
-	   file://futimens.patch;patch=1 \
-	   file://onceonly.m4"
+SRC_URI = "\
+  ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
+  file://man.patch;patch=1 \
+  file://oe-old-tools.patch;patch=1 \
+  file://futimens.patch;patch=1 \
+  file://onceonly.m4 \
+"
 
 # [ gets a special treatment and is not included in this
 bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \