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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-extended/gawk/gawk_4.1.1.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb
index b990ce93c45070dd7ec29ed6319474885f36c52e..a81be3137a9c447a1a3823a0f594cbe422d97073 100644 (file)
--- 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"
 
 DEPENDS += "readline"
 
-RDEPENDS_gawk += "gawk-common"
-RDEPENDS_pgawk += "gawk-common"
-
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
            file://run-ptest \
 "
@@ -25,14 +22,9 @@ SRC_URI[sha256sum] = "556464bd2e4bc5a0fad4526b59623e4be40b4c2f4c663dfaaf246af6e2
 
 inherit autotools gettext texinfo update-alternatives
 
-PACKAGES += "gawk-common pgawk dgawk"
-
-FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
-FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/* ${libdir}/${BPN}/*.so"
-FILES_pgawk = "${bindir}/pgawk*"
+FILES_${PN} += "${datadir}/awk"
 FILES_${PN}-dev += "${libdir}/${BPN}/*.la"
 FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
-FILES_dgawk = "${bindir}/dgawk*"
 
 ALTERNATIVE_${PN} = "awk"
 ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"