summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-08-24 15:17:20 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 13:04:38 +0100
commit37f914dd72145a4e6ecc9ed75cbe27745670f499 (patch)
tree5de73ebd6754e94be7e96425d315e646a98db764
parent084eb5a04dc684f5558401a2d77550d5dfc057b4 (diff)
downloadopenembedded-core-37f914dd72145a4e6ecc9ed75cbe27745670f499.tar.gz
openembedded-core-37f914dd72145a4e6ecc9ed75cbe27745670f499.tar.bz2
openembedded-core-37f914dd72145a4e6ecc9ed75cbe27745670f499.tar.xz
openembedded-core-37f914dd72145a4e6ecc9ed75cbe27745670f499.zip
findutils (GPLv2): remove metadata sharing from GPLv3 recipe
to avoid inadvertent contamination in the future, GPLv2 recipe is fully split its v3 buddy. This way we can enforce strong isolation for GPLv2 code. also remove one unnecessary patch Signed-off-by: Kevin Tian <kevin.tian@intel.com>
-rw-r--r--meta/packages/findutils/findutils-4.2.31/mkdir.patch26
-rw-r--r--meta/packages/findutils/findutils_4.2.31.bb28
2 files changed, 20 insertions, 34 deletions
diff --git a/meta/packages/findutils/findutils-4.2.31/mkdir.patch b/meta/packages/findutils/findutils-4.2.31/mkdir.patch
deleted file mode 100644
index 98ffbd2e7..000000000
--- a/meta/packages/findutils/findutils-4.2.31/mkdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: findutils-4.2.29/configure.in
-===================================================================
---- findutils-4.2.29.orig/configure.in 2006-11-25 18:06:00.000000000 +0000
-+++ findutils-4.2.29/configure.in 2009-08-19 18:01:06.000000000 +0100
-@@ -209,6 +209,8 @@
- dnl Hence they need to know if they are being compiled into findutils or not.
- AC_DEFINE([FINDUTILS], 1, [Define if we are compiling GNU findutils])
-
-+MKINSTALLDIRS="mkdir -p"
-+AC_SUBST(MKINSTALLDIRS)
-
- # This is necessary so that .o files in LIBOBJS are also built via
- # the ANSI2KNR-filtering rules.
-Index: findutils-4.2.29/po/Makefile.in.in
-===================================================================
---- findutils-4.2.29.orig/po/Makefile.in.in 2009-08-19 18:05:47.000000000 +0100
-+++ findutils-4.2.29/po/Makefile.in.in 2009-08-19 18:05:58.000000000 +0100
-@@ -30,7 +30,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+mkinstalldirs = $(MKINSTALLDIRS)
-
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff --git a/meta/packages/findutils/findutils_4.2.31.bb b/meta/packages/findutils/findutils_4.2.31.bb
index 3f4fc534c..2804a3ba3 100644
--- a/meta/packages/findutils/findutils_4.2.31.bb
+++ b/meta/packages/findutils/findutils_4.2.31.bb
@@ -1,17 +1,29 @@
-require findutils.inc
+DESCRIPTION = "find, locate, and xargs binaries."
+HOMEPAGE = "http://www.gnu.org/software/findutils/"
+BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
+SECTION = "console/utils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-PR = "r0"
+PR = "r1"
-SRC_URI += "file://mkdir.patch \
- file://gnulib-extension.patch"
+SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
+ file://gnulib-extension.patch"
+
+inherit autotools gettext
+
+# diffutils assumes non-glibc compilation with uclibc and
+# this causes it to generate its own implementations of
+# standard functionality. regex.c actually breaks compilation
+# because it uses __mempcpy, there are other things (TBD:
+# see diffutils.mk in buildroot)
+EXTRA_OECONF_linux-uclibc = "--without-included-regex"
do_install_append () {
- if [ -e ${D}${bindir}/find ]; then
- mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
- mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
- fi
+ if [ -e ${D}${bindir}/find ]; then
+ mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
+ mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
+ fi
}
pkg_postinst_${PN} () {