Skip to contentSkip to conversation

packagegroup-meta-perl: Update to represent latest recipes

PATCH New Khem Raj 1 participant 5 messages Sep 2, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 packagegroup-meta-perl: Update to represent latest recipes

Add packagegroup-meta-perl-ptest to PROVIDES

---
 .../packagegroups/packagegroup-meta-perl.bb   | 102 +++++++++++++-----
 1 file changed, 76 insertions(+), 26 deletions(-)
meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb +76 -26
index 9b2406ba61..3fa56d4390 100644
@@ -3,40 +3,87 @@ SUMMARY = "Meta-perl packagegroup"
 inherit packagegroup
 
 PROVIDES = "${PACKAGES}"
-PACKAGES = ' \
+PACKAGES = "\
     packagegroup-meta-perl \
     packagegroup-meta-perl-extended \
-'
+    ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-perl-ptest-packages", "", d)} \
+"
 
 RDEPENDS_packagegroup-meta-perl = "\
-    libproc-waitstat-perl libmoo-perl libterm-readkey-perl \
-    libunicode-linebreak-perl libcurses-perl libmime-types-perl \
-    libmime-charset-perl libio-socket-ssl-perl libio-stringy-perl \
-    libtext-iconv-perl libtext-charwidth-perl libtext-diff-perl \
-    libtext-wrapi18n-perl liblocale-gettext-perl libdata-hexdump-perl \
-    libextutils-installpaths-perl libextutils-helpers-perl libextutils-parsexs-perl \
-    libextutils-config-perl libextutils-cppguess-perl libimport-into-perl \
-    libcrypt-openssl-rsa-perl libcrypt-openssl-guess-perl libcrypt-openssl-random-perl \
-    libxml-sax-writer-perl libxml-libxml-perl libxml-filter-buffertext-perl \
     adduser \
-    libauthen-sasl-perl libnet-ldap-perl libnet-dns-perl \
-    libnet-dns-sec-perl libnet-libidn-perl libnet-ssleay-perl \
-    libnet-telnet-perl libdevel-globaldestruction-perl libipc-signal-perl \
-    librole-tiny-perl libencode-perl libencode-locale-perl \
-    libfile-slurp-perl libcapture-tiny-perl \
+    libalgorithm-diff-perl \
+    libauthen-sasl-perl \
+    libauthen-radius-perl \
+    libcapture-tiny-perl \
+    libcgi-perl \
+    libdbd-sqlite-perl \
+    libclass-method-modifiers-perl \
+    libdigest-hmac-perl \
+    libdigest-sha1-perl \
+    libconfig-autoconf-perl \
+    libcrypt-openssl-guess-perl \
+    libcrypt-openssl-random-perl \
+    libcrypt-openssl-rsa-perl \
+    libhtml-parser-perl \
+    libhtml-tree-perl \
+    libhtml-tagset-perl \
+    libimport-into-perl \
+    libio-socket-ssl-perl \
+    libio-stringy-perl \
+    libipc-signal-perl \
+    libcurses-perl \
+    libmime-charset-perl \
+    libmime-types-perl \
+    libmodule-pluggable-perl \
+    libmodule-runtime-perl \
+    libmodule-build-tiny-perl \
+    libdata-hexdump-perl \
+    libnet-dns-perl \
+    libnet-libidn-perl \
+    libnet-dns-sec-perl \
+    libnet-ldap-perl \
+    libnet-ssleay-perl \
+    libnet-telnet-perl \
+    libproc-waitstat-perl \
+    libdevel-globaldestruction-perl \
+    libenv-perl \
+    libfile-slurp-perl \
+    libfile-slurper-perl \
+    libtext-iconv-perl \
+    libtext-diff-perl \
+    libtext-charwidth-perl \
+    libtext-wrapi18n-perl \
+    libxml-libxml-perl \
+    libxml-filter-buffertext-perl \
+    libxml-sax-writer-perl \
+    libextutils-config-perl \
+    libextutils-cppguess-perl \
+    libextutils-helpers-perl \
+    libextutils-installpaths-perl \
+    libextutils-parsexs-perl \
+    liblocale-gettext-perl \
+    libmoo-perl \
+    librole-tiny-perl \
+    libunix-statgrab \
+    libstrictures-perl \
+    libsub-exporter-progressive-perl \
+    libsub-uplevel-perl \
+    libterm-readkey-perl \
+    libtest-deep-perl \
+    libtest-harness-perl \
+    libtest-nowarnings-perl \
+    libtest-warn-perl \
+    libtest-warnings-perl \
+    libunicode-linebreak-perl \
     po4a \
-    libstrictures-perl libtest-harness-perl libsub-exporter-progressive-perl \
-    libclass-method-modifiers-perl libhtml-parser-perl libhtml-tree-perl \
-    libmodule-pluggable-perl libmodule-build-perl libmodule-runtime-perl \
-    libmodule-build-tiny-perl libcgi-perl libalgorithm-diff-perl \
-    libdbd-sqlite-perl libdigest-sha1-perl libdigest-hmac-perl \
-    " 
+"
 
 RDEPENDS_packagegroup-meta-perl-extended = "\
-    logcheck mime-construct \
-    "
+    logcheck \
+    mime-construct \
+"
 
