summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 16:30:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 16:38:42 (GMT)
commit287d01851846b14bf5378077f5d8c9edf0fa4121 (patch)
treefd0b17819249154f0e58069864514154a5d44f93 /meta/recipes-extended
parent40f95685e6a3b4359d2ab2fea1418fe5e4bd0aa1 (diff)
downloadpoky-287d01851846b14bf5378077f5d8c9edf0fa4121.tar.gz
gettext/awk/sed/grep: Backport WARNING fixes to GPLv2 versions
(From OE-Core rev: b60d0c57a2e16d690fd11c6349917efc57630004) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/gawk/gawk_3.1.5.bb5
-rw-r--r--meta/recipes-extended/grep/grep_2.5.1a.bb1
-rw-r--r--meta/recipes-extended/sed/sed_4.1.2.bb1
3 files changed, 7 insertions, 0 deletions
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
index bd8460d..d5d9bea 100644
--- 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"
33ALTERNATIVE_PATH = "gawk" 33ALTERNATIVE_PATH = "gawk"
34ALTERNATIVE_LINK = "${bindir}/awk" 34ALTERNATIVE_LINK = "${bindir}/awk"
35ALTERNATIVE_PRIORITY = "100" 35ALTERNATIVE_PRIORITY = "100"
36
37do_install_append() {
38 # remove the link since we don't package it
39 rm ${D}${bindir}/awk
40}
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index bb4f53f..64064fc 100644
--- 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 () {
27 mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN} 27 mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
28 mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN} 28 mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
29 mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN} 29 mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
30 rmdir ${D}${bindir}/
30} 31}
31 32
32pkg_postinst_${PN} () { 33pkg_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 713524c..8baa180 100644
--- 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 () {
18 autotools_do_install 18 autotools_do_install
19 install -d ${D}${base_bindir} 19 install -d ${D}${base_bindir}
20 mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${PN} 20 mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${PN}
21 rmdir ${D}${bindir}/
21} 22}
22 23
23ALTERNATIVE_NAME = "sed" 24ALTERNATIVE_NAME = "sed"