diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-perl | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-perl')
11 files changed, 88 insertions, 15 deletions
diff --git a/meta-openembedded/meta-perl/README b/meta-openembedded/meta-perl/README index 3c787f417..67f291079 100644 --- a/meta-openembedded/meta-perl/README +++ b/meta-openembedded/meta-perl/README @@ -52,7 +52,7 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core - branch: thud + branch: master revision: HEAD prio: default @@ -75,12 +75,14 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org with -'[meta-perl][thud]' in the subject. +'[meta-perl]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-perl][thud][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-perl][PATCH' -Thud maintainers: Armin kuster <akuster808@gmail.com> +Layer maintainers: + Hongxu Jia <hongxu.jia@windriver.com> + Tim "moto-timo" Orling <ticotimo@gmail.com> License ------- diff --git a/meta-openembedded/meta-perl/conf/layer.conf b/meta-openembedded/meta-perl/conf/layer.conf index b2bb37910..6e600aa67 100644 --- a/meta-openembedded/meta-perl/conf/layer.conf +++ b/meta-openembedded/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "thud" +LAYERSERIES_COMPAT_perl-layer = "thud warrior" diff --git a/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.19.bb b/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.20.bb index 873ac2b10..10b281a66 100644 --- a/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.19.bb +++ b/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.20.bb @@ -14,8 +14,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c93c0550bd3173f4504b2cbd8991e50b" SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.xz \ file://99_logcheck \ " -SRC_URI[md5sum] = "7b50d10da6f185228627c55fdd51f624" -SRC_URI[sha256sum] = "06294c092b2115eca3d054c57778718c91dd2e0fd1c46650b7343c2a92672ca9" +SRC_URI[md5sum] = "1c6e9a97f9cc485353c25147cb99fb25" +SRC_URI[sha256sum] = "9fb6d02b933470d0b1d1efb54ea186e0d0d27336f9d146be592f65ce60dfb3e6" + +S = "${WORKDIR}/${BPN}" inherit useradd diff --git a/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb b/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb index 660a7f777..e695c5894 100644 --- a/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb +++ b/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb @@ -22,7 +22,7 @@ do_install() { install -m 0755 ${S}/adduser ${D}${sbindir} install -m 0755 ${S}/deluser ${D}${sbindir} - install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl/${@get_perl_version(d)}/Debian/AdduserCommon.pm + install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl5/${@get_perl_version(d)}/Debian/AdduserCommon.pm sed -i -e "s/VERSION/${PV}/" ${D}${sbindir}/* install -d ${D}/${sysconfdir} diff --git a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-base.bb b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-base.bb new file mode 100644 index 000000000..ec671020d --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-per build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb new file mode 100644 index 000000000..c10d20a64 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-image.bb @@ -0,0 +1,5 @@ +require meta-perl-base.bb + +SUMMARY = "meta-perl build test image" + +IMAGE_INSTALL += "packagegroup-meta-perl" diff --git a/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb new file mode 100644 index 000000000..3b776f814 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb @@ -0,0 +1,5 @@ +require meta-perl-base.bb + +SUMMARY = "meta-perl build ptest image" + +IMAGE_INSTALL += "packagegroup-meta-perl-ptest" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.060.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.066.bb index 20f880829..7609846d6 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.060.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.066.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://search.cpan.org/dist/IO-Socket-SSL/" SECTION = "libs" LICENSE = "Artistic-1.0|GPLv1+" -LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8" +LIC_FILES_CHKSUM = "file://META.yml;beginline=12;endline=12;md5=963ce28228347875ace682de56eef8e8" RDEPENDS_${PN} += "\ libnet-ssleay-perl \ @@ -22,8 +22,8 @@ RDEPENDS_${PN} += "\ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "97fa6cd64f15db60f810cd8ab02d57fc" -SRC_URI[sha256sum] = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c" +SRC_URI[md5sum] = "ecf96ce2ff9e04a03a2d101c76ce1020" +SRC_URI[sha256sum] = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd" S = "${WORKDIR}/IO-Socket-SSL-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.18.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.19.bb index 4e0c9c446..b0be604f8 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.18.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.19.bb @@ -9,8 +9,8 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[md5sum] = "67af7e5c1c339f60c45c1054374bd8ee" -SRC_URI[sha256sum] = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3" +SRC_URI[md5sum] = "8a40402888487b853f861d21433f341a" +SRC_URI[sha256sum] = "206278bdd9a538bec3e45b50e80cc5a9d7dc6e70ebf0889ef78254f0f710ccd7" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb index 1f1840118..9753520ae 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb @@ -30,8 +30,8 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}. LIC_FILES_CHKSUM = "file://debian/copyright;md5=64eda1bc135f0ece1d1187f2a8ac82c1 \ file://LICENSE;md5=97871bde150daeb5e61ad95137ff2446 \ " -SRC_URI[libxml.md5sum] = "43546fd9a3974f19323f9fb04861ece9" -SRC_URI[libxml.sha256sum] = "721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476" +SRC_URI[libxml.md5sum] = "dce687dd8b7e82d1c359fd74b1852f64" +SRC_URI[libxml.sha256sum] = "f0bca4d0c2da35d879fee4cd13f352014186cedab27ab5e191f39b5d7d4f46cf" S = "${WORKDIR}/XML-LibXML-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb b/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb new file mode 100644 index 000000000..9d0e33baf --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb @@ -0,0 +1,52 @@ +SUMMARY = "Meta-perl packagegroup" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-meta-perl \ + packagegroup-meta-perl-extended \ +' + +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 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 \ + 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 \ + " + +RDEPENDS_packagegroup-meta-perl-ptest = "\ + libmime-types-perl-ptest \ + libio-socket-ssl-perl-ptest \ + libdata-hexdump-perl-ptest \ + libauthen-sasl-perl-ptest \ + libnet-dns-perl-ptest \ + libnet-dns-sec-perl-ptest \ + libnet-ssleay-perl-ptest \ + libtest-harness-perl-ptest \ + libdigest-sha1-perl-ptest \ + libdigest-hmac-perl-ptest \ + " + +EXCLUDE_FROM_WORLD = "1" |