findutils: fix update-alternatives and native packages
PATCH 1/1 findutils: fix update-alternatives and native packages
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, probably not compatible with old glibc 2.6.1 (staging/armv4t-angstrom-linux-gnueabi/usr/include/stdio.h:654: error: conflicting types for 'rpl_fseeko'), findutils-native-4.4.2 is ok.
--- recipes/findutils/findutils-alternatives.inc | 12 ++++++++++++ recipes/findutils/findutils-native_4.2.29.bb | 2 ++ recipes/findutils/findutils-native_4.4.2.bb | 9 +++++++++ recipes/findutils/findutils-native_4.4.bb | 9 --------- recipes/findutils/findutils.inc | 5 ----- recipes/findutils/findutils_4.2.29.bb | 11 ++--------- recipes/findutils/findutils_4.4.2.bb | 6 ++++++ recipes/findutils/findutils_4.4.bb | 14 -------------- 8 files changed, 31 insertions(+), 37 deletions(-) create mode 100644 recipes/findutils/findutils-alternatives.inc create mode 100644 recipes/findutils/findutils-native_4.4.2.bb delete mode 100644 recipes/findutils/findutils-native_4.4.bb create mode 100644 recipes/findutils/findutils_4.4.2.bb delete mode 100644 recipes/findutils/findutils_4.4.bb
recipes/findutils/findutils-alternatives.inc new file +12 -0
@@ -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 +}
recipes/findutils/findutils-native_4.2.29.bb +2 -0
@@ -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}"
recipes/findutils/findutils-native_4.4.2.bb new file +9 -0
@@ -0,0 +1,9 @@ +require findutils.inc + +inherit native + +DEFAULT_PREFERENCE = "-1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" + +S = "${WORKDIR}/findutils-${PV}"
recipes/findutils/findutils-native_4.4.bb deleted +0 -9
@@ -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}"
recipes/findutils/findutils.inc +0 -5
@@ -12,8 +12,3 @@ inherit autotools gettext # because it uses __mempcpy, there are other things (TBD: # see diffutils.mk in buildroot) EXTRA_OECONF_linux-uclibc += "--without-included-regex" - -do_install_append() { - cd ${D}${bindir} && mv find find.findutils - cd ${D}${bindir} && mv xargs xargs.findutils -}
recipes/findutils/findutils_4.2.29.bb +2 -9
@@ -1,15 +1,8 @@ require findutils.inc +require findutils-alternatives.inc -PR = "r1" +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 -}
recipes/findutils/findutils_4.4.2.bb new file +6 -0
@@ -0,0 +1,6 @@ +require findutils.inc +require findutils-alternatives.inc + +DEFAULT_PREFERENCE = "-1" + +EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
recipes/findutils/findutils_4.4.bb deleted +0 -14
@@ -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 -}
Signature · 1 line
1.6.5.rc1
Quoted 4 lines · Martin.Jansa
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, probably not compatible with old glibc 2.6.1 (staging/armv4t-angstrom-linux-gnueabi/usr/include/stdio.h:654: error: conflicting types for 'rpl_fseeko'), findutils-native-4.4.2 is ok
Anything with rpl_* is usually a replacement function for the real thing. I suspect the autoconf site files need updating to cope with seeko. The iperf recipe has a tweak to avoid using rpl_malloc, maybe something analogous can be done with findutils.
regards,
Koen