[oe-commits] Martin.Jansa : findutils: fix update-alternatives and native packages

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: f07b5ee9bac010eb5625641f318a6b416cab51ea
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f07b5ee9bac010eb5625641f318a6b416cab51ea

Author: Martin.Jansa <Martin.Jansa at gmail.com>
Date:   Wed Sep 23 08:07:11 2009 +0000

findutils: fix update-alternatives and native packages

Sync with org.oe.dev (fix for update-alternatives postinst, prerm).
Move update-alternatives logic to findutils-alternatives.inc which is not included in -native packages.
Patch mkinstalldirs.patch is needed also for findutils-native_4.2.29.
Remove version 4.4 as there is no tarball upstream (it's 4.4.0 actually).
Add latest version 4.4.2, but don't prefer it now as it's not compatible with shr preferred old glibc 2.6.1 (staging/armv4t-angstrom-linux-gnueabi/usr/include/stdio.h:654: error: conflicting types for 'rpl_fseeko')

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/checksums.ini                                 |    4 ++++
 recipes/findutils/findutils-alternatives.inc       |   12 ++++++++++++
 recipes/findutils/findutils-native_4.2.29.bb       |    2 ++
 ...ils-native_4.4.bb => findutils-native_4.4.2.bb} |    0 
 recipes/findutils/findutils_4.2.29.bb              |   11 +++--------
 recipes/findutils/findutils_4.4.2.bb               |    6 ++++++
 recipes/findutils/findutils_4.4.bb                 |   13 -------------
 7 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a1146d5..27d8644 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5422,6 +5422,10 @@ sha256=21e68eeb291ab5a9f4d618f2985c16c26cdfeb0f0f37d3b88550446678dab30a
 md5=24e76434ca74ba3c2c6ad621eb64e1ff
 sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0
 
+[ftp://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz]
+md5=351cc4adb07d54877fa15f75fb77d39f
+sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
 md5=5704a8c36de84b408e069afb0c5bc1df
 sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd
diff --git a/recipes/findutils/findutils-alternatives.inc b/recipes/findutils/findutils-alternatives.inc
new file mode 100644
index 0000000..09d98a4
--- /dev/null
+++ b/recipes/findutils/findutils-alternatives.inc
@@ -0,0 +1,12 @@
+do_install_append() {
+	cd ${D}${bindir} && mv find find.findutils
+	cd ${D}${bindir} && mv xargs xargs.findutils
+}
+
+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-native_4.2.29.bb b/recipes/findutils/findutils-native_4.2.29.bb
index cb6d72f..ab5c637 100644
--- a/recipes/findutils/findutils-native_4.2.29.bb
+++ b/recipes/findutils/findutils-native_4.2.29.bb
@@ -4,4 +4,6 @@ inherit native
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
 
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
+
 S = "${WORKDIR}/findutils-${PV}"
diff --git a/recipes/findutils/findutils-native_4.4.bb b/recipes/findutils/findutils-native_4.4.2.bb
similarity index 100%
rename from recipes/findutils/findutils-native_4.4.bb
rename to recipes/findutils/findutils-native_4.4.2.bb
diff --git a/recipes/findutils/findutils_4.2.29.bb b/recipes/findutils/findutils_4.2.29.bb
index 6de63af..1d82471 100644
--- a/recipes/findutils/findutils_4.2.29.bb
+++ b/recipes/findutils/findutils_4.2.29.bb
@@ -1,13 +1,8 @@
 require findutils.inc
+require findutils-alternatives.inc
+
+PR = "r2"
 
 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.2.bb b/recipes/findutils/findutils_4.4.2.bb
new file mode 100644
index 0000000..5c0686d
--- /dev/null
+++ b/recipes/findutils/findutils_4.4.2.bb
@@ -0,0 +1,6 @@
+require findutils.inc
+require findutils-alternatives.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
diff --git a/recipes/findutils/findutils_4.4.bb b/recipes/findutils/findutils_4.4.bb
deleted file mode 100644
index 844f206..0000000
--- a/recipes/findutils/findutils_4.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require findutils.inc
-
-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
-}