-RDEPENDS_packagegroup-meta-perl-ptest = "\
+RDEPENDS_packagegroup-meta-perl-ptest-packages = "\
     libmime-types-perl-ptest \
     libio-socket-ssl-perl-ptest \
     libdata-hexdump-perl-ptest \
@@ -47,6 +94,9 @@ RDEPENDS_packagegroup-meta-perl-ptest = "\
     libtest-harness-perl-ptest \
     libdigest-sha1-perl-ptest \
     libdigest-hmac-perl-ptest \
-    "
+"
 
 EXCLUDE_FROM_WORLD = "1"
+
+# perl-module-encode is preferred over libencode-perl
+# libencode-locale-perl depends on libencode-perl
Signature · 1 line
2.28.0
author
#1 lore raw

PATCH 2/5 po4a: Switch to github for SRC_URI as alioth one seems to be gone

---
 meta-perl/recipes-perl/po4a/po4a_0.49.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-perl/recipes-perl/po4a/po4a_0.49.bb +1 -1
index 5db5b8f8bc..1b3aca5618 100644
@@ -6,7 +6,7 @@ HOMEPAGE = "https://po4a.alioth.debian.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a96fc9b4cc36d80659e694ea109f0325"
 
-SRC_URI = "git://alioth.debian.org/anonscm/git/po4a/po4a.git;protocol=https"
+SRC_URI = "git://github.com/mquinson/po4a.git;protocol=https"
 
 # v0.49
 SRCREV = "79ed87a577a543538fe39c7b60079981f5997072"
Signature · 1 line
2.28.0
author
#2 lore raw

PATCH 3/5 libdata-hexdump-perl: Use update alternatives for hexdump

In reply to Khem Raj

Hexdump can come from busybox or util-linux, therefore its better to define it via u-a so it can live along with these packages

---
 .../recipes-perl/libdata/libdata-hexdump-perl_0.02.bb      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb +6 -1
index 6ab5a42043..44c651c4c2 100644
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "1a9d843e7f667c1c6f77c67af5d77e7462ff23b41937cb17454d03535c
 
 S = "${WORKDIR}/Data-HexDump-${PV}"
 
-inherit cpan ptest
+inherit cpan ptest update-alternatives
 
 do_install_ptest () {
     install -d ${D}${PTEST_PATH}/t
@@ -31,3 +31,8 @@ do_install_ptest () {
 }
 
 BBCLASSEXTEND = "native"
+
+ALTERNATIVES_PRIORITY = "100"
+ALTERNATIVE_${PN} = "hexdump"
+ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump"
+
Signature · 1 line
2.28.0
author
#3 lore raw

PATCH 4/5 meta-perl-image: Add packagegroup-meta-perl-extended

In reply to Khem Raj
---
 meta-perl/recipes-perl/images/meta-perl-image.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-perl/recipes-perl/images/meta-perl-image.bb +1 -1
index c10d20a647..b8d3a76e6a 100644
@@ -2,4 +2,4 @@ require  meta-perl-base.bb
 
 SUMMARY = "meta-perl build test image"
 
-IMAGE_INSTALL += "packagegroup-meta-perl"
+IMAGE_INSTALL += "packagegroup-meta-perl packagegroup-meta-perl-extended"
Signature · 1 line
2.28.0
author
#4 lore raw

PATCH 5/5 meta-perl-ptest-image: Depend on ptest DISTRO_FEATURE

In reply to Khem Raj
---
 meta-perl/recipes-perl/images/meta-perl-ptest-image.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta-perl/recipes-perl/images/meta-perl-ptest-image.bb +4 -0
index 3b776f814c..a9b4cc3c7d 100644
@@ -2,4 +2,8 @@ require  meta-perl-base.bb
 
 SUMMARY = "meta-perl build ptest image"
 
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES += "ptest"
+
 IMAGE_INSTALL += "packagegroup-meta-perl-ptest"
Signature · 1 line
2.28.0