From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../coreutils-install-use-STRIP.patch | 29 +++++++ recipes/coreutils/coreutils-6.0/futimens.patch | 57 ++++++++++++++ recipes/coreutils/coreutils-6.0/man.patch | 42 ++++++++++ recipes/coreutils/coreutils-6.0/oe-old-tools.patch | 26 ++++++ recipes/coreutils/coreutils-6.0/onceonly.m4 | 63 +++++++++++++++ .../coreutils/coreutils-6.0/uptime-pow-lib.patch | 11 +++ .../coreutils/coreutils-7.1/automake-version.patch | 13 +++ recipes/coreutils/coreutils-7.1/man.patch | 47 +++++++++++ recipes/coreutils/coreutils-7.1/oe-old-tools.patch | 26 ++++++ recipes/coreutils/coreutils-7.1/onceonly.m4 | 63 +++++++++++++++ .../coreutils/coreutils-7.1/uptime-pow-lib.patch | 11 +++ recipes/coreutils/coreutils-native_6.0.bb | 5 ++ recipes/coreutils/coreutils-native_7.1.bb | 5 ++ recipes/coreutils/coreutils.inc | 8 ++ recipes/coreutils/coreutils_6.0.bb | 89 +++++++++++++++++++++ recipes/coreutils/coreutils_7.1.bb | 92 ++++++++++++++++++++++ 16 files changed, 587 insertions(+) create mode 100644 recipes/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch create mode 100644 recipes/coreutils/coreutils-6.0/futimens.patch create mode 100644 recipes/coreutils/coreutils-6.0/man.patch create mode 100644 recipes/coreutils/coreutils-6.0/oe-old-tools.patch create mode 100644 recipes/coreutils/coreutils-6.0/onceonly.m4 create mode 100644 recipes/coreutils/coreutils-6.0/uptime-pow-lib.patch create mode 100644 recipes/coreutils/coreutils-7.1/automake-version.patch create mode 100644 recipes/coreutils/coreutils-7.1/man.patch create mode 100644 recipes/coreutils/coreutils-7.1/oe-old-tools.patch create mode 100644 recipes/coreutils/coreutils-7.1/onceonly.m4 create mode 100644 recipes/coreutils/coreutils-7.1/uptime-pow-lib.patch create mode 100644 recipes/coreutils/coreutils-native_6.0.bb create mode 100644 recipes/coreutils/coreutils-native_7.1.bb create mode 100644 recipes/coreutils/coreutils.inc create mode 100644 recipes/coreutils/coreutils_6.0.bb create mode 100644 recipes/coreutils/coreutils_7.1.bb (limited to 'recipes/coreutils') diff --git a/recipes/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch b/recipes/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch new file mode 100644 index 0000000000..1af9fb97b6 --- /dev/null +++ b/recipes/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch @@ -0,0 +1,29 @@ +Index: coreutils-6.0/src/install.c +=================================================================== +--- coreutils-6.0.orig/src/install.c 2009-03-04 15:37:45.000000000 -0800 ++++ coreutils-6.0/src/install.c 2009-03-04 15:38:57.000000000 -0800 +@@ -526,7 +526,14 @@ + strip (char const *name) + { + 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) + { +@@ -534,7 +541,7 @@ + error (EXIT_FAILURE, errno, _("fork system call failed")); + break; + case 0: /* Child. */ +- execlp ("strip", "strip", name, NULL); ++ execlp (strip_name, "strip", name, NULL); + error (EXIT_FAILURE, errno, _("cannot run strip")); + break; + default: /* Parent. */ diff --git a/recipes/coreutils/coreutils-6.0/futimens.patch b/recipes/coreutils/coreutils-6.0/futimens.patch new file mode 100644 index 0000000000..b3089b1c05 --- /dev/null +++ b/recipes/coreutils/coreutils-6.0/futimens.patch @@ -0,0 +1,57 @@ +Index: coreutils-6.0/lib/utimens.c +=================================================================== +--- coreutils-6.0.orig/lib/utimens.c 2006-06-11 09:14:31.000000000 +0200 ++++ coreutils-6.0/lib/utimens.c 2008-12-04 13:36:46.000000000 +0100 +@@ -75,8 +75,8 @@ + Return 0 on success, -1 (setting errno) on failure. */ + + 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 +@@ -168,5 +168,5 @@ + int + utimens (char const *file, struct timespec const timespec[2]) + { +- return futimens (-1, file, timespec); ++ return gl_futimens (-1, file, timespec); + } +Index: coreutils-6.0/lib/utimens.h +=================================================================== +--- coreutils-6.0.orig/lib/utimens.h 2004-11-23 21:41:51.000000000 +0100 ++++ coreutils-6.0/lib/utimens.h 2008-12-04 13:36:46.000000000 +0100 +@@ -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-6.0/src/touch.c +=================================================================== +--- coreutils-6.0.orig/src/touch.c 2005-11-02 11:01:07.000000000 +0100 ++++ coreutils-6.0/src/touch.c 2008-12-04 13:37:43.000000000 +0100 +@@ -182,7 +182,7 @@ + t = timespec; + } + +- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); ++ ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); + + if (fd == STDIN_FILENO) + { +Index: coreutils-6.0/src/copy.c +=================================================================== +--- coreutils-6.0.orig/src/copy.c 2008-12-04 13:38:56.000000000 +0100 ++++ coreutils-6.0/src/copy.c 2008-12-04 13:39:01.000000000 +0100 +@@ -490,7 +490,7 @@ + timespec[0] = get_stat_atime (src_sb); + timespec[1] = get_stat_mtime (src_sb); + +- if (futimens (dest_desc, dst_name, timespec) != 0) ++ if (gl_futimens (dest_desc, dst_name, timespec) != 0) + { + error (0, errno, _("preserving times for %s"), quote (dst_name)); + if (x->require_preserve) diff --git a/recipes/coreutils/coreutils-6.0/man.patch b/recipes/coreutils/coreutils-6.0/man.patch new file mode 100644 index 0000000000..5060e4fdff --- /dev/null +++ b/recipes/coreutils/coreutils-6.0/man.patch @@ -0,0 +1,42 @@ + +# +# 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/recipes/coreutils/coreutils-6.0/oe-old-tools.patch b/recipes/coreutils/coreutils-6.0/oe-old-tools.patch new file mode 100644 index 0000000000..495da36cf7 --- /dev/null +++ b/recipes/coreutils/coreutils-6.0/oe-old-tools.patch @@ -0,0 +1,26 @@ +Index: coreutils-6.0/configure.ac +=================================================================== +--- coreutils-6.0.orig/configure.ac 2007-04-02 11:21:27.000000000 +0200 ++++ coreutils-6.0/configure.ac 2007-04-02 11:21:36.000000000 +0200 +@@ -26,7 +26,7 @@ + AC_CONFIG_HEADERS([config.h:config.hin]) + + AB_INIT() +-AM_INIT_AUTOMAKE([1.9.6 gnits dist-bzip2]) ++AM_INIT_AUTOMAKE([1.9.3 gnits dist-bzip2]) + + gl_DEFAULT_POSIX2_VERSION + gl_USE_SYSTEM_EXTENSIONS +Index: coreutils-6.0/m4/jm-macros.m4 +=================================================================== +--- coreutils-6.0.orig/m4/jm-macros.m4 2007-04-02 11:21:54.000000000 +0200 ++++ coreutils-6.0/m4/jm-macros.m4 2007-04-02 11:22:02.000000000 +0200 +@@ -23,7 +23,7 @@ + + AC_DEFUN([gl_MACROS], + [ +- AC_PREREQ(2.60) ++ AC_PREREQ(2.59) + + GNU_PACKAGE="GNU $PACKAGE" + AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE", diff --git a/recipes/coreutils/coreutils-6.0/onceonly.m4 b/recipes/coreutils/coreutils-6.0/onceonly.m4 new file mode 100644 index 0000000000..f6fec37cbf --- /dev/null +++ b/recipes/coreutils/coreutils-6.0/onceonly.m4 @@ -0,0 +1,63 @@ +# onceonly.m4 serial 3 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl This file defines some "once only" variants of standard autoconf macros. +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC +dnl The advantage is that the check for each of the headers/functions/decls +dnl will be put only once into the 'configure' file. It keeps the size of +dnl the 'configure' file down, and avoids redundant output when 'configure' +dnl is run. +dnl The drawback is that the checks cannot be conditionalized. If you write +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to +dnl empty, and the check will be inserted before the body of the AC_DEFUNed +dnl function. + +dnl Autoconf version 2.57 or newer is recommended. +AC_PREREQ(2.54) + +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ + : + AC_FOREACH([gl_HEADER_NAME], [$1], [ + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]), + [-./], [___])), [ + AC_CHECK_HEADERS(gl_HEADER_NAME) + ]) + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, + [-./], [___]))) + ]) +]) + +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ + : + AC_FOREACH([gl_FUNC_NAME], [$1], [ + AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [ + AC_CHECK_FUNCS(defn([gl_FUNC_NAME])) + ]) + AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME])) + ]) +]) + +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of +# AC_CHECK_DECLS(DECL1, DECL2, ...). +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ + : + AC_FOREACH([gl_DECL_NAME], [$1], [ + AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [ + AC_CHECK_DECLS(defn([gl_DECL_NAME])) + ]) + AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME])) + ]) +]) diff --git a/recipes/coreutils/coreutils-6.0/uptime-pow-lib.patch b/recipes/coreutils/coreutils-6.0/uptime-pow-lib.patch new file mode 100644 index 0000000000..5eb3fca676 --- /dev/null +++ b/recipes/coreutils/coreutils-6.0/uptime-pow-lib.patch @@ -0,0 +1,11 @@ +--- 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/recipes/coreutils/coreutils-7.1/automake-version.patch b/recipes/coreutils/coreutils-7.1/automake-version.patch new file mode 100644 index 0000000000..497ef15385 --- /dev/null +++ b/recipes/coreutils/coreutils-7.1/automake-version.patch @@ -0,0 +1,13 @@ +Index: coreutils-7.1/configure.ac +=================================================================== +--- coreutils-7.1.orig/configure.ac ++++ coreutils-7.1/configure.ac +@@ -32,7 +32,7 @@ + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) + +-AM_INIT_AUTOMAKE([1.10a dist-xz]) ++AM_INIT_AUTOMAKE([1.10.2]) + + AC_PROG_CC_STDC + AM_PROG_CC_C_O diff --git a/recipes/coreutils/coreutils-7.1/man.patch b/recipes/coreutils/coreutils-7.1/man.patch new file mode 100644 index 0000000000..3de7c01b0b --- /dev/null +++ b/recipes/coreutils/coreutils-7.1/man.patch @@ -0,0 +1,47 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: coreutils-7.1/configure.ac +=================================================================== +--- coreutils-7.1.orig/configure.ac ++++ coreutils-7.1/configure.ac +@@ -373,6 +373,20 @@ + # For a test of uniq: it uses the $LOCALE_FR envvar. + gt_LOCALE_FR + ++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 +Index: coreutils-7.1/Makefile.am +=================================================================== +--- coreutils-7.1.orig/Makefile.am ++++ coreutils-7.1/Makefile.am +@@ -15,7 +15,12 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + ++if ENABLE_MANPAGES + SUBDIRS = lib src doc man po tests gnulib-tests ++else ++SUBDIRS = lib src doc po tests gnulib-tests ++endif ++ + EXTRA_DIST = cfg.mk maint.mk \ + .prev-version THANKS-to-translators THANKStt.in \ + .version \ diff --git a/recipes/coreutils/coreutils-7.1/oe-old-tools.patch b/recipes/coreutils/coreutils-7.1/oe-old-tools.patch new file mode 100644 index 0000000000..495da36cf7 --- /dev/null +++ b/recipes/coreutils/coreutils-7.1/oe-old-tools.patch @@ -0,0 +1,26 @@ +Index: coreutils-6.0/configure.ac +=================================================================== +--- coreutils-6.0.orig/configure.ac 2007-04-02 11:21:27.000000000 +0200 ++++ coreutils-6.0/configure.ac 2007-04-02 11:21:36.000000000 +0200 +@@ -26,7 +26,7 @@ + AC_CONFIG_HEADERS([config.h:config.hin]) + + AB_INIT() +-AM_INIT_AUTOMAKE([1.9.6 gnits dist-bzip2]) ++AM_INIT_AUTOMAKE([1.9.3 gnits dist-bzip2]) + + gl_DEFAULT_POSIX2_VERSION + gl_USE_SYSTEM_EXTENSIONS +Index: coreutils-6.0/m4/jm-macros.m4 +=================================================================== +--- coreutils-6.0.orig/m4/jm-macros.m4 2007-04-02 11:21:54.000000000 +0200 ++++ coreutils-6.0/m4/jm-macros.m4 2007-04-02 11:22:02.000000000 +0200 +@@ -23,7 +23,7 @@ + + AC_DEFUN([gl_MACROS], + [ +- AC_PREREQ(2.60) ++ AC_PREREQ(2.59) + + GNU_PACKAGE="GNU $PACKAGE" + AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE", diff --git a/recipes/coreutils/coreutils-7.1/onceonly.m4 b/recipes/coreutils/coreutils-7.1/onceonly.m4 new file mode 100644 index 0000000000..f6fec37cbf --- /dev/null +++ b/recipes/coreutils/coreutils-7.1/onceonly.m4 @@ -0,0 +1,63 @@ +# onceonly.m4 serial 3 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl This file defines some "once only" variants of standard autoconf macros. +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC +dnl The advantage is that the check for each of the headers/functions/decls +dnl will be put only once into the 'configure' file. It keeps the size of +dnl the 'configure' file down, and avoids redundant output when 'configure' +dnl is run. +dnl The drawback is that the checks cannot be conditionalized. If you write +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to +dnl empty, and the check will be inserted before the body of the AC_DEFUNed +dnl function. + +dnl Autoconf version 2.57 or newer is recommended. +AC_PREREQ(2.54) + +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ + : + AC_FOREACH([gl_HEADER_NAME], [$1], [ + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]), + [-./], [___])), [ + AC_CHECK_HEADERS(gl_HEADER_NAME) + ]) + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, + [-./], [___]))) + ]) +]) + +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ + : + AC_FOREACH([gl_FUNC_NAME], [$1], [ + AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [ + AC_CHECK_FUNCS(defn([gl_FUNC_NAME])) + ]) + AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME])) + ]) +]) + +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of +# AC_CHECK_DECLS(DECL1, DECL2, ...). +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ + : + AC_FOREACH([gl_DECL_NAME], [$1], [ + AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [ + AC_CHECK_DECLS(defn([gl_DECL_NAME])) + ]) + AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME])) + ]) +]) diff --git a/recipes/coreutils/coreutils-7.1/uptime-pow-lib.patch b/recipes/coreutils/coreutils-7.1/uptime-pow-lib.patch new file mode 100644 index 0000000000..5eb3fca676 --- /dev/null +++ b/recipes/coreutils/coreutils-7.1/uptime-pow-lib.patch @@ -0,0 +1,11 @@ +--- 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/recipes/coreutils/coreutils-native_6.0.bb b/recipes/coreutils/coreutils-native_6.0.bb new file mode 100644 index 0000000000..057dfa6d80 --- /dev/null +++ b/recipes/coreutils/coreutils-native_6.0.bb @@ -0,0 +1,5 @@ +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/recipes/coreutils/coreutils-native_7.1.bb b/recipes/coreutils/coreutils-native_7.1.bb new file mode 100644 index 0000000000..057dfa6d80 --- /dev/null +++ b/recipes/coreutils/coreutils-native_7.1.bb @@ -0,0 +1,5 @@ +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/recipes/coreutils/coreutils.inc b/recipes/coreutils/coreutils.inc new file mode 100644 index 0000000000..38dbd1d4f2 --- /dev/null +++ b/recipes/coreutils/coreutils.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "A collection of core GNU utilities." +HOMEPAGE = "http://www.gnu.org/software/coreutils" +LICENSE = "GPL" +SECTION = "base" +RREPLACES = "textutils shellutils fileutils" +RPROVIDES = "textutils shellutils fileutils" + +inherit autotools diff --git a/recipes/coreutils/coreutils_6.0.bb b/recipes/coreutils/coreutils_6.0.bb new file mode 100644 index 0000000000..d0d082bc63 --- /dev/null +++ b/recipes/coreutils/coreutils_6.0.bb @@ -0,0 +1,89 @@ +require coreutils.inc + +PR = "r3" + +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://coreutils-install-use-STRIP.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 \ + 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_configure_prepend() { + install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 +} + +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/recipes/coreutils/coreutils_7.1.bb b/recipes/coreutils/coreutils_7.1.bb new file mode 100644 index 0000000000..6488e11a79 --- /dev/null +++ b/recipes/coreutils/coreutils_7.1.bb @@ -0,0 +1,92 @@ +require coreutils.inc +PR = "r0" + +# not thoroughly testes yet +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "\ + ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \ + file://automake-version.patch;patch=1 \ + file://man.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 \ + 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_configure_prepend() { + install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 +} + +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 + if [ -e ${D}${bindir}/hostname ]; then + mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} + fi + if [ -e ${D}${bindir}/uptime ]; then + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + fi +} + +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}' +} -- cgit v1.2.3