diff options
author | Ross Burton <ross.burton@intel.com> | 2014-06-06 16:48:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:24:18 +0100 |
commit | 54f1528f93ec0e8a62365f2cdce7e6db16cb62ff (patch) | |
tree | 0e58ebfb9b12ba0432e215cf15e69b925761afa0 | |
parent | e1acb6d65a7b572171fce95200e98f5340b8aab3 (diff) | |
download | poky-54f1528f93ec0e8a62365f2cdce7e6db16cb62ff.tar.gz |
gawk: remove dgawk and pgawk packages, merge gawk-common into gawk
The dgawk and pgawk commands no longer exist in gawk 4.1 onwards, replaced by
options to gawk.
Remove the dgawk and pgawk binary packages, and merge gawk-common into gawk as
it is needless splitting.
(From OE-Core rev: 20f749de439aa962f32a3f4f5977fd44c9e76e33)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/gawk/gawk_4.1.1.bb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-extended/gawk/gawk_4.1.1.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb index b990ce93c4..a81be3137a 100644 --- a/meta/recipes-extended/gawk/gawk_4.1.1.bb +++ b/meta/recipes-extended/gawk/gawk_4.1.1.bb | |||
@@ -13,9 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
13 | 13 | ||
14 | DEPENDS += "readline" | 14 | DEPENDS += "readline" |
15 | 15 | ||
16 | RDEPENDS_gawk += "gawk-common" | ||
17 | RDEPENDS_pgawk += "gawk-common" | ||
18 | |||
19 | SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ | 16 | SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ |
20 | file://run-ptest \ | 17 | file://run-ptest \ |
21 | " | 18 | " |
@@ -25,14 +22,9 @@ SRC_URI[sha256sum] = "556464bd2e4bc5a0fad4526b59623e4be40b4c2f4c663dfaaf246af6e2 | |||
25 | 22 | ||
26 | inherit autotools gettext texinfo update-alternatives | 23 | inherit autotools gettext texinfo update-alternatives |
27 | 24 | ||
28 | PACKAGES += "gawk-common pgawk dgawk" | 25 | FILES_${PN} += "${datadir}/awk" |
29 | |||
30 | FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk" | ||
31 | FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/* ${libdir}/${BPN}/*.so" | ||
32 | FILES_pgawk = "${bindir}/pgawk*" | ||
33 | FILES_${PN}-dev += "${libdir}/${BPN}/*.la" | 26 | FILES_${PN}-dev += "${libdir}/${BPN}/*.la" |
34 | FILES_${PN}-dbg += "${libexecdir}/awk/.debug" | 27 | FILES_${PN}-dbg += "${libexecdir}/awk/.debug" |
35 | FILES_dgawk = "${bindir}/dgawk*" | ||
36 | 28 | ||
37 | ALTERNATIVE_${PN} = "awk" | 29 | ALTERNATIVE_${PN} = "awk" |
38 | ALTERNATIVE_TARGET[awk] = "${bindir}/gawk" | 30 | ALTERNATIVE_TARGET[awk] = "${bindir}/gawk" |