gettext/awk/sed/grep: Backport WARNING fixes to GPLv2 versions

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 73e5f55f9978b1ae78462d5a5793f3814b3bfa52..0b7dfa30e11c4e434cee6c58404dd57d7bbacb1e 100644 (file)
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -31,7 +31,7 @@ PARALLEL_MAKE = ""
 
 inherit autotools
 
-EXTRA_OECONF += "--without-lisp --disable-csharp --disable-openmp"
+EXTRA_OECONF += "--without-lisp --disable-csharp --disable-openmp --without-emacs"
 acpaths = '-I ${S}/autoconf-lib-link/m4/ \
            -I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'
@@ -53,3 +53,7 @@ do_configure_prepend() {
 PACKAGES =+ "libgettextlib libgettextsrc"
 FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
 FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
+do_install_append() {
+       rm -f ${D}${libdir}/preloadable_libintl.so
+}

diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
index bd8460d79e53ab194c0fc6ea143f6049f2327b6b..d5d9beaa49288a1d536ade77d90f164cad7f9d70 100644 (file)
--- a/meta/recipes-extended/gawk/gawk_3.1.5.bb
+++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb
@@ -33,3 +33,8 @@ ALTERNATIVE_NAME = "awk"
 ALTERNATIVE_PATH = "gawk"
 ALTERNATIVE_LINK = "${bindir}/awk"
 ALTERNATIVE_PRIORITY = "100"
+
+do_install_append() {
+       # remove the link since we don't package it
+       rm ${D}${bindir}/awk
+}

diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index bb4f53fb0238de075c17699f9cc174ef124038fb..64064fc5c66f7234f68455516be3bda5813142b8 100644 (file)
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -27,6 +27,7 @@ do_install () {
        mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
        mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
        mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
+       rmdir ${D}${bindir}/
 }
 
 pkg_postinst_${PN} () {

diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 713524c41d882b00c783aa877a6d7eb7faad0260..8baa180f720cdb7433380fd6974f1b5392b2ee21 100644 (file)
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -18,6 +18,7 @@ do_install () {
        autotools_do_install
        install -d ${D}${base_bindir}
        mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${PN}
+       rmdir ${D}${bindir}/
 }
 
 ALTERNATIVE_NAME = "sed"