Patchwork [2/2] gawk: remove dgawk and pgawk packages, merge gawk-common into gawk

login
register
mail settings
Submitter Ross Burton
Date June 6, 2014, 3:48 p.m.
Message ID <1402069681-17929-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/73419/
State New
Headers show

Comments

Ross Burton - June 6, 2014, 3:48 p.m.
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>
---
 meta/recipes-extended/gawk/gawk_4.1.1.bb |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
Khem Raj - June 7, 2014, 10:50 a.m.
On Fri, Jun 6, 2014 at 8:48 AM, Ross Burton <ross.burton@intel.com> wrote:
> -PACKAGES += "gawk-common pgawk dgawk"

would it make sense to have RPROVIDES
Ross Burton - June 9, 2014, 10:50 a.m.
On 7 June 2014 11:50, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Jun 6, 2014 at 8:48 AM, Ross Burton <ross.burton@intel.com> wrote:
>> -PACKAGES += "gawk-common pgawk dgawk"
>
> would it make sense to have RPROVIDES

dgawk and pgawk were debugging and profiling gawk frontends, and
whilst the new gawk binary has the same functionality it doesn't have
compatibility binaries.  So no, I don't think it's sensible to have
RPROVIDES in this case.

Ross

Patch

diff --git a/meta/recipes-extended/gawk/gawk_4.1.1.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb
index b990ce9..a81be31 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"
 
 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"