diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-08-20 11:36:51 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-08-20 11:36:51 +0000 |
commit | 8ee1c79284959a44faa0e745e11666700fc12601 (patch) | |
tree | 338e24bc81f4e2bae324d6934039a0f89a0dbf85 | |
parent | 3fd04e8655a349dec8d20ca15b7773961bc2c871 (diff) | |
download | poky-8ee1c79284959a44faa0e745e11666700fc12601.tar.gz |
coreutils: dropped 5.1.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2520 311d38ba-8fff-0310-9ca6-ca027cbcb966
5 files changed, 0 insertions, 201 deletions
diff --git a/meta/packages/coreutils/coreutils-5.1.3/install-cross.patch b/meta/packages/coreutils/coreutils-5.1.3/install-cross.patch deleted file mode 100644 index 98ba3d916c..0000000000 --- a/meta/packages/coreutils/coreutils-5.1.3/install-cross.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | --- src/install.c~ 2003-08-09 18:46:45.000000000 +0100 | ||
2 | +++ src/install.c 2004-03-27 18:38:45.000000000 +0000 | ||
3 | @@ -516,7 +516,14 @@ | ||
4 | strip (const char *path) | ||
5 | { | ||
6 | int status; | ||
7 | - pid_t pid = fork (); | ||
8 | + pid_t pid; | ||
9 | + char *strip_name; | ||
10 | + | ||
11 | + strip_name = getenv ("STRIP"); | ||
12 | + if (strip_name == NULL) | ||
13 | + strip_name = "strip"; | ||
14 | + | ||
15 | + pid = fork (); | ||
16 | |||
17 | switch (pid) | ||
18 | { | ||
19 | @@ -524,7 +531,7 @@ | ||
20 | error (EXIT_FAILURE, errno, _("fork system call failed")); | ||
21 | break; | ||
22 | case 0: /* Child. */ | ||
23 | - execlp ("strip", "strip", path, NULL); | ||
24 | + execlp (strip_name, "strip", path, NULL); | ||
25 | error (EXIT_FAILURE, errno, _("cannot run strip")); | ||
26 | break; | ||
27 | default: /* Parent. */ | ||
diff --git a/meta/packages/coreutils/coreutils-5.1.3/man.patch b/meta/packages/coreutils/coreutils-5.1.3/man.patch deleted file mode 100644 index b067c380e2..0000000000 --- a/meta/packages/coreutils/coreutils-5.1.3/man.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- coreutils-5.1.3/configure.ac~man 2004-01-25 16:57:15.000000000 -0600 | ||
7 | +++ coreutils-5.1.3/configure.ac 2004-06-29 14:22:10.000000000 -0500 | ||
8 | @@ -232,6 +232,20 @@ | ||
9 | AM_GNU_GETTEXT([external], [need-ngettext]) | ||
10 | AM_GNU_GETTEXT_VERSION(0.13.1) | ||
11 | |||
12 | +AC_MSG_CHECKING([whether to build man pages]) | ||
13 | +AC_ARG_WITH(manpages, | ||
14 | + AS_HELP_STRING([--with-manpages], | ||
15 | + [Enable building of manpages (default=yes)]), | ||
16 | + [cu_cv_build_manpages=$enableval], | ||
17 | + [cu_cv_build_manpages=yes]) | ||
18 | +# help2man doesn't work when crosscompiling, as it needs to run the | ||
19 | +# binary that was built. | ||
20 | +if test x"$cross_compiling" = x"yes"; then | ||
21 | + cu_cv_build_manpages=no | ||
22 | +fi | ||
23 | +AC_MSG_RESULT($cu_cv_build_manpages) | ||
24 | +AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes") | ||
25 | + | ||
26 | AC_CONFIG_FILES( | ||
27 | Makefile | ||
28 | doc/Makefile | ||
29 | --- coreutils-5.1.3/Makefile.am~man 2003-11-09 14:23:02.000000000 -0600 | ||
30 | +++ coreutils-5.1.3/Makefile.am 2004-06-29 14:18:14.000000000 -0500 | ||
31 | @@ -1,6 +1,11 @@ | ||
32 | ## Process this file with automake to produce Makefile.in -*-Makefile-*- | ||
33 | |||
34 | +if ENABLE_MANPAGES | ||
35 | SUBDIRS = lib src doc man m4 po tests | ||
36 | +else | ||
37 | +SUBDIRS = lib src doc m4 po tests | ||
38 | +endif | ||
39 | + | ||
40 | EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \ | ||
41 | .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \ | ||
42 | .x-sc_space_tab .x-sc_sun_os_names \ | ||
diff --git a/meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch b/meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch deleted file mode 100644 index cde2731477..0000000000 --- a/meta/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | # On Ubuntu edgy (and perhaps other distributions), eaccess is provided by | ||
2 | # unistd.h - This renames the function so as not to conflict. | ||
3 | |||
4 | --- coreutils-5.1.3/src/test.c.old 2006-08-17 15:29:41.000000000 +0100 | ||
5 | +++ coreutils-5.1.3/src/test.c 2006-08-17 15:30:44.000000000 +0100 | ||
6 | @@ -125,7 +125,7 @@ | ||
7 | /* Do the same thing access(2) does, but use the effective uid and gid. */ | ||
8 | |||
9 | static int | ||
10 | -eaccess (char const *file, int mode) | ||
11 | +_eaccess (char const *file, int mode) | ||
12 | { | ||
13 | static int have_ids; | ||
14 | static uid_t uid, euid; | ||
15 | @@ -158,7 +158,7 @@ | ||
16 | return result; | ||
17 | } | ||
18 | #else | ||
19 | -# define eaccess(F, M) euidaccess (F, M) | ||
20 | +# define _eaccess(F, M) euidaccess (F, M) | ||
21 | #endif | ||
22 | |||
23 | /* Increment our position in the argument list. Check that we're not | ||
24 | @@ -623,17 +623,17 @@ | ||
25 | |||
26 | case 'r': /* file is readable? */ | ||
27 | unary_advance (); | ||
28 | - value = -1 != eaccess (argv[pos - 1], R_OK); | ||
29 | + value = -1 != _eaccess (argv[pos - 1], R_OK); | ||
30 | return (TRUE == value); | ||
31 | |||
32 | case 'w': /* File is writable? */ | ||
33 | unary_advance (); | ||
34 | - value = -1 != eaccess (argv[pos - 1], W_OK); | ||
35 | + value = -1 != _eaccess (argv[pos - 1], W_OK); | ||
36 | return (TRUE == value); | ||
37 | |||
38 | case 'x': /* File is executable? */ | ||
39 | unary_advance (); | ||
40 | - value = -1 != eaccess (argv[pos - 1], X_OK); | ||
41 | + value = -1 != _eaccess (argv[pos - 1], X_OK); | ||
42 | return (TRUE == value); | ||
43 | |||
44 | case 'O': /* File is owned by you? */ | ||
diff --git a/meta/packages/coreutils/coreutils-native_5.1.3.bb b/meta/packages/coreutils/coreutils-native_5.1.3.bb deleted file mode 100644 index ee90981895..0000000000 --- a/meta/packages/coreutils/coreutils-native_5.1.3.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | SECTION = "base" | ||
2 | |||
3 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" | ||
4 | S = "${WORKDIR}/coreutils-${PV}" | ||
5 | |||
6 | require coreutils_${PV}.bb | ||
7 | inherit native | ||
diff --git a/meta/packages/coreutils/coreutils_5.1.3.bb b/meta/packages/coreutils/coreutils_5.1.3.bb deleted file mode 100644 index da9b214af5..0000000000 --- a/meta/packages/coreutils/coreutils_5.1.3.bb +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | require coreutils.inc | ||
2 | |||
3 | PR = "r8" | ||
4 | |||
5 | SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ | ||
6 | file://install-cross.patch;patch=1;pnum=0 \ | ||
7 | file://man.patch;patch=1 \ | ||
8 | file://rename-eaccess.patch;patch=1" | ||
9 | |||
10 | # [ gets a special treatment and is not included in this | ||
11 | bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ | ||
12 | env expand expr factor fmt fold groups head hostid id install \ | ||
13 | join link logname md5sum mkfifo nice nl nohup od paste pathchk \ | ||
14 | pinky pr printenv printf ptx readlink seq sha1sum shred sort \ | ||
15 | split stat sum tac tail tee test tr tsort tty unexpand uniq \ | ||
16 | unlink users vdir wc who whoami yes \ | ||
17 | " | ||
18 | |||
19 | # hostname gets a special treatment and is not included in this | ||
20 | base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ | ||
21 | ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ | ||
22 | true uname \ | ||
23 | " | ||
24 | |||
25 | sbindir_progs= "chroot" | ||
26 | |||
27 | do_install () { | ||
28 | autotools_do_install | ||
29 | |||
30 | # Renaming the utilities that should go in /usr/bin | ||
31 | for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done | ||
32 | |||
33 | # Renaming and moving the utilities that should go in /bin (FHS) | ||
34 | install -d ${D}${base_bindir} | ||
35 | for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done | ||
36 | |||
37 | # Renaming and moving the utilities that should go in /usr/sbin (FHS) | ||
38 | install -d ${D}${sbindir} | ||
39 | for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done | ||
40 | |||
41 | # [ requires special handling because [.coreutils will cause the sed stuff | ||
42 | # in update-alternatives to fail, therefore use lbracket - the name used | ||
43 | # for the actual source file. | ||
44 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} | ||
45 | # hostname and uptime separated. busybox's versions are preferred | ||
46 | mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} | ||
47 | mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} | ||
48 | |||
49 | } | ||
50 | |||
51 | pkg_postinst_${PN} () { | ||
52 | # The utilities in /usr/bin | ||
53 | for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done | ||
54 | |||
55 | # The utilities in /bin | ||
56 | for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done | ||
57 | |||
58 | # The utilities in /usr/sbin | ||
59 | for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done | ||
60 | |||
61 | # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. | ||
62 | update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 | ||
63 | update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 | ||
64 | update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 | ||
65 | } | ||
66 | |||
67 | pkg_prerm_${PN} () { | ||
68 | # The utilities in /usr/bin | ||
69 | for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done | ||
70 | |||
71 | # The utilities in /bin | ||
72 | for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done | ||
73 | |||
74 | # The utilities in /usr/sbin | ||
75 | for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done | ||
76 | |||
77 | # The special cases | ||
78 | update-alternatives --remove hostname hostname.${PN} | ||
79 | update-alternatives --remove uptime uptime.${PN} | ||
80 | update-alternatives --remove '[' 'lbracket.${PN}' | ||
81 | } | ||