summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-19 18:10:21 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-19 18:10:21 +0100
commit5a826d30e0874a35b3cd4fd3b4a5a47a15935162 (patch)
treeca0d34f70e8f4b9b6744f8e07c7021e4b4eb0b53 /meta/packages
parent0dc18c5339db880b656df68e5de1fb54dbf55405 (diff)
downloadopenembedded-core-5a826d30e0874a35b3cd4fd3b4a5a47a15935162.tar.gz
openembedded-core-5a826d30e0874a35b3cd4fd3b4a5a47a15935162.tar.bz2
openembedded-core-5a826d30e0874a35b3cd4fd3b4a5a47a15935162.tar.xz
openembedded-core-5a826d30e0874a35b3cd4fd3b4a5a47a15935162.zip
findutils: Add patch for mkdir issue and use BBCLASSEXTEND for the native version
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/findutils/findutils-native_4.2.29.bb2
-rw-r--r--meta/packages/findutils/findutils.inc3
-rw-r--r--meta/packages/findutils/findutils/mkdir.patch26
-rw-r--r--meta/packages/findutils/findutils_4.2.29.bb10
4 files changed, 36 insertions, 5 deletions
diff --git a/meta/packages/findutils/findutils-native_4.2.29.bb b/meta/packages/findutils/findutils-native_4.2.29.bb
deleted file mode 100644
index d41baa2c4..000000000
--- a/meta/packages/findutils/findutils-native_4.2.29.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require findutils.inc
-inherit native
diff --git a/meta/packages/findutils/findutils.inc b/meta/packages/findutils/findutils.inc
index e054dd0cc..b54b09b7b 100644
--- a/meta/packages/findutils/findutils.inc
+++ b/meta/packages/findutils/findutils.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "find, locate, and xargs binaries."
SECTION = "console/utils"
LICENSE = "GPL"
-SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
+ file://mkdir.patch;patch=1"
inherit autotools gettext
diff --git a/meta/packages/findutils/findutils/mkdir.patch b/meta/packages/findutils/findutils/mkdir.patch
new file mode 100644
index 000000000..98ffbd2e7
--- /dev/null
+++ b/meta/packages/findutils/findutils/mkdir.patch
@@ -0,0 +1,26 @@
+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.29.bb b/meta/packages/findutils/findutils_4.2.29.bb
index 2f40d03bd..6373bad9c 100644
--- a/meta/packages/findutils/findutils_4.2.29.bb
+++ b/meta/packages/findutils/findutils_4.2.29.bb
@@ -1,8 +1,12 @@
require findutils.inc
+PR = "r2"
+
do_install_append () {
- mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
- mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
+ 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} () {
@@ -12,3 +16,5 @@ pkg_postinst_${PN} () {
pkg_prerm_${PN} () {
for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
}
+
+BBCLASSEXTEND = "native" \ No newline at end of file