* [STABLE][PATCH 1/6] coreutils: add version 7.2
2009-10-28 10:45 [STABLE] some updates from my queue Marcin Juszkiewicz
@ 2009-10-28 10:45 ` Marcin Juszkiewicz
2009-10-31 7:53 ` Denys Dmytriyenko
2009-10-28 10:45 ` [STABLE][PATCH 2/6] coreutils-native: remove autotools and quilt dependencies Marcin Juszkiewicz
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2009-10-28 10:45 UTC (permalink / raw)
To: openembedded-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 14930 bytes --]
From: Roman I Khimov <khimov@altell.ru>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
.../coreutils/coreutils-7.2/automake-version.patch | 13 +++
.../coreutils-7.2-fix-sort-segfault.patch | 103 ++++++++++++++++++++
recipes/coreutils/coreutils-7.2/man.patch | 47 +++++++++
recipes/coreutils/coreutils-7.2/onceonly.m4 | 63 ++++++++++++
recipes/coreutils/coreutils-native_7.2.bb | 5 +
recipes/coreutils/coreutils_7.2.bb | 89 +++++++++++++++++
6 files changed, 320 insertions(+), 0 deletions(-)
create mode 100644 recipes/coreutils/coreutils-7.2/automake-version.patch
create mode 100644 recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch
create mode 100644 recipes/coreutils/coreutils-7.2/man.patch
create mode 100644 recipes/coreutils/coreutils-7.2/onceonly.m4
create mode 100644 recipes/coreutils/coreutils-native_7.2.bb
create mode 100644 recipes/coreutils/coreutils_7.2.bb
diff --git a/recipes/coreutils/coreutils-7.2/automake-version.patch b/recipes/coreutils/coreutils-7.2/automake-version.patch
new file mode 100644
index 0000000..497ef15
--- /dev/null
+++ b/recipes/coreutils/coreutils-7.2/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.2/coreutils-7.2-fix-sort-segfault.patch b/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch
new file mode 100644
index 0000000..b4ee5b8
--- /dev/null
+++ b/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch
@@ -0,0 +1,103 @@
+OE modifications to the original patch:
+ * Removed NEWS hunk to apply on vanilla 7.2 coreutils
+
+>From 570beb56f58bb087a614af885bec7e9cf6b19423 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Wed, 22 Apr 2009 08:45:27 +0200
+Subject: [PATCH] sort -m: don't segfault when output file is also an input =
+file
+
+* src/sort.c (avoid_trashing_input): Fix an off-by-one error and
+guard the use of memmove.
+* NEWS (Bug fixes): Mention it.
+* tests/misc/sort: Add tests to exercise the offending code.
+* THANKS: Update.
+Reported by Otavio Salvador in http://bugs.debian.org/525048.
+---
+ NEWS | 6 +++++-
+ THANKS | 1 +
+ src/sort.c | 10 ++++++----
+ tests/misc/sort | 17 ++++++++++++++++-
+ 4 files changed, 28 insertions(+), 6 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index fe523fe..876a6b6 100644
+--- a/THANKS
++++ b/THANKS
+@@ -435,6 +435,7 @@ Ole Laursen olau@hardworking.dk
+ Oliver Kiddle okiddle@yahoo.co.uk
+ Ørn E. Hansen oehansen@daimi.aau.dk
+ Oskar Liljeblad osk@hem.passagen.se
++Otavio Salvador otavio@ossystems.com.br
+ Pádraig Brady P@draigBrady.com
+ Patrick Mauritz oxygene@studentenbude.ath.cx
+ Paul D. Smith psmith@gnu.org
+diff --git a/src/sort.c b/src/sort.c
+index 2e6ce87..f48d727 100644
+--- a/src/sort.c
++++ b/src/sort.c
+@@ -1,5 +1,5 @@
+ /* sort - sort lines of text (with all kinds of options).
+- Copyright (C) 1988, 1991-2008 Free Software Foundation, Inc.
++ Copyright (C) 1988, 1991-2009 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -2602,18 +2602,20 @@ avoid_trashing_input (struct sortfile *files, size_t ntemps,
+ pid_t pid;
+ char *temp = create_temp (&tftp, &pid);
+ size_t num_merged = 0;
+- while (i + num_merged < nfiles)
++ do
+ {
+ num_merged += mergefiles (&files[i], 0, nfiles - i, tftp, temp);
+ files[i].name = temp;
+ files[i].pid = pid;
+
+- memmove(&files[i], &files[i + num_merged],
+- num_merged * sizeof *files);
++ if (i + num_merged < nfiles)
++ memmove(&files[i + 1], &files[i + num_merged],
++ num_merged * sizeof *files);
+ ntemps += 1;
+ nfiles -= num_merged - 1;;
+ i += num_merged;
+ }
++ while (i < nfiles);
+ }
+ }
+
+diff --git a/tests/misc/sort b/tests/misc/sort
+index 4f377df..a27f47a 100755
+--- a/tests/misc/sort
++++ b/tests/misc/sort
+@@ -1,6 +1,6 @@
+ #!/usr/bin/perl
+
+-# Copyright (C) 2008 Free Software Foundation, Inc.
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -339,6 +339,21 @@ my @Tests =
+ ["sort-numeric", '--sort=numeric', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}],
+ ["sort-gennum", '--sort=general-numeric',
+ {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}],
++
++# -m with output file also used as an input file
++# In coreutils-7.2, this caused a segfault.
++# This test looks a little strange. Here's why:
++# since we're using "-o f", standard output will be empty, hence OUT=>''
++# We still want to ensure that the output file, "f" has expected contents,
++# hence the added CMP=> directive.
++["output-is-input", '-m -o f', {IN=> {f=> "a\n"}}, {OUT=>''},
++ {CMP=> ["a\n", {'f'=> undef}]} ],
++["output-is-input-2", '-m -o f', {OUT=>''},
++ {IN=> {f=> "a\n"}}, {IN=> {g=> "b\n"}}, {IN=> {h=> "c\n"}},
++ {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ],
++["output-is-input-3", '-m -o f', {OUT=>''},
++ {IN=> {g=> "a\n"}}, {IN=> {h=> "b\n"}}, {IN=> {f=> "c\n"}},
++ {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ],
+ );
+
+ # Add _POSIX2_VERSION=199209 to the environment of each test
diff --git a/recipes/coreutils/coreutils-7.2/man.patch b/recipes/coreutils/coreutils-7.2/man.patch
new file mode 100644
index 0000000..3de7c01
--- /dev/null
+++ b/recipes/coreutils/coreutils-7.2/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 <http://www.gnu.org/licenses/>.
+
++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.2/onceonly.m4 b/recipes/coreutils/coreutils-7.2/onceonly.m4
new file mode 100644
index 0000000..f6fec37
--- /dev/null
+++ b/recipes/coreutils/coreutils-7.2/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-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb
new file mode 100644
index 0000000..057dfa6
--- /dev/null
+++ b/recipes/coreutils/coreutils-native_7.2.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_7.2.bb b/recipes/coreutils/coreutils_7.2.bb
new file mode 100644
index 0000000..f80921a
--- /dev/null
+++ b/recipes/coreutils/coreutils_7.2.bb
@@ -0,0 +1,89 @@
+require coreutils.inc
+
+SRC_URI = "\
+ ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
+ file://automake-version.patch;patch=1 \
+ file://man.patch;patch=1 \
+ file://coreutils-7.2-fix-sort-segfault.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}'
+}
--
1.6.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [STABLE][PATCH 1/6] coreutils: add version 7.2
2009-10-28 10:45 ` [STABLE][PATCH 1/6] coreutils: add version 7.2 Marcin Juszkiewicz
@ 2009-10-31 7:53 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2009-10-31 7:53 UTC (permalink / raw)
To: openembedded-devel
On Wed, Oct 28, 2009 at 11:45:53AM +0100, Marcin Juszkiewicz wrote:
> From: Roman I Khimov <khimov@altell.ru>
>
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> .../coreutils/coreutils-7.2/automake-version.patch | 13 +++
> .../coreutils-7.2-fix-sort-segfault.patch | 103 ++++++++++++++++++++
> recipes/coreutils/coreutils-7.2/man.patch | 47 +++++++++
> recipes/coreutils/coreutils-7.2/onceonly.m4 | 63 ++++++++++++
> recipes/coreutils/coreutils-native_7.2.bb | 5 +
> recipes/coreutils/coreutils_7.2.bb | 89 +++++++++++++++++
> 6 files changed, 320 insertions(+), 0 deletions(-)
> create mode 100644 recipes/coreutils/coreutils-7.2/automake-version.patch
> create mode 100644 recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch
> create mode 100644 recipes/coreutils/coreutils-7.2/man.patch
> create mode 100644 recipes/coreutils/coreutils-7.2/onceonly.m4
> create mode 100644 recipes/coreutils/coreutils-native_7.2.bb
> create mode 100644 recipes/coreutils/coreutils_7.2.bb
>
> diff --git a/recipes/coreutils/coreutils-7.2/automake-version.patch b/recipes/coreutils/coreutils-7.2/automake-version.patch
> new file mode 100644
> index 0000000..497ef15
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-7.2/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.2/coreutils-7.2-fix-sort-segfault.patch b/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch
> new file mode 100644
> index 0000000..b4ee5b8
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch
> @@ -0,0 +1,103 @@
> +OE modifications to the original patch:
> + * Removed NEWS hunk to apply on vanilla 7.2 coreutils
> +
> +>From 570beb56f58bb087a614af885bec7e9cf6b19423 Mon Sep 17 00:00:00 2001
> +From: Jim Meyering <meyering@redhat.com>
> +Date: Wed, 22 Apr 2009 08:45:27 +0200
> +Subject: [PATCH] sort -m: don't segfault when output file is also an input =
> +file
> +
> +* src/sort.c (avoid_trashing_input): Fix an off-by-one error and
> +guard the use of memmove.
> +* NEWS (Bug fixes): Mention it.
> +* tests/misc/sort: Add tests to exercise the offending code.
> +* THANKS: Update.
> +Reported by Otavio Salvador in http://bugs.debian.org/525048.
> +---
> + NEWS | 6 +++++-
> + THANKS | 1 +
> + src/sort.c | 10 ++++++----
> + tests/misc/sort | 17 ++++++++++++++++-
> + 4 files changed, 28 insertions(+), 6 deletions(-)
> +
> +diff --git a/THANKS b/THANKS
> +index fe523fe..876a6b6 100644
> +--- a/THANKS
> ++++ b/THANKS
> +@@ -435,6 +435,7 @@ Ole Laursen olau@hardworking.dk
> + Oliver Kiddle okiddle@yahoo.co.uk
> + ??rn E. Hansen oehansen@daimi.aau.dk
> + Oskar Liljeblad osk@hem.passagen.se
> ++Otavio Salvador otavio@ossystems.com.br
> + P??draig Brady P@draigBrady.com
> + Patrick Mauritz oxygene@studentenbude.ath.cx
> + Paul D. Smith psmith@gnu.org
> +diff --git a/src/sort.c b/src/sort.c
> +index 2e6ce87..f48d727 100644
> +--- a/src/sort.c
> ++++ b/src/sort.c
> +@@ -1,5 +1,5 @@
> + /* sort - sort lines of text (with all kinds of options).
> +- Copyright (C) 1988, 1991-2008 Free Software Foundation, Inc.
> ++ Copyright (C) 1988, 1991-2009 Free Software Foundation, Inc.
> +
> + This program is free software: you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> +@@ -2602,18 +2602,20 @@ avoid_trashing_input (struct sortfile *files, size_t ntemps,
> + pid_t pid;
> + char *temp = create_temp (&tftp, &pid);
> + size_t num_merged = 0;
> +- while (i + num_merged < nfiles)
> ++ do
> + {
> + num_merged += mergefiles (&files[i], 0, nfiles - i, tftp, temp);
> + files[i].name = temp;
> + files[i].pid = pid;
> +
> +- memmove(&files[i], &files[i + num_merged],
> +- num_merged * sizeof *files);
> ++ if (i + num_merged < nfiles)
> ++ memmove(&files[i + 1], &files[i + num_merged],
> ++ num_merged * sizeof *files);
> + ntemps += 1;
> + nfiles -= num_merged - 1;;
> + i += num_merged;
> + }
> ++ while (i < nfiles);
> + }
> + }
> +
> +diff --git a/tests/misc/sort b/tests/misc/sort
> +index 4f377df..a27f47a 100755
> +--- a/tests/misc/sort
> ++++ b/tests/misc/sort
> +@@ -1,6 +1,6 @@
> + #!/usr/bin/perl
> +
> +-# Copyright (C) 2008 Free Software Foundation, Inc.
> ++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
> +
> + # This program is free software: you can redistribute it and/or modify
> + # it under the terms of the GNU General Public License as published by
> +@@ -339,6 +339,21 @@ my @Tests =
> + ["sort-numeric", '--sort=numeric', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}],
> + ["sort-gennum", '--sort=general-numeric',
> + {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}],
> ++
> ++# -m with output file also used as an input file
> ++# In coreutils-7.2, this caused a segfault.
> ++# This test looks a little strange. Here's why:
> ++# since we're using "-o f", standard output will be empty, hence OUT=>''
> ++# We still want to ensure that the output file, "f" has expected contents,
> ++# hence the added CMP=> directive.
> ++["output-is-input", '-m -o f', {IN=> {f=> "a\n"}}, {OUT=>''},
> ++ {CMP=> ["a\n", {'f'=> undef}]} ],
> ++["output-is-input-2", '-m -o f', {OUT=>''},
> ++ {IN=> {f=> "a\n"}}, {IN=> {g=> "b\n"}}, {IN=> {h=> "c\n"}},
> ++ {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ],
> ++["output-is-input-3", '-m -o f', {OUT=>''},
> ++ {IN=> {g=> "a\n"}}, {IN=> {h=> "b\n"}}, {IN=> {f=> "c\n"}},
> ++ {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ],
> + );
> +
> + # Add _POSIX2_VERSION=199209 to the environment of each test
> diff --git a/recipes/coreutils/coreutils-7.2/man.patch b/recipes/coreutils/coreutils-7.2/man.patch
> new file mode 100644
> index 0000000..3de7c01
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-7.2/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 <http://www.gnu.org/licenses/>.
> +
> ++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.2/onceonly.m4 b/recipes/coreutils/coreutils-7.2/onceonly.m4
> new file mode 100644
> index 0000000..f6fec37
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-7.2/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-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb
> new file mode 100644
> index 0000000..057dfa6
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-native_7.2.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_7.2.bb b/recipes/coreutils/coreutils_7.2.bb
> new file mode 100644
> index 0000000..f80921a
> --- /dev/null
> +++ b/recipes/coreutils/coreutils_7.2.bb
> @@ -0,0 +1,89 @@
> +require coreutils.inc
> +
> +SRC_URI = "\
> + ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
> + file://automake-version.patch;patch=1 \
> + file://man.patch;patch=1 \
> + file://coreutils-7.2-fix-sort-segfault.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}'
> +}
> --
> 1.6.5
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [STABLE][PATCH 2/6] coreutils-native: remove autotools and quilt dependencies
2009-10-28 10:45 [STABLE] some updates from my queue Marcin Juszkiewicz
2009-10-28 10:45 ` [STABLE][PATCH 1/6] coreutils: add version 7.2 Marcin Juszkiewicz
@ 2009-10-28 10:45 ` Marcin Juszkiewicz
2009-10-31 7:54 ` Denys Dmytriyenko
2009-10-28 10:45 ` [STABLE][PATCH 3/6] coreutils-native: make mandatory dep for all packages Marcin Juszkiewicz
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2009-10-28 10:45 UTC (permalink / raw)
To: openembedded-devel
From: Roman I Khimov <khimov@altell.ru>
Allows to build coreutils-native at very early stage in build process.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
recipes/coreutils/coreutils-native.inc | 8 ++++++++
recipes/coreutils/coreutils-native_6.0.bb | 2 +-
recipes/coreutils/coreutils-native_7.1.bb | 2 +-
recipes/coreutils/coreutils-native_7.2.bb | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
create mode 100644 recipes/coreutils/coreutils-native.inc
diff --git a/recipes/coreutils/coreutils-native.inc b/recipes/coreutils/coreutils-native.inc
new file mode 100644
index 0000000..c4dda17
--- /dev/null
+++ b/recipes/coreutils/coreutils-native.inc
@@ -0,0 +1,8 @@
+inherit native
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+PATCHTOOL = "patch"
+
+do_configure() {
+ oe_runconf
+}
diff --git a/recipes/coreutils/coreutils-native_6.0.bb b/recipes/coreutils/coreutils-native_6.0.bb
index 057dfa6..a3754df 100644
--- a/recipes/coreutils/coreutils-native_6.0.bb
+++ b/recipes/coreutils/coreutils-native_6.0.bb
@@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
S = "${WORKDIR}/coreutils-${PV}"
require coreutils_${PV}.bb
-inherit native
+require coreutils-native.inc
diff --git a/recipes/coreutils/coreutils-native_7.1.bb b/recipes/coreutils/coreutils-native_7.1.bb
index 057dfa6..a3754df 100644
--- a/recipes/coreutils/coreutils-native_7.1.bb
+++ b/recipes/coreutils/coreutils-native_7.1.bb
@@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
S = "${WORKDIR}/coreutils-${PV}"
require coreutils_${PV}.bb
-inherit native
+require coreutils-native.inc
diff --git a/recipes/coreutils/coreutils-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb
index 057dfa6..a3754df 100644
--- a/recipes/coreutils/coreutils-native_7.2.bb
+++ b/recipes/coreutils/coreutils-native_7.2.bb
@@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
S = "${WORKDIR}/coreutils-${PV}"
require coreutils_${PV}.bb
-inherit native
+require coreutils-native.inc
--
1.6.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [STABLE][PATCH 2/6] coreutils-native: remove autotools and quilt dependencies
2009-10-28 10:45 ` [STABLE][PATCH 2/6] coreutils-native: remove autotools and quilt dependencies Marcin Juszkiewicz
@ 2009-10-31 7:54 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2009-10-31 7:54 UTC (permalink / raw)
To: openembedded-devel
On Wed, Oct 28, 2009 at 11:45:54AM +0100, Marcin Juszkiewicz wrote:
> From: Roman I Khimov <khimov@altell.ru>
>
> Allows to build coreutils-native at very early stage in build process.
>
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> recipes/coreutils/coreutils-native.inc | 8 ++++++++
> recipes/coreutils/coreutils-native_6.0.bb | 2 +-
> recipes/coreutils/coreutils-native_7.1.bb | 2 +-
> recipes/coreutils/coreutils-native_7.2.bb | 2 +-
> 4 files changed, 11 insertions(+), 3 deletions(-)
> create mode 100644 recipes/coreutils/coreutils-native.inc
>
> diff --git a/recipes/coreutils/coreutils-native.inc b/recipes/coreutils/coreutils-native.inc
> new file mode 100644
> index 0000000..c4dda17
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-native.inc
> @@ -0,0 +1,8 @@
> +inherit native
> +
> +INHIBIT_AUTOTOOLS_DEPS = "1"
> +PATCHTOOL = "patch"
> +
> +do_configure() {
> + oe_runconf
> +}
> diff --git a/recipes/coreutils/coreutils-native_6.0.bb b/recipes/coreutils/coreutils-native_6.0.bb
> index 057dfa6..a3754df 100644
> --- a/recipes/coreutils/coreutils-native_6.0.bb
> +++ b/recipes/coreutils/coreutils-native_6.0.bb
> @@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
> S = "${WORKDIR}/coreutils-${PV}"
>
> require coreutils_${PV}.bb
> -inherit native
> +require coreutils-native.inc
> diff --git a/recipes/coreutils/coreutils-native_7.1.bb b/recipes/coreutils/coreutils-native_7.1.bb
> index 057dfa6..a3754df 100644
> --- a/recipes/coreutils/coreutils-native_7.1.bb
> +++ b/recipes/coreutils/coreutils-native_7.1.bb
> @@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
> S = "${WORKDIR}/coreutils-${PV}"
>
> require coreutils_${PV}.bb
> -inherit native
> +require coreutils-native.inc
> diff --git a/recipes/coreutils/coreutils-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb
> index 057dfa6..a3754df 100644
> --- a/recipes/coreutils/coreutils-native_7.2.bb
> +++ b/recipes/coreutils/coreutils-native_7.2.bb
> @@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
> S = "${WORKDIR}/coreutils-${PV}"
>
> require coreutils_${PV}.bb
> -inherit native
> +require coreutils-native.inc
> --
> 1.6.5
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [STABLE][PATCH 3/6] coreutils-native: make mandatory dep for all packages
2009-10-28 10:45 [STABLE] some updates from my queue Marcin Juszkiewicz
2009-10-28 10:45 ` [STABLE][PATCH 1/6] coreutils: add version 7.2 Marcin Juszkiewicz
2009-10-28 10:45 ` [STABLE][PATCH 2/6] coreutils-native: remove autotools and quilt dependencies Marcin Juszkiewicz
@ 2009-10-28 10:45 ` Marcin Juszkiewicz
2009-10-31 7:54 ` Denys Dmytriyenko
2009-10-28 10:45 ` [STABLE][PATCH 4/6] remove install-native package Marcin Juszkiewicz
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2009-10-28 10:45 UTC (permalink / raw)
To: openembedded-devel
From: Roman I Khimov <khimov@altell.ru>
Gives us guaranteed sane GNU coreutils on any host. Should greatly ease
support for various non-GNU host systems and allow to safely remove some other
native packages like 'install-native'.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
classes/base.bbclass | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 611c71d..e622aee 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -134,9 +134,11 @@ def base_dep_prepend(d):
# the case where host == build == target, for now we don't work in
# that case though.
#
- deps = "shasum-native "
- if bb.data.getVar('PN', d, True) == "shasum-native":
+ deps = "shasum-native coreutils-native"
+ if bb.data.getVar('PN', d, True) == "shasum-native" or bb.data.getVar('PN', d, True) == "stagemanager-native":
deps = ""
+ if bb.data.getVar('PN', d, True) == "coreutils-native":
+ deps = "shasum-native"
# INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not
# we need that built is the responsibility of the patch function / class, not
--
1.6.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [STABLE][PATCH 3/6] coreutils-native: make mandatory dep for all packages
2009-10-28 10:45 ` [STABLE][PATCH 3/6] coreutils-native: make mandatory dep for all packages Marcin Juszkiewicz
@ 2009-10-31 7:54 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2009-10-31 7:54 UTC (permalink / raw)
To: openembedded-devel
On Wed, Oct 28, 2009 at 11:45:55AM +0100, Marcin Juszkiewicz wrote:
> From: Roman I Khimov <khimov@altell.ru>
>
> Gives us guaranteed sane GNU coreutils on any host. Should greatly ease
> support for various non-GNU host systems and allow to safely remove some other
> native packages like 'install-native'.
>
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> classes/base.bbclass | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/classes/base.bbclass b/classes/base.bbclass
> index 611c71d..e622aee 100644
> --- a/classes/base.bbclass
> +++ b/classes/base.bbclass
> @@ -134,9 +134,11 @@ def base_dep_prepend(d):
> # the case where host == build == target, for now we don't work in
> # that case though.
> #
> - deps = "shasum-native "
> - if bb.data.getVar('PN', d, True) == "shasum-native":
> + deps = "shasum-native coreutils-native"
> + if bb.data.getVar('PN', d, True) == "shasum-native" or bb.data.getVar('PN', d, True) == "stagemanager-native":
> deps = ""
> + if bb.data.getVar('PN', d, True) == "coreutils-native":
> + deps = "shasum-native"
>
> # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not
> # we need that built is the responsibility of the patch function / class, not
> --
> 1.6.5
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [STABLE][PATCH 4/6] remove install-native package
2009-10-28 10:45 [STABLE] some updates from my queue Marcin Juszkiewicz
` (2 preceding siblings ...)
2009-10-28 10:45 ` [STABLE][PATCH 3/6] coreutils-native: make mandatory dep for all packages Marcin Juszkiewicz
@ 2009-10-28 10:45 ` Marcin Juszkiewicz
2009-10-31 7:54 ` Denys Dmytriyenko
2009-10-28 10:45 ` [STABLE][PATCH 5/6] task-proper-tools: added few extra packages Marcin Juszkiewicz
2009-10-28 10:45 ` [STABLE][PATCH 6/6] netcat: use update-alternatives as we have netcat in busybox too Marcin Juszkiewicz
5 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2009-10-28 10:45 UTC (permalink / raw)
To: openembedded-devel
From: Roman I Khimov <khimov@altell.ru>
Sane 'install' program is provided by coreutils-native now.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
conf/distro/include/preferred-om-2008-versions.inc | 1 -
recipes/beep/beep_1.2.2.bb | 1 -
recipes/callweaver/callweaver-perl.bb | 1 -
recipes/cron/cron_3.0pl1.bb | 1 -
recipes/cups/cups.inc | 2 +-
recipes/cups/cups_1.1.23.bb | 2 +-
recipes/cups/cups_1.2.7.bb | 2 +-
recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb | 1 -
recipes/gnome/libart-lgpl.inc | 2 -
recipes/install/files/install-sh | 334 --------------------
recipes/install/install-native_0.1.bb | 27 --
recipes/netpbm/netpbm_10.28.bb | 2 +-
12 files changed, 4 insertions(+), 372 deletions(-)
delete mode 100644 recipes/install/files/install-sh
delete mode 100644 recipes/install/install-native_0.1.bb
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 55d5136..56354ca 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -712,7 +712,6 @@ PREFERRED_VERSION_inkscape ?= "0.43"
PREFERRED_VERSION_inkwp ?= "0.1.1"
PREFERRED_VERSION_inotify-tools ?= "2.1"
PREFERRED_VERSION_inputproto ?= "1.4.4"
-PREFERRED_VERSION_install-native ?= "0.1"
PREFERRED_VERSION_insttrain ?= "1.0.5"
PREFERRED_VERSION_interbench ?= "0.30"
PREFERRED_VERSION_intercom ?= "0.15"
diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb
index 759f74f..e3ffdce 100644
--- a/recipes/beep/beep_1.2.2.bb
+++ b/recipes/beep/beep_1.2.2.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "A console utility to make a beep noise"
SECTION = "console/utils"
LICENSE = "GPL"
PR = "r2"
-DEPENDS = "install-native"
SRC_URI = "http://johnath.com/beep/beep-${PV}.tar.gz"
SRC_URI += "file://linux-input.patch;patch=1"
diff --git a/recipes/callweaver/callweaver-perl.bb b/recipes/callweaver/callweaver-perl.bb
index 99e2fb7..7ff077b 100644
--- a/recipes/callweaver/callweaver-perl.bb
+++ b/recipes/callweaver/callweaver-perl.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Callweaver::OGI Perl Gateway Interface Module"
HOMEPAGE = "http://www.callweaver.org"
SECTION = "libs"
LICENSE = "GPL"
-DEPENDS = "install-native"
RDEPENDS = "perl callweaver-ogi"
PR = "r0"
S = "${WORKDIR}/callweaver-1.2-${CWRCV}/contrib/ogi-perl/callweaver-perl-0.0.1"
diff --git a/recipes/cron/cron_3.0pl1.bb b/recipes/cron/cron_3.0pl1.bb
index f7c2ccc..ff1d380 100644
--- a/recipes/cron/cron_3.0pl1.bb
+++ b/recipes/cron/cron_3.0pl1.bb
@@ -2,7 +2,6 @@ SECTION = "base"
DESCRIPTION = "Vixie cron."
LICENSE = "cron"
PR ="r8"
-DEPENDS += "install-native"
SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
file://nonrootinstall.patch;patch=1 \
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc
index 59075fb..8e2a7a8 100644
--- a/recipes/cups/cups.inc
+++ b/recipes/cups/cups.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "An Internet printing system for Unix."
SECTION = "console/utils"
LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
+DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
"
diff --git a/recipes/cups/cups_1.1.23.bb b/recipes/cups/cups_1.1.23.bb
index b17d899..d6f0de8 100644
--- a/recipes/cups/cups_1.1.23.bb
+++ b/recipes/cups/cups_1.1.23.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "An Internet printing system for Unix."
SECTION = "console/utils"
LICENSE = "GPL LGPL"
-DEPENDS = "openssl jpeg libpng zlib install-native fakeroot-native"
+DEPENDS = "openssl jpeg libpng zlib fakeroot-native"
PR = "r6"
SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
diff --git a/recipes/cups/cups_1.2.7.bb b/recipes/cups/cups_1.2.7.bb
index 24249fa..8559bfc 100644
--- a/recipes/cups/cups_1.2.7.bb
+++ b/recipes/cups/cups_1.2.7.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "An Internet printing system for Unix."
SECTION = "console/utils"
LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
+DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
PR = "r1"
SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
index e80340f..2247ea9 100644
--- a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
DEPENDS = "cyrus-sasl virtual/db"
LICENSE = "BSD"
PR = "r12"
-DEPENDS += "install-native"
SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
file://autotools.patch;patch=1 \
diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc
index 1af5b0e..4dad51e 100644
--- a/recipes/gnome/libart-lgpl.inc
+++ b/recipes/gnome/libart-lgpl.inc
@@ -13,8 +13,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${
inherit autotools pkgconfig
-DEPENDS = "install-native"
-
FILES_${PN} = "${libdir}/*.so.*"
FILES_${PN}-dev += "${bindir}/libart2-config"
diff --git a/recipes/install/files/install-sh b/recipes/install/files/install-sh
deleted file mode 100644
index 8de386e..0000000
--- a/recipes/install/files/install-sh
+++ /dev/null
@@ -1,334 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2004-10-22.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-preserve_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
- or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
- or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c (ignored)
--D (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--p apply access/modification times of SRCFILE files
- to corresponding DSTFILE files
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
-
-Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
- case $1 in
- -c) shift
- continue;;
-
- -D) shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- --help) echo "$usage"; exit 0;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -p) preserve_arg="-p"
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t) dstarg=$2
- shift
- shift
- continue;;
-
- -T) no_target_directory=true
- shift
- continue;;
-
- --version) echo "$0 $scriptversion"; exit 0;;
-
- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
- break;;
- esac
-done
-
-if test -z "$1"; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
- fi
- # It's OK to call `install-sh -d' without argument.
- # This can happen when creating conditional directories.
- exit 0
-fi
-
-for src
-do
- # Protect names starting with `-'.
- case $src in
- -*) src=./$src ;;
- esac
-
- if test -n "$dir_arg"; then
- dst=$src
- src=
-
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
- else
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
- if test ! -f "$src" && test ! -d "$src"; then
- echo "$0: $src does not exist." >&2
- exit 1
- fi
-
- if test -z "$dstarg"; then
- echo "$0: no destination specified." >&2
- exit 1
- fi
-
- dst=$dstarg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst ;;
- esac
-
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
- if test -d "$dst"; then
- if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
- exit 1
- fi
- dst=$dst/`basename "$src"`
- fi
- fi
-
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
- # Make sure that the destination directory exists.
-
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
-
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
-
- pathcomp=
-
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
- shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
- fi
- pathcomp=$pathcomp/
- done
- fi
-
- if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
- else
- dstfile=`basename "$dst"`
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
-
- # Copy the file name to the temp name.
- $doit $cpprog $preserve_arg "$src" "$dsttmp" &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
- # If any of these fail, we abort the whole thing. If we want to
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $cpprog $src $dsttmp" command.
- #
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
- }
- fi || { (exit 1); exit; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/recipes/install/install-native_0.1.bb b/recipes/install/install-native_0.1.bb
deleted file mode 100644
index 70c027b..0000000
--- a/recipes/install/install-native_0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-# This package uses the GNU autotools install-sh script to implement
-# a target-capable 'install' command.
-DESCRIPTION = "Target install command"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "MIT"
-INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
-
-SRC_URI = "file://install-sh"
-
-inherit native
-
-PACKAGES = ""
-S = "${WORKDIR}"
-
-do_stage() {
- # When the install command is executed 'STRIP' is defined correctly in
- # the environment
- rm -f ${STAGING_BINDIR}/install-sh
- cp install-sh ${STAGING_BINDIR}/install-sh
- chmod 755 ${STAGING_BINDIR}/install-sh
- rm -f ${STAGING_BINDIR}/install
- echo '#!/bin/sh' >${STAGING_BINDIR}/install
- echo 'STRIPPROG="$STRIP" exec sh "${STAGING_BINDIR}/install-sh" "$@"' >>${STAGING_BINDIR}/install
- chmod 755 ${STAGING_BINDIR}/install
-}
diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb
index 4ce1a5a..2672e4a 100644
--- a/recipes/netpbm/netpbm_10.28.bb
+++ b/recipes/netpbm/netpbm_10.28.bb
@@ -9,7 +9,7 @@ LICENSE = "GPL MIT Artistic"
# licenses. The compiled and linked command line utilties are
# subject to the licenses of the libraries they use too - including
# libpng libz, IJG, and libtiff licenses
-DEPENDS = "jpeg zlib libpng tiff install-native flex-native"
+DEPENDS = "jpeg zlib libpng tiff flex-native"
RDEPENDS = "perl\
perl-module-cwd\
perl-module-english\
--
1.6.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [STABLE][PATCH 4/6] remove install-native package
2009-10-28 10:45 ` [STABLE][PATCH 4/6] remove install-native package Marcin Juszkiewicz
@ 2009-10-31 7:54 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2009-10-31 7:54 UTC (permalink / raw)
To: openembedded-devel
On Wed, Oct 28, 2009 at 11:45:56AM +0100, Marcin Juszkiewicz wrote:
> From: Roman I Khimov <khimov@altell.ru>
>
> Sane 'install' program is provided by coreutils-native now.
>
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> conf/distro/include/preferred-om-2008-versions.inc | 1 -
> recipes/beep/beep_1.2.2.bb | 1 -
> recipes/callweaver/callweaver-perl.bb | 1 -
> recipes/cron/cron_3.0pl1.bb | 1 -
> recipes/cups/cups.inc | 2 +-
> recipes/cups/cups_1.1.23.bb | 2 +-
> recipes/cups/cups_1.2.7.bb | 2 +-
> recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb | 1 -
> recipes/gnome/libart-lgpl.inc | 2 -
> recipes/install/files/install-sh | 334 --------------------
> recipes/install/install-native_0.1.bb | 27 --
> recipes/netpbm/netpbm_10.28.bb | 2 +-
> 12 files changed, 4 insertions(+), 372 deletions(-)
> delete mode 100644 recipes/install/files/install-sh
> delete mode 100644 recipes/install/install-native_0.1.bb
>
> diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
> index 55d5136..56354ca 100644
> --- a/conf/distro/include/preferred-om-2008-versions.inc
> +++ b/conf/distro/include/preferred-om-2008-versions.inc
> @@ -712,7 +712,6 @@ PREFERRED_VERSION_inkscape ?= "0.43"
> PREFERRED_VERSION_inkwp ?= "0.1.1"
> PREFERRED_VERSION_inotify-tools ?= "2.1"
> PREFERRED_VERSION_inputproto ?= "1.4.4"
> -PREFERRED_VERSION_install-native ?= "0.1"
> PREFERRED_VERSION_insttrain ?= "1.0.5"
> PREFERRED_VERSION_interbench ?= "0.30"
> PREFERRED_VERSION_intercom ?= "0.15"
> diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb
> index 759f74f..e3ffdce 100644
> --- a/recipes/beep/beep_1.2.2.bb
> +++ b/recipes/beep/beep_1.2.2.bb
> @@ -4,7 +4,6 @@ DESCRIPTION = "A console utility to make a beep noise"
> SECTION = "console/utils"
> LICENSE = "GPL"
> PR = "r2"
> -DEPENDS = "install-native"
>
> SRC_URI = "http://johnath.com/beep/beep-${PV}.tar.gz"
> SRC_URI += "file://linux-input.patch;patch=1"
> diff --git a/recipes/callweaver/callweaver-perl.bb b/recipes/callweaver/callweaver-perl.bb
> index 99e2fb7..7ff077b 100644
> --- a/recipes/callweaver/callweaver-perl.bb
> +++ b/recipes/callweaver/callweaver-perl.bb
> @@ -2,7 +2,6 @@ DESCRIPTION = "Callweaver::OGI Perl Gateway Interface Module"
> HOMEPAGE = "http://www.callweaver.org"
> SECTION = "libs"
> LICENSE = "GPL"
> -DEPENDS = "install-native"
> RDEPENDS = "perl callweaver-ogi"
> PR = "r0"
> S = "${WORKDIR}/callweaver-1.2-${CWRCV}/contrib/ogi-perl/callweaver-perl-0.0.1"
> diff --git a/recipes/cron/cron_3.0pl1.bb b/recipes/cron/cron_3.0pl1.bb
> index f7c2ccc..ff1d380 100644
> --- a/recipes/cron/cron_3.0pl1.bb
> +++ b/recipes/cron/cron_3.0pl1.bb
> @@ -2,7 +2,6 @@ SECTION = "base"
> DESCRIPTION = "Vixie cron."
> LICENSE = "cron"
> PR ="r8"
> -DEPENDS += "install-native"
>
> SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
> file://nonrootinstall.patch;patch=1 \
> diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc
> index 59075fb..8e2a7a8 100644
> --- a/recipes/cups/cups.inc
> +++ b/recipes/cups/cups.inc
> @@ -1,7 +1,7 @@
> DESCRIPTION = "An Internet printing system for Unix."
> SECTION = "console/utils"
> LICENSE = "GPL LGPL"
> -DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
> +DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
>
> SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
> "
> diff --git a/recipes/cups/cups_1.1.23.bb b/recipes/cups/cups_1.1.23.bb
> index b17d899..d6f0de8 100644
> --- a/recipes/cups/cups_1.1.23.bb
> +++ b/recipes/cups/cups_1.1.23.bb
> @@ -1,7 +1,7 @@
> DESCRIPTION = "An Internet printing system for Unix."
> SECTION = "console/utils"
> LICENSE = "GPL LGPL"
> -DEPENDS = "openssl jpeg libpng zlib install-native fakeroot-native"
> +DEPENDS = "openssl jpeg libpng zlib fakeroot-native"
> PR = "r6"
>
> SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
> diff --git a/recipes/cups/cups_1.2.7.bb b/recipes/cups/cups_1.2.7.bb
> index 24249fa..8559bfc 100644
> --- a/recipes/cups/cups_1.2.7.bb
> +++ b/recipes/cups/cups_1.2.7.bb
> @@ -1,7 +1,7 @@
> DESCRIPTION = "An Internet printing system for Unix."
> SECTION = "console/utils"
> LICENSE = "GPL LGPL"
> -DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
> +DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
> PR = "r1"
>
> SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
> diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
> index e80340f..2247ea9 100644
> --- a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
> +++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
> @@ -2,7 +2,6 @@ SECTION = "console/network"
> DEPENDS = "cyrus-sasl virtual/db"
> LICENSE = "BSD"
> PR = "r12"
> -DEPENDS += "install-native"
>
> SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
> file://autotools.patch;patch=1 \
> diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc
> index 1af5b0e..4dad51e 100644
> --- a/recipes/gnome/libart-lgpl.inc
> +++ b/recipes/gnome/libart-lgpl.inc
> @@ -13,8 +13,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${
>
> inherit autotools pkgconfig
>
> -DEPENDS = "install-native"
> -
> FILES_${PN} = "${libdir}/*.so.*"
> FILES_${PN}-dev += "${bindir}/libart2-config"
>
> diff --git a/recipes/install/files/install-sh b/recipes/install/files/install-sh
> deleted file mode 100644
> index 8de386e..0000000
> --- a/recipes/install/files/install-sh
> +++ /dev/null
> @@ -1,334 +0,0 @@
> -#!/bin/sh
> -# install - install a program, script, or datafile
> -
> -scriptversion=2004-10-22.00
> -
> -# This originates from X11R5 (mit/util/scripts/install.sh), which was
> -# later released in X11R6 (xc/config/util/install.sh) with the
> -# following copyright and license.
> -#
> -# Copyright (C) 1994 X Consortium
> -#
> -# Permission is hereby granted, free of charge, to any person obtaining a copy
> -# of this software and associated documentation files (the "Software"), to
> -# deal in the Software without restriction, including without limitation the
> -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
> -# sell copies of the Software, and to permit persons to whom the Software is
> -# furnished to do so, subject to the following conditions:
> -#
> -# The above copyright notice and this permission notice shall be included in
> -# all copies or substantial portions of the Software.
> -#
> -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
> -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
> -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> -#
> -# Except as contained in this notice, the name of the X Consortium shall not
> -# be used in advertising or otherwise to promote the sale, use or other deal-
> -# ings in this Software without prior written authorization from the X Consor-
> -# tium.
> -#
> -#
> -# FSF changes to this file are in the public domain.
> -#
> -# Calling this script install-sh is preferred over install.sh, to prevent
> -# `make' implicit rules from creating a file called install from it
> -# when there is no Makefile.
> -#
> -# This script is compatible with the BSD install script, but was written
> -# from scratch. It can only install one file at a time, a restriction
> -# shared with many OS's install programs.
> -
> -# set DOITPROG to echo to test this script
> -
> -# Don't use :- since 4.3BSD and earlier shells don't like it.
> -doit="${DOITPROG-}"
> -
> -# put in absolute paths if you don't have them in your path; or use env. vars.
> -
> -mvprog="${MVPROG-mv}"
> -cpprog="${CPPROG-cp}"
> -chmodprog="${CHMODPROG-chmod}"
> -chownprog="${CHOWNPROG-chown}"
> -chgrpprog="${CHGRPPROG-chgrp}"
> -stripprog="${STRIPPROG-strip}"
> -rmprog="${RMPROG-rm}"
> -mkdirprog="${MKDIRPROG-mkdir}"
> -
> -chmodcmd="$chmodprog 0755"
> -chowncmd=
> -chgrpcmd=
> -stripcmd=
> -rmcmd="$rmprog -f"
> -mvcmd="$mvprog"
> -src=
> -dst=
> -dir_arg=
> -preserve_arg=
> -dstarg=
> -no_target_directory=
> -
> -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
> - or: $0 [OPTION]... SRCFILES... DIRECTORY
> - or: $0 [OPTION]... -t DIRECTORY SRCFILES...
> - or: $0 [OPTION]... -d DIRECTORIES...
> -
> -In the 1st form, copy SRCFILE to DSTFILE.
> -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
> -In the 4th, create DIRECTORIES.
> -
> -Options:
> --c (ignored)
> --D (ignored)
> --d create directories instead of installing files.
> --g GROUP $chgrpprog installed files to GROUP.
> --m MODE $chmodprog installed files to MODE.
> --o USER $chownprog installed files to USER.
> --p apply access/modification times of SRCFILE files
> - to corresponding DSTFILE files
> --s $stripprog installed files.
> --t DIRECTORY install into DIRECTORY.
> --T report an error if DSTFILE is a directory.
> ---help display this help and exit.
> ---version display version info and exit.
> -
> -Environment variables override the default commands:
> - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
> -"
> -
> -while test -n "$1"; do
> - case $1 in
> - -c) shift
> - continue;;
> -
> - -D) shift
> - continue;;
> -
> - -d) dir_arg=true
> - shift
> - continue;;
> -
> - -g) chgrpcmd="$chgrpprog $2"
> - shift
> - shift
> - continue;;
> -
> - --help) echo "$usage"; exit 0;;
> -
> - -m) chmodcmd="$chmodprog $2"
> - shift
> - shift
> - continue;;
> -
> - -o) chowncmd="$chownprog $2"
> - shift
> - shift
> - continue;;
> -
> - -p) preserve_arg="-p"
> - shift
> - continue;;
> -
> - -s) stripcmd=$stripprog
> - shift
> - continue;;
> -
> - -t) dstarg=$2
> - shift
> - shift
> - continue;;
> -
> - -T) no_target_directory=true
> - shift
> - continue;;
> -
> - --version) echo "$0 $scriptversion"; exit 0;;
> -
> - *) # When -d is used, all remaining arguments are directories to create.
> - # When -t is used, the destination is already specified.
> - test -n "$dir_arg$dstarg" && break
> - # Otherwise, the last argument is the destination. Remove it from $@.
> - for arg
> - do
> - if test -n "$dstarg"; then
> - # $@ is not empty: it contains at least $arg.
> - set fnord "$@" "$dstarg"
> - shift # fnord
> - fi
> - shift # arg
> - dstarg=$arg
> - done
> - break;;
> - esac
> -done
> -
> -if test -z "$1"; then
> - if test -z "$dir_arg"; then
> - echo "$0: no input file specified." >&2
> - exit 1
> - fi
> - # It's OK to call `install-sh -d' without argument.
> - # This can happen when creating conditional directories.
> - exit 0
> -fi
> -
> -for src
> -do
> - # Protect names starting with `-'.
> - case $src in
> - -*) src=./$src ;;
> - esac
> -
> - if test -n "$dir_arg"; then
> - dst=$src
> - src=
> -
> - if test -d "$dst"; then
> - mkdircmd=:
> - chmodcmd=
> - else
> - mkdircmd=$mkdirprog
> - fi
> - else
> - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
> - # might cause directories to be created, which would be especially bad
> - # if $src (and thus $dsttmp) contains '*'.
> - if test ! -f "$src" && test ! -d "$src"; then
> - echo "$0: $src does not exist." >&2
> - exit 1
> - fi
> -
> - if test -z "$dstarg"; then
> - echo "$0: no destination specified." >&2
> - exit 1
> - fi
> -
> - dst=$dstarg
> - # Protect names starting with `-'.
> - case $dst in
> - -*) dst=./$dst ;;
> - esac
> -
> - # If destination is a directory, append the input filename; won't work
> - # if double slashes aren't ignored.
> - if test -d "$dst"; then
> - if test -n "$no_target_directory"; then
> - echo "$0: $dstarg: Is a directory" >&2
> - exit 1
> - fi
> - dst=$dst/`basename "$src"`
> - fi
> - fi
> -
> - # This sed command emulates the dirname command.
> - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
> -
> - # Make sure that the destination directory exists.
> -
> - # Skip lots of stat calls in the usual case.
> - if test ! -d "$dstdir"; then
> - defaultIFS='
> - '
> - IFS="${IFS-$defaultIFS}"
> -
> - oIFS=$IFS
> - # Some sh's can't handle IFS=/ for some reason.
> - IFS='%'
> - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
> - shift
> - IFS=$oIFS
> -
> - pathcomp=
> -
> - while test $# -ne 0 ; do
> - pathcomp=$pathcomp$1
> - shift
> - if test ! -d "$pathcomp"; then
> - $mkdirprog "$pathcomp"
> - # mkdir can fail with a `File exist' error in case several
> - # install-sh are creating the directory concurrently. This
> - # is OK.
> - test -d "$pathcomp" || exit
> - fi
> - pathcomp=$pathcomp/
> - done
> - fi
> -
> - if test -n "$dir_arg"; then
> - $doit $mkdircmd "$dst" \
> - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
> - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
> - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
> - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
> -
> - else
> - dstfile=`basename "$dst"`
> -
> - # Make a couple of temp file names in the proper directory.
> - dsttmp=$dstdir/_inst.$$_
> - rmtmp=$dstdir/_rm.$$_
> -
> - # Trap to clean up those temp files at exit.
> - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
> - trap '(exit $?); exit' 1 2 13 15
> -
> - # Copy the file name to the temp name.
> - $doit $cpprog $preserve_arg "$src" "$dsttmp" &&
> -
> - # and set any options; do chmod last to preserve setuid bits.
> - #
> - # If any of these fail, we abort the whole thing. If we want to
> - # ignore errors from any of these, just make sure not to ignore
> - # errors from the above "$doit $cpprog $src $dsttmp" command.
> - #
> - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
> - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
> - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
> - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
> -
> - # Now rename the file to the real destination.
> - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
> - || {
> - # The rename failed, perhaps because mv can't rename something else
> - # to itself, or perhaps because mv is so ancient that it does not
> - # support -f.
> -
> - # Now remove or move aside any old file at destination location.
> - # We try this two ways since rm can't unlink itself on some
> - # systems and the destination file might be busy for other
> - # reasons. In this case, the final cleanup might fail but the new
> - # file should still install successfully.
> - {
> - if test -f "$dstdir/$dstfile"; then
> - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
> - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
> - || {
> - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
> - (exit 1); exit
> - }
> - else
> - :
> - fi
> - } &&
> -
> - # Now rename the file to the real destination.
> - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
> - }
> - }
> - fi || { (exit 1); exit; }
> -done
> -
> -# The final little trick to "correctly" pass the exit status to the exit trap.
> -{
> - (exit 0); exit
> -}
> -
> -# Local variables:
> -# eval: (add-hook 'write-file-hooks 'time-stamp)
> -# time-stamp-start: "scriptversion="
> -# time-stamp-format: "%:y-%02m-%02d.%02H"
> -# time-stamp-end: "$"
> -# End:
> diff --git a/recipes/install/install-native_0.1.bb b/recipes/install/install-native_0.1.bb
> deleted file mode 100644
> index 70c027b..0000000
> --- a/recipes/install/install-native_0.1.bb
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -# This package uses the GNU autotools install-sh script to implement
> -# a target-capable 'install' command.
> -DESCRIPTION = "Target install command"
> -SECTION = "devel"
> -PRIORITY = "optional"
> -LICENSE = "MIT"
> -INHIBIT_DEFAULT_DEPS = "1"
> -PR = "r1"
> -
> -SRC_URI = "file://install-sh"
> -
> -inherit native
> -
> -PACKAGES = ""
> -S = "${WORKDIR}"
> -
> -do_stage() {
> - # When the install command is executed 'STRIP' is defined correctly in
> - # the environment
> - rm -f ${STAGING_BINDIR}/install-sh
> - cp install-sh ${STAGING_BINDIR}/install-sh
> - chmod 755 ${STAGING_BINDIR}/install-sh
> - rm -f ${STAGING_BINDIR}/install
> - echo '#!/bin/sh' >${STAGING_BINDIR}/install
> - echo 'STRIPPROG="$STRIP" exec sh "${STAGING_BINDIR}/install-sh" "$@"' >>${STAGING_BINDIR}/install
> - chmod 755 ${STAGING_BINDIR}/install
> -}
> diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb
> index 4ce1a5a..2672e4a 100644
> --- a/recipes/netpbm/netpbm_10.28.bb
> +++ b/recipes/netpbm/netpbm_10.28.bb
> @@ -9,7 +9,7 @@ LICENSE = "GPL MIT Artistic"
> # licenses. The compiled and linked command line utilties are
> # subject to the licenses of the libraries they use too - including
> # libpng libz, IJG, and libtiff licenses
> -DEPENDS = "jpeg zlib libpng tiff install-native flex-native"
> +DEPENDS = "jpeg zlib libpng tiff flex-native"
> RDEPENDS = "perl\
> perl-module-cwd\
> perl-module-english\
> --
> 1.6.5
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [STABLE][PATCH 5/6] task-proper-tools: added few extra packages
2009-10-28 10:45 [STABLE] some updates from my queue Marcin Juszkiewicz
` (3 preceding siblings ...)
2009-10-28 10:45 ` [STABLE][PATCH 4/6] remove install-native package Marcin Juszkiewicz
@ 2009-10-28 10:45 ` Marcin Juszkiewicz
2009-10-31 7:55 ` Denys Dmytriyenko
2009-10-28 10:45 ` [STABLE][PATCH 6/6] netcat: use update-alternatives as we have netcat in busybox too Marcin Juszkiewicz
5 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2009-10-28 10:45 UTC (permalink / raw)
To: openembedded-devel; +Cc: Marcin Juszkiewicz
From: Marcin Juszkiewicz <hrw@openembedded.org>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
recipes/tasks/task-proper-tools.bb | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/recipes/tasks/task-proper-tools.bb b/recipes/tasks/task-proper-tools.bb
index c5045a1..056109e 100644
--- a/recipes/tasks/task-proper-tools.bb
+++ b/recipes/tasks/task-proper-tools.bb
@@ -1,31 +1,36 @@
DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r9"
+PR = "r10"
inherit task
RDEPENDS_${PN} = "\
+ binutils-symlinks \
coreutils \
+ cpio \
+ debianutils \
+ diffutils \
+ e2fsprogs \
+ e2fsprogs-fsck \
+ fbset \
findutils \
- util-linux-ng \
- grep \
gawk \
- sed \
- wget \
- patch \
- tar \
- diffutils \
+ grep \
+ gzip \
+ iproute2 \
+ iputils \
less \
- vim \
- e2fsprogs \
- binutils-symlinks \
module-init-tools \
+ netcat \
net-tools \
- iproute2 \
- iputils \
+ patch \
+ procps \
psmisc \
- debianutils \
+ sed \
+ tar \
tcptraceroute \
- fbset \
+ util-linux-ng \
+ vim \
+ wget \
"
#
# binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info
--
1.6.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [STABLE][PATCH 5/6] task-proper-tools: added few extra packages
2009-10-28 10:45 ` [STABLE][PATCH 5/6] task-proper-tools: added few extra packages Marcin Juszkiewicz
@ 2009-10-31 7:55 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2009-10-31 7:55 UTC (permalink / raw)
To: openembedded-devel; +Cc: Marcin Juszkiewicz
On Wed, Oct 28, 2009 at 11:45:57AM +0100, Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz <hrw@openembedded.org>
>
> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> recipes/tasks/task-proper-tools.bb | 35 ++++++++++++++++++++---------------
> 1 files changed, 20 insertions(+), 15 deletions(-)
>
> diff --git a/recipes/tasks/task-proper-tools.bb b/recipes/tasks/task-proper-tools.bb
> index c5045a1..056109e 100644
> --- a/recipes/tasks/task-proper-tools.bb
> +++ b/recipes/tasks/task-proper-tools.bb
> @@ -1,31 +1,36 @@
> DESCRIPTION = "Full versions of tools provided by busybox"
> -PR = "r9"
> +PR = "r10"
>
> inherit task
>
> RDEPENDS_${PN} = "\
> + binutils-symlinks \
> coreutils \
> + cpio \
> + debianutils \
> + diffutils \
> + e2fsprogs \
> + e2fsprogs-fsck \
> + fbset \
> findutils \
> - util-linux-ng \
> - grep \
> gawk \
> - sed \
> - wget \
> - patch \
> - tar \
> - diffutils \
> + grep \
> + gzip \
> + iproute2 \
> + iputils \
> less \
> - vim \
> - e2fsprogs \
> - binutils-symlinks \
> module-init-tools \
> + netcat \
> net-tools \
> - iproute2 \
> - iputils \
> + patch \
> + procps \
> psmisc \
> - debianutils \
> + sed \
> + tar \
> tcptraceroute \
> - fbset \
> + util-linux-ng \
> + vim \
> + wget \
> "
> #
> # binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info
> --
> 1.6.5
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [STABLE][PATCH 6/6] netcat: use update-alternatives as we have netcat in busybox too
2009-10-28 10:45 [STABLE] some updates from my queue Marcin Juszkiewicz
` (4 preceding siblings ...)
2009-10-28 10:45 ` [STABLE][PATCH 5/6] task-proper-tools: added few extra packages Marcin Juszkiewicz
@ 2009-10-28 10:45 ` Marcin Juszkiewicz
2009-10-31 7:55 ` Denys Dmytriyenko
5 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2009-10-28 10:45 UTC (permalink / raw)
To: openembedded-devel; +Cc: Marcin Juszkiewicz
From: Marcin Juszkiewicz <hrw@openembedded.org>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
recipes/netcat/netcat_0.7.1.bb | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/recipes/netcat/netcat_0.7.1.bb b/recipes/netcat/netcat_0.7.1.bb
index c7ceccd..7c4dfc5 100644
--- a/recipes/netcat/netcat_0.7.1.bb
+++ b/recipes/netcat/netcat_0.7.1.bb
@@ -2,8 +2,17 @@ DESCRIPTION = "GNU Netcat"
HOMEPAGE = "http://netcat.sourceforge.net"
SECTION = "console/network"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
-inherit autotools
+inherit autotools update-alternatives
+
+do_install_append() {
+ mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
+}
+
+ALTERNATIVE_NAME = "nc"
+ALTERNATIVE_LINK = "${bindir}/nc"
+ALTERNATIVE_PATH = "${bindir}/nc.${PN}"
+ALTERNATIVE_PRIORITY = "100"
--
1.6.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [STABLE][PATCH 6/6] netcat: use update-alternatives as we have netcat in busybox too
2009-10-28 10:45 ` [STABLE][PATCH 6/6] netcat: use update-alternatives as we have netcat in busybox too Marcin Juszkiewicz
@ 2009-10-31 7:55 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2009-10-31 7:55 UTC (permalink / raw)
To: openembedded-devel; +Cc: Marcin Juszkiewicz
On Wed, Oct 28, 2009 at 11:45:58AM +0100, Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz <hrw@openembedded.org>
>
> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> recipes/netcat/netcat_0.7.1.bb | 13 +++++++++++--
> 1 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/netcat/netcat_0.7.1.bb b/recipes/netcat/netcat_0.7.1.bb
> index c7ceccd..7c4dfc5 100644
> --- a/recipes/netcat/netcat_0.7.1.bb
> +++ b/recipes/netcat/netcat_0.7.1.bb
> @@ -2,8 +2,17 @@ DESCRIPTION = "GNU Netcat"
> HOMEPAGE = "http://netcat.sourceforge.net"
> SECTION = "console/network"
> LICENSE = "GPLv2"
> -PR = "r1"
> +PR = "r3"
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
>
> -inherit autotools
> +inherit autotools update-alternatives
> +
> +do_install_append() {
> + mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
> +}
> +
> +ALTERNATIVE_NAME = "nc"
> +ALTERNATIVE_LINK = "${bindir}/nc"
> +ALTERNATIVE_PATH = "${bindir}/nc.${PN}"
> +ALTERNATIVE_PRIORITY = "100"
> --
> 1.6.5
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread