From c588c7ecebd7e3f1f2983a55ee564877a7bfdf12 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 16 Mar 2010 09:24:51 +0100
Subject: findutils: convert to BBCLASSEXTEND, add 4.5.5 instead of 4.4, use
 more specific LICENCE GPLv2|3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/findutils/findutils-native_4.2.29.bb |  7 -------
 recipes/findutils/findutils-native_4.4.bb    |  9 ---------
 recipes/findutils/findutils.inc              | 20 ++++++++++++++++++--
 recipes/findutils/findutils_4.2.29.bb        | 11 ++---------
 recipes/findutils/findutils_4.4.bb           | 14 --------------
 recipes/findutils/findutils_4.5.5.bb         |  8 ++++++++
 6 files changed, 28 insertions(+), 41 deletions(-)
 delete mode 100644 recipes/findutils/findutils-native_4.2.29.bb
 delete mode 100644 recipes/findutils/findutils-native_4.4.bb
 delete mode 100644 recipes/findutils/findutils_4.4.bb
 create mode 100644 recipes/findutils/findutils_4.5.5.bb

(limited to 'recipes/findutils')

diff --git a/recipes/findutils/findutils-native_4.2.29.bb b/recipes/findutils/findutils-native_4.2.29.bb
deleted file mode 100644
index cb6d72f1e9..0000000000
--- a/recipes/findutils/findutils-native_4.2.29.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require findutils.inc
-
-inherit native
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
-
-S = "${WORKDIR}/findutils-${PV}"
diff --git a/recipes/findutils/findutils-native_4.4.bb b/recipes/findutils/findutils-native_4.4.bb
deleted file mode 100644
index 1a7b1fe4a8..0000000000
--- a/recipes/findutils/findutils-native_4.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require findutils.inc
-
-inherit native
-
-DEFAULT_PREFERENCE = "-1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
-
-S = "${WORKDIR}/findutils-${PV}"
diff --git a/recipes/findutils/findutils.inc b/recipes/findutils/findutils.inc
index 209edd60ad..02b2b1bb5b 100644
--- a/recipes/findutils/findutils.inc
+++ b/recipes/findutils/findutils.inc
@@ -1,11 +1,15 @@
 DESCRIPTION = "find, locate, and xargs binaries."
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "GPLv3"
 
-SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz;name=archive"
+
+BBCLASSEXTEND = "native"
 
 inherit autotools gettext
 
+INC_PR = "r2"
+
 # diffutils assumes non-glibc compilation with uclibc and
 # this causes it to generate its own implementations of
 # standard functionality.  regex.c actually breaks compilation
@@ -17,3 +21,15 @@ do_install_append() {
 	cd ${D}${bindir} && mv find find.findutils
 	cd ${D}${bindir} && mv xargs xargs.findutils
 }
+# When staging native package, postinst/prerm is not called and find.findutils is not so usefull in -native
+do_install_virtclass-native () {
+	autotools_do_install
+}
+
+pkg_postinst_${PN} () {
+        for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
+}
+
+pkg_prerm_${PN} () {
+        for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
+}
diff --git a/recipes/findutils/findutils_4.2.29.bb b/recipes/findutils/findutils_4.2.29.bb
index a89d0924f4..c3c22fb0c2 100644
--- a/recipes/findutils/findutils_4.2.29.bb
+++ b/recipes/findutils/findutils_4.2.29.bb
@@ -1,15 +1,8 @@
 require findutils.inc
+LICENSE = "GPLv2"
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
 EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
-
-pkg_postinst_${PN} () {
-	for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-}
-
-pkg_prerm_${PN} () {
-	for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
-}
diff --git a/recipes/findutils/findutils_4.4.bb b/recipes/findutils/findutils_4.4.bb
deleted file mode 100644
index 25dec2592e..0000000000
--- a/recipes/findutils/findutils_4.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require findutils.inc
-
-PR = "r1"
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
-
-pkg_postinst_${PN} () {
-	for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-}
-
-pkg_prerm_${PN} () {
-	for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
-}
diff --git a/recipes/findutils/findutils_4.5.5.bb b/recipes/findutils/findutils_4.5.5.bb
new file mode 100644
index 0000000000..67ae8e0284
--- /dev/null
+++ b/recipes/findutils/findutils_4.5.5.bb
@@ -0,0 +1,8 @@
+require findutils.inc
+
+PR = "${INC_PR}.0"
+
+# newer version is not available on GNU_MIRROR from .inc file, and old 4.2.29 is not available on alpha.gnu.org
+SRC_URI = "ftp://alpha.gnu.org/gnu/${BPN}/${BPN}-${PV}.tar.gz;name=archive"
+SRC_URI[archive.md5sum] = "39f9dbee5db8e26f8fe01884cb99397b"
+SRC_URI[archive.sha256sum] = "8388e1b26902e8f84320b320994071743b0e98c2831b189e8ba230747e8e0b8d"
-- 
cgit v1.2.3