diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-07-25 00:24:21 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-07-25 00:26:47 +0300 |
commit | 748a483a8f515f7aa0ce999ebeeebed4ed17ae10 (patch) | |
tree | aeeb8e6537070fade4adb84332cb9d5bc52ed4d2 /meta-openembedded | |
parent | b7d2861976669d4f6decc55762ba83fe0371d6d5 (diff) | |
download | openbmc-748a483a8f515f7aa0ce999ebeeebed4ed17ae10.tar.xz |
meta-openembedded: subtree update:e93d527a33..76b83194b3
Alejandro Enedino Hernandez Samaniego (1):
Remmina: Upgrade to 1.4.7
Alistair Francis (1):
python3-obd: Add missing setuptools RDEPENDS
Andreas Müller (3):
xfce4-whiskermenu-plugin: upgrade 2.4.4 -> 2.4.5
xfce4-time-out-plugin: upgrade 1.1.0 -> 1.1.1
graphene: upgrade 1.10.0 -> 1.10.2
Andrej Valek (1):
python3-xlsxwriter: add recipe for v 1.2.9
Aníbal Limón (1):
recipes-graphics: Add parallel-deqp-runner recipe
Armin Kuster (10):
python3-flask-babel: update to 1.0.0 and consolidate
python3-fastnumbers: Add new package
python3-icu: add new package
python3-natsort: add new package
python3-croniter: Fix missing rdep
python3-gmpy2: add new package
python3-ecdsa: add package
python3-rsa: add new package
python3-gnupg: add new package
python3-qrcode: add package
Changqing Li (2):
rsyslog: get alias of syslog back
radvd: add /etc/radvd.conf
Christian Eggers (2):
networkmanager: Package nmcli separately
networkmanager: Fix udev dependency
Colin McAllister (4):
python3-cantools: Added recipe
python3-dateparser: Added recipe
python3-diskcache: Added recipe
python3-bitstruct: Added recipe
Dmitry Baryshkov (1):
recipes-graphics: add Khronos OpenGL ES and Vulkan CTS recipes
Julius Hemanth Pitti (1):
netkit-telnetd: Fix buffer overflow in netoprintf
Kai Kang (1):
python3-pykickstart: 3.22 -> 3.26
Khem Raj (4):
ace: Upgrade to 6.5.10
network-manager-applet: Add missing dependency on libgudev
memcached: Upgrade to 1.6.6
samba: Fix conflicts with nss.h from glibc
Leon Anavi (12):
python3-cbor2: Upgrade 5.1.0 -> 5.1.1
python3-psutil: Upgrade 5.7.0 -> 5.7.2
python3-isort: Upgrade 4.3.21 -> 5.1.0
python3-netaddr: Upgrade 0.7.20 -> 0.8.0
python3-bitarray: Upgrade 1.2.2 -> 1.4.1
python3-pymysql: Upgrade 0.9.3 -> 0.10.0
python3-simplejson: Upgrade 3.17.0 -> 3.17.2
python3-isort: Upgrade 5.1.0 -> 5.1.4
python3-stevedore: Upgrade 2.0.1 -> 3.2.0
python3-mock: Upgrade 4.0.1 -> 4.0.2
python3-pychromecast: Upgrade 7.1.1 -> 7.1.2
python3-coverage: Upgrade 5.1 -> 5.2
Matt Hoosier (1):
glmark2: don't build full OpenGL backends by default
Mingde (Matthew) Zeng (1):
net-snmp, openjpeg: add proper CVE tags to patches
Mingli Yu (1):
freeradius: fix the existed certificate error
Ovidiu Panait (1):
nss: upgrade 3.51.1 -> 3.54
Philip Balister (1):
python3-pybind11: Use cmake to build and add -native version
Ryan Rowe (2):
python3-packaging: add -native version
python3-pint: add setuptools and packaging to RDEPENDS
Sakib Sajal (4):
python3-mock: add recipe for v4.0.1
python3-pep8: add recipe for v1.7.1
python3-mccabe: add recipe for v0.2.1
python3-requests-toolbelt: add ptest
Slater, Joseph (2):
lvm2: reproducible binaries
toybox-inittab: unpack to S
Wang Mingyu (2):
python3-idna: upgrade 2.9 -> 2.10
python3-pytz: upgrade 2019.3 -> 2020.1
Zang Ruochen (5):
python3-requests-file: Enable ptest
python3-semver: Enable ptest
python3-smpplib: Enable ptest
python3-soupsieve: Enable ptest
python3-typeguard: Enable ptest
Zheng Ruoqin (3):
babeld: upgrade 1.9.1 -> 1.9.2
wireguard-module: upgrade 1.0.20200401 -> 1.0.20200712
wireguard-tools: upgrade 1.0.20200319 -> 1.0.20200513
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I7d02cff7fbd61a6f8e1a96354e169f5f19edf023
Diffstat (limited to 'meta-openembedded')
102 files changed, 1231 insertions, 283 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb index 60e4c2205..f2bc24ea9 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb @@ -2,7 +2,7 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss" +DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" GNOMEBASEBUILDCLASS = "meson" inherit features_check gnomebase gsettings gtk-icon-cache gettext diff --git a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb index f715dd23d..ef1898610 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb @@ -9,8 +9,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc -SRC_URI[archive.md5sum] = "07f72436bc7a85d12f5edd9fcedd0184" -SRC_URI[archive.sha256sum] = "406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499" +SRC_URI[archive.md5sum] = "a2c26c4f44a02ca053e0e9afb63cc94c" +SRC_URI[archive.sha256sum] = "e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch new file mode 100644 index 000000000..669f363e7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch @@ -0,0 +1,55 @@ +From 084f5467672f2ae37003b77e8f8706772f3da3ec Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 13 Jul 2020 07:01:45 +0000 +Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error + +Fixes: + # ./bootstrap + [snip] +openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key 'whatever' -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf +Using configuration from ./client.cnf +Check that the request matches the signature +Signature ok +ERROR:There is already a certificate for /C=FR/ST=Radius/O=Example Inc./CN=user@example.org/emailAddress=user@example.org +The matching entry has the following details +Type :Valid +Expires on :200908024833Z +Serial Number :02 +File name :unknown +Subject Name :/C=FR/ST=Radius/O=Example Inc./CN=user@example.org/emailAddress=user@example.org +make: *** [Makefile:128: client.crt] Error 1 + +Add the check to fix the above error and it does the same for server.crt. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + raddb/certs/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile +index 5cbfd467ce..77eec9baa1 100644 +--- a/raddb/certs/Makefile ++++ b/raddb/certs/Makefile +@@ -92,7 +92,7 @@ server.csr server.key: server.cnf + chmod g+r server.key + + server.crt: server.csr ca.key ca.pem +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf ++ @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf + + server.p12: server.crt + $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) +@@ -117,7 +117,7 @@ client.csr client.key: client.cnf + chmod g+r client.key + + client.crt: client.csr ca.pem ca.key +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf ++ @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf + + client.p12: client.crt + $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb index 005ca47da..d2046d72e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://freeradius-fix-error-for-expansion-of-macro.patch \ file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ file://0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch \ + file://0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index 5eb2aefa7..4e4217c1f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb @@ -11,7 +11,7 @@ DEPENDS = " \ intltool-native \ libxslt-native \ libnl \ - libgudev \ + udev \ util-linux \ libndp \ libnewt \ @@ -85,6 +85,7 @@ PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" PACKAGES =+ " \ + ${PN}-nmcli ${PN}-nmcli-doc \ ${PN}-nmtui ${PN}-nmtui-doc \ ${PN}-adsl ${PN}-cloud-setup \ " @@ -134,6 +135,14 @@ FILES_${PN}-dev += " \ ${libdir}/NetworkManager/${PV}/*.la \ " +FILES_${PN}-nmcli = " \ + ${bindir}/nmcli \ +" + +FILES_${PN}-nmcli-doc = " \ + ${mandir}/man1/nmcli* \ +" + FILES_${PN}-nmtui = " \ ${bindir}/nmtui \ ${bindir}/nmtui-edit \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch new file mode 100644 index 000000000..2dbabdaa4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch @@ -0,0 +1,96 @@ +From 9aba5ac17bb822f91f6b214f5b82dd1eb8c47616 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Jul 2020 22:42:09 -0700 +Subject: [PATCH] nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h + +glibc 2.32 will define these varibles [1] which results in conflicts +with these static function names, therefore prefix these function names +with samba_ to avoid it + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=499a92df8b9fc64a054cf3b7f728f8967fc1da7d + +Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/-/merge_requests/1477] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + nsswitch/nsstest.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c +index 6d92806..46f9679 100644 +--- a/nsswitch/nsstest.c ++++ b/nsswitch/nsstest.c +@@ -137,7 +137,7 @@ static struct passwd *nss_getpwuid(uid_t uid) + return &pwd; + } + +-static void nss_setpwent(void) ++static void samba_nss_setpwent(void) + { + NSS_STATUS (*_nss_setpwent)(void) = + (NSS_STATUS(*)(void))find_fn("setpwent"); +@@ -152,7 +152,7 @@ static void nss_setpwent(void) + } + } + +-static void nss_endpwent(void) ++static void samba_nss_endpwent(void) + { + NSS_STATUS (*_nss_endpwent)(void) = + (NSS_STATUS (*)(void))find_fn("endpwent"); +@@ -284,7 +284,7 @@ again: + return &grp; + } + +-static void nss_setgrent(void) ++static void samba_nss_setgrent(void) + { + NSS_STATUS (*_nss_setgrent)(void) = + (NSS_STATUS (*)(void))find_fn("setgrent"); +@@ -299,7 +299,7 @@ static void nss_setgrent(void) + } + } + +-static void nss_endgrent(void) ++static void samba_nss_endgrent(void) + { + NSS_STATUS (*_nss_endgrent)(void) = + (NSS_STATUS (*)(void))find_fn("endgrent"); +@@ -396,7 +396,7 @@ static void nss_test_users(void) + { + struct passwd *pwd; + +- nss_setpwent(); ++ samba_nss_setpwent(); + /* loop over all users */ + while ((pwd = nss_getpwent())) { + printf("Testing user %s\n", pwd->pw_name); +@@ -418,14 +418,14 @@ static void nss_test_users(void) + printf("initgroups: "); nss_test_initgroups(pwd->pw_name, pwd->pw_gid); + printf("\n"); + } +- nss_endpwent(); ++ samba_nss_endpwent(); + } + + static void nss_test_groups(void) + { + struct group *grp; + +- nss_setgrent(); ++ samba_nss_setgrent(); + /* loop over all groups */ + while ((grp = nss_getgrent())) { + printf("Testing group %s\n", grp->gr_name); +@@ -446,7 +446,7 @@ static void nss_test_groups(void) + printf("getgrgid: "); print_group(grp); + printf("\n"); + } +- nss_endgrent(); ++ samba_nss_endgrent(); + } + + static void nss_test_errors(void) +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb index 2c74c27fb..01250cb43 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb @@ -27,6 +27,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ + file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ " SRC_URI_append_libc-musl = " \ file://samba-pam.patch \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf new file mode 100644 index 000000000..c006f8631 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf @@ -0,0 +1,18 @@ +# NOTE: there is no such thing as a working "by-default" configuration file. +# At least the prefix needs to be specified. Please consult the radvd.conf(5) +# man page and/or /usr/share/doc/radvd-*/radvd.conf.example for help. +# +# +#interface eth0 +#{ +# AdvSendAdvert on; +# MinRtrAdvInterval 30; +# MaxRtrAdvInterval 100; +# prefix 2001:db8:1:0::/64 +# { +# AdvOnLink on; +# AdvAutonomous on; +# AdvRouterAddr off; +# }; +# +#}; diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc index 59a07d78d..802dbe34e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc @@ -18,7 +18,8 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ file://radvd.service \ file://volatiles.03_radvd \ - file://radvd.default" + file://radvd.default \ + file://radvd.conf" inherit autotools useradd pkgconfig systemd @@ -52,6 +53,8 @@ do_install_append () { for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ done + + install -m 0644 ${WORKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb index 73199592c..bc94e29ea 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb @@ -1,6 +1,6 @@ require wireguard.inc -SRCREV = "43f57dac7b8305024f83addc533c9eede6509129" +SRCREV = "d553aa7c52ac78c1963886afb74ba861b0b7b0fc" SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb index f698b9a9a..c24e3438c 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb @@ -1,6 +1,6 @@ require wireguard.inc -SRCREV = "a8063adc8ae9b4fc9848500e93f94bee8ad2e585" +SRCREV = "c45d422a93d57f6fdec429640ff7f96b396beed4" SRC_URI = "git://git.zx2c4.com/wireguard-tools" inherit bash-completion systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch new file mode 100644 index 000000000..8f983e40a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch @@ -0,0 +1,56 @@ +From 9c81c8e5bc7782e8ae12c078615abc3c896059f2 Mon Sep 17 00:00:00 2001 +From: Julius Hemanth Pitti <jpitti@cisco.com> +Date: Tue, 14 Jul 2020 22:34:19 -0700 +Subject: [PATCH] telnetd/utility.c: Fix buffer overflow in netoprintf + +As per man page of vsnprintf, when formated +string size is greater than "size"(2nd argument), +then vsnprintf returns size of formated string, +not "size"(2nd argument). + +netoprintf() was not handling a case where +return value of vsnprintf is greater than +"size"(2nd argument), results in buffer overflow +while adjusting "nfrontp" pointer to point +beyond "netobuf" buffer. + +Here is one such case where "nfrontp" +crossed boundaries of "netobuf", and +pointing to another global variable. + +(gdb) p &netobuf[8255] +$5 = 0x55c93afe8b1f <netobuf+8255> "" +(gdb) p nfrontp +$6 = 0x55c93afe8c20 <terminaltype> "\377" +(gdb) p &terminaltype +$7 = (char **) 0x55c93afe8c20 <terminaltype> +(gdb) + +This resulted in crash of telnetd service +with segmentation fault. + +Though this is DoS security bug, I couldn't +find any CVE ID for this. + +Upstream-Status: Pending + +Signed-off-by: Julius Hemanth Pitti <jpitti@cisco.com> +--- + telnetd/utility.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/telnetd/utility.c b/telnetd/utility.c +index b9a46a6..4811f14 100644 +--- a/telnetd/utility.c ++++ b/telnetd/utility.c +@@ -66,7 +66,7 @@ netoprintf(const char *fmt, ...) + len = vsnprintf(nfrontp, maxsize, fmt, ap); + va_end(ap); + +- if (len<0 || len==maxsize) { ++ if (len<0 || len>=maxsize) { + /* didn't fit */ + netflush(); + } +-- +2.19.1 diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index 0e92add63..08dd532b6 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -13,6 +13,7 @@ SRC_URI = "http://ftp.linux.org.uk/pub/linux/Networking/netkit/${BP}.tar.gz \ file://0001-telnet-telnetd-Fix-print-format-strings.patch \ file://0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch \ file://CVE-2020-10188.patch \ + file://0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netkit-telnet/" diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb index 6dd15ad9f..a7d7fc81f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb @@ -13,7 +13,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" -SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" +SRCREV = "a1043879225ac205614259b480d7f577025d8bb0" UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch index 3e2637eaa..ec1b6de8f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch @@ -8,9 +8,11 @@ This patch fixes https://sourceforge.net/p/net-snmp/bugs/2956/. Upstream-Status: Backport [ak: fixup for 5.8 context, changes to library/snmpusm.h] -CVE:CVE-2019-20892 + +CVE: CVE-2019-20892 Signed-off-by: Armin Kuster <akuster@mvista.com> +Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> --- snmplib/snmp_client.c | 22 +++---------- diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch new file mode 100644 index 000000000..e4aa8fda3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch @@ -0,0 +1,74 @@ +From b9040acdba1245f8cdf5e94384830e3d04fde98a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Jul 2020 21:32:14 -0700 +Subject: [PATCH] Replace sigignore with signal API + +sigignore has been deprecated in glibc 2.32+ [1] and eventually it will be +removed, therefore substitute it + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=02802fafcf6e11ea3f998f685035ffe568dfddeb + +Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/702] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + memcached.c | 16 ++-------------- + 2 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ffc98b2..4567b30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -630,7 +630,6 @@ AC_CHECK_FUNCS(mlockall) + AC_CHECK_FUNCS(getpagesizes) + AC_CHECK_FUNCS(sysconf) + AC_CHECK_FUNCS(memcntl) +-AC_CHECK_FUNCS(sigignore) + AC_CHECK_FUNCS(clock_gettime) + AC_CHECK_FUNCS(preadv) + AC_CHECK_FUNCS(pread) +diff --git a/memcached.c b/memcached.c +index 9cb778d..91ced9e 100644 +--- a/memcached.c ++++ b/memcached.c +@@ -8292,18 +8292,6 @@ static void sig_usrhandler(const int sig) { + stop_main_loop = GRACE_STOP; + } + +-#ifndef HAVE_SIGIGNORE +-static int sigignore(int sig) { +- struct sigaction sa = { .sa_handler = SIG_IGN, .sa_flags = 0 }; +- +- if (sigemptyset(&sa.sa_mask) == -1 || sigaction(sig, &sa, 0) == -1) { +- return -1; +- } +- return 0; +-} +-#endif +- +- + /* + * On systems that supports multiple page sizes we may reduce the + * number of TLB-misses by using the biggest available page size +@@ -9996,7 +9984,7 @@ int main (int argc, char **argv) { + /* daemonize if requested */ + /* if we want to ensure our ability to dump core, don't chdir to / */ + if (do_daemonize) { +- if (sigignore(SIGHUP) == -1) { ++ if (signal(SIGHUP, SIG_IGN) == SIG_ERR) { + perror("Failed to ignore SIGHUP"); + } + if (daemonize(maxcore, settings.verbose) == -1) { +@@ -10146,7 +10134,7 @@ int main (int argc, char **argv) { + * ignore SIGPIPE signals; we can use errno == EPIPE if we + * need that information + */ +- if (sigignore(SIGPIPE) == -1) { ++ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { + perror("failed to ignore SIGPIPE; sigaction"); + exit(EX_OSERR); + } +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch index 544b840fe..45428ed23 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch @@ -9,24 +9,19 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 7f22f21..21691b9 100644 --- a/configure.ac +++ b/configure.ac -@@ -314,7 +314,12 @@ fi - dnl ---------------------------------------------------------------------------- +@@ -488,8 +488,12 @@ if test "x$enable_static" = "xyes"; then + fi - AC_SEARCH_LIBS(umem_cache_create, umem) --AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) + dnl ---------------------------------------------------------------------------- +AC_ARG_ENABLE(hugetlbfs, + [AS_HELP_STRING([--enable-hugetlbfs],[Enable hugetlbfs])]) -+ + +-AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) +if test "x$enable_hugetlbfs" = "xyes"; then + AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) +fi AC_HEADER_STDBOOL AH_BOTTOM([#if HAVE_STDBOOL_H --- -1.8.3.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb index feb4f3f14..2eb24db9a 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb @@ -21,9 +21,9 @@ RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ + file://0001-Replace-sigignore-with-signal-API.patch \ " -SRC_URI[md5sum] = "4b64296ea0eeccdee9168c035e0488ab" -SRC_URI[sha256sum] = "cfd7b023a9cefe7ae8a67184f51d841dbbf97994ed0e8a55e31ee092320ea1e4" +SRC_URI[sha256sum] = "908f0eecfa559129c9e44edc46f02e73afe8faca355b4efc5c86d902fc3e32f7" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 6d20bbdaf..82821ad63 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -24,9 +24,9 @@ inherit waf pkgconfig features_check REQUIRED_DISTRO_FEATURES += "opengl" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl x11-gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ - drm-gl drm-gles2" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \ + drm-gles2" PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb index e35bce7f3..df194f95a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb @@ -3,16 +3,16 @@ DESCRIPTION = "C++ network programming framework that implements many core \ patterns for concurrent communication software" LICENSE = "ACE-TAO-CIAO" HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" -LIC_FILES_CHKSUM = "file://COPYING;md5=96ef88a5529594698e8ceabdd47df92c" +LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_10/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ + file://no_sysctl.patch \ " -SRC_URI[md5sum] = "a6ba6a944612fe0696c90cbb5c3078ee" -SRC_URI[sha256sum] = "cda2a960dbb9970a907663627711b2e2b14b3484a2859ae936370bcad0b16923" +SRC_URI[sha256sum] = "90de437926928e98e9fd9132c7c3e886ca79f25567adeccbc24a5996f230d8e2" COMPATIBLE_HOST_libc-musl = "null" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch new file mode 100644 index 000000000..278893114 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch @@ -0,0 +1,22 @@ +glibc >= 2.32 has removed sys/sysctl.h see + +https://sourceware.org/git/?p=glibc.git;a=commit;h=076f09afbac1aa57756faa7a8feadb7936a724e4 + +This check therefore ensures that its only used on linux when glibc has support for it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/ace/config-linux.h ++++ b/ace/config-linux.h +@@ -20,6 +20,10 @@ + + #include "ace/config-linux-common.h" + ++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32) ++# define ACE_LACKS_SYS_SYSCTL_H ++#endif ++ + #define ACE_HAS_BYTESEX_H + + #if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb index 9af1e3f14..f82f8e9ce 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb @@ -2,10 +2,12 @@ SUMMARY = "Toybox Inittab Configuration" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-0-Clause;md5=81eeb0083e31f11ab1e33ded846d521c" +# Unpack to ${S}/orig +# SRC_URI = "\ - file://inittab \ - file://rcK \ - file://rcS \ + file://inittab;subdir=${BP}/orig \ + file://rcK;subdir=${BP}/orig \ + file://rcS;subdir=${BP}/orig \ " PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -15,6 +17,9 @@ RCONFLICTS_${PN} = "\ sysvinit-inittab \ " +# Just being sure. +B = "${S}" + # most users may want to have getty enabled by default PACKAGECONFIG ??= "getty" @@ -26,9 +31,7 @@ do_patch[noexec] = "1" do_configure() { # copy over files now to have a fresh start on each config - for f in inittab rcK rcS; do - cp ${WORKDIR}/$f ${S} - done + cp orig/* . for config in ${PACKAGECONFIG_CONFARGS}; do if [[ ${config} == "enable_getty" ]]; then diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb index ff6699509..524cd9ead 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb @@ -152,6 +152,10 @@ do_install_append() { install -d 0755 ${D}${sysconfdir}/rsyslog.d echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf fi + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service + sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service + fi } FILES_${PN} += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch index 9f2fc901f..1e14149c8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch @@ -4,6 +4,10 @@ Date: Sat, 11 Jan 2020 01:51:19 +0100 Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228) +CVE: CVE-2020-6851 + +Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> + --- src/lib/openjp2/j2k.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch index cb250530e..6158601af 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch @@ -6,6 +6,10 @@ Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow That could lead to later assertion failures. Fixes #1231 / CVE-2020-8112 + +CVE: CVE-2020-8112 + +Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> --- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch new file mode 100644 index 000000000..0fedfad13 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch @@ -0,0 +1,42 @@ +From 2b74a5b160c0500291c554ab5c0944f502e72a42 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> +Date: Thu, 9 Jul 2020 20:00:53 +0200 +Subject: [PATCH] meson.build: WORKAROUND Remove vulkan dependency +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need a patch in the source code to allow enable when DISTRO_FEATURES +contains vulkan. + +Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index db97c26..4c1b865 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,21 +3,15 @@ project('parallel-deqp-runner', ['c', 'cpp'], + cpp = meson.get_compiler('cpp') + + thread_dep = dependency('threads') +-vulkan_dep = dependency('vulkan') + + fs_dep = cpp.find_library('stdc++fs', required : false) + if not fs_dep.found() + fs_dep = cpp.find_library('c++fs') + endif + +- + deqp_runner = executable('deqp-runner', + 'src/deqp-runner.cc', + dependencies : [thread_dep, fs_dep], + install : true) + +-executable('hang-detection', +- 'src/hang_detection.c', +- dependencies: [vulkan_dep]) +- + subdir('test') diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb new file mode 100644 index 000000000..4c02cc55a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -0,0 +1,14 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa" + +SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https \ + file://0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch \ + " + +# Modify these as desired +PV = "2020.06.15+git${SRCPV}" +SRCREV = "e1642fb691d29b1462504b58916f7f514a963e80" + +S = "${WORKDIR}/git" + +inherit pkgconfig meson diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch new file mode 100644 index 000000000..b4573b38b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -0,0 +1,15 @@ +Index: git/external/glslang/src/glslang/Include/PoolAlloc.h +=================================================================== +--- git.orig/external/glslang/src/glslang/Include/PoolAlloc.h ++++ git/external/glslang/src/glslang/Include/PoolAlloc.h +@@ -240,8 +240,9 @@ protected: + + int numCalls; // just an interesting statistic + size_t totalBytes; // just an interesting statistic +-private: ++public: + TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator ++private: + TPoolAllocator(const TPoolAllocator&); // don't allow default copy constructor + }; + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch new file mode 100644 index 000000000..4116ae7d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -0,0 +1,24 @@ +Index: git/framework/delibs/dethread/CMakeLists.txt +=================================================================== +--- git.orig/framework/delibs/dethread/CMakeLists.txt ++++ git/framework/delibs/dethread/CMakeLists.txt +@@ -39,6 +39,7 @@ include_directories( + + if (DE_OS_IS_UNIX) + add_definitions(-D_GNU_SOURCE) ++ add_definitions(-D_XOPEN_SOURCE=600) + set(DETHREAD_LIBS ${DETHREAD_LIBS} pthread) + endif () + +Index: git/framework/qphelper/CMakeLists.txt +=================================================================== +--- git.orig/framework/qphelper/CMakeLists.txt ++++ git/framework/qphelper/CMakeLists.txt +@@ -28,6 +28,7 @@ set(QPHELPER_LIBS + if (DE_OS_IS_UNIX OR DE_OS_IS_QNX) + # For vsnprintf() + add_definitions(-D_XOPEN_SOURCE=600) ++ set(QPHELPER_LIBS ${QPHELPER_LIBS} execinfo) + endif () + + if (DE_OS_IS_WIN32 AND DE_COMPILER_IS_MSC) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc new file mode 100644 index 000000000..bd75cdb1f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -0,0 +1,36 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "\ + git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;tag=${BPN}-${PV};name=vk-gl-cts \ + git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools \ + https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ +" + +S = "${WORKDIR}/git" + +SRCREV_FORMAT = "vk-gl-cts" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" + +SRC_URI_append_libc-musl = "\ + file://fix-musl.patch \ +" +DEPENDS_append_libc-musl = " libexecinfo" + +SRC_URI_append_toolchain-clang = "\ + file://fix-clang-private-operator.patch \ +" + +EXTRA_OECMAKE_append = " -DDEQP_TARGET=surfaceless" + +CTSDIR = "/usr/lib/${BPN}" + +FILES_${PN} += "${CTSDIR}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb new file mode 100644 index 000000000..3e336e45c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "OpenGL CTS" + +require khronos-cts.inc + +SRCREV_amber = "d26ee22dd7faab1845a531d410f7ec1db407402a" +SRCREV_glslang = "c538b5d796fb24dd418fdd650c7f76e56bcc3dd8" +SRCREV_spirv-headers = "e4322e3be589e1ddd44afb20ea842a977c1319b8" +SRCREV_spirv-tools = "1eb89172a82b436d8037e8a8c29c80f7e1f7df74" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} + rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles + rm -r ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb new file mode 100644 index 000000000..77064d4ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Vulkan CTS" + +require khronos-cts.inc + +SRCREV_amber = "a40bef4dba98d2d80b48e5a940d8574fbfceb197" +SRCREV_glslang = "b5f003d7a3ece37db45578a8a3140b370036fc64" +SRCREV_spirv-headers = "f8bf11a0253a32375c32cad92c841237b96696c0" +SRCREV_spirv-tools = "d2b486219495594f2e5d0e8d457fc234a3460b3b" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" +inherit features_check + +DEPENDS += " vulkan-loader" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ + rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles +} diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch new file mode 100644 index 000000000..db598a88c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -0,0 +1,24 @@ +configure.ac: override CONFIGURE_LINE + +For reproducible binaries, we need to report a constant CONFIGURE_LINE. +This patched is only applied for such builds. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + + +--- git.orig/configure.ac ++++ git/configure.ac +@@ -15,7 +15,10 @@ AC_PREREQ(2.69) + ################################################################################ + dnl -- Process this file with autoconf to produce a configure script. + AC_INIT +-CONFIGURE_LINE="$0 $@" ++dnl The default CONFIGURE_LINE has been overridden for reproducible binaries ++dnl CONFIGURE_LINE="$0 $@" ++CONFIGURE_LINE="configure parameters are not available for reproducible builds" ++ + AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) + AC_CONFIG_HEADERS([include/configure.h]) + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 01c9df45c..ab618b436 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,7 +15,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + ${@bb.utils.contains('BUILD_REPRODUCIBLE_BINARIES','1','file://reproducible-build.patch','', d)} \ " + SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch deleted file mode 100644 index 90ec379c6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8cf7afb5417e23cd3ebf8141239bf020f5dd2ac8 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 30 Apr 2020 06:56:09 +0000 -Subject: [PATCH] Enable uint128 on mips64 - -Fix below error: -| verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:22:1: error: 'FStar_UInt128___proj__Mkuint128__item__low' declared 'static' but never defined [-Werror=unused-function] -| 22 | FStar_UInt128___proj__Mkuint128__item__low(FStar_UInt128_uint128 projectee); - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - .../freebl/verified/kremlin/include/kremlin/internal/types.h | 3 ++- - .../kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -index 801e78f..cdac61e 100644 ---- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -57,7 +57,8 @@ typedef const char *Prims_string; - typedef __m128i FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__riscv) && __riscv_xlen == 64)) -+ (defined(__riscv) && __riscv_xlen == 64) || \ -+ defined(__mips64)) - typedef unsigned __int128 FStar_UInt128_uint128; - #else - typedef struct FStar_UInt128_uint128_s { -diff --git a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -index f38fda3..7ca67d2 100644 ---- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -26,7 +26,8 @@ - #include <stdint.h> - #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__riscv) && __riscv_xlen == 64)) -+ (defined(__riscv) && __riscv_xlen == 64) || \ -+ defined(__mips64)) - - /* GCC + using native unsigned __int128 support */ - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index c380c1449..1a87a0577 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -1,4 +1,4 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 +From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 18 Dec 2019 12:29:50 +0100 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto @@ -8,10 +8,14 @@ prior to armv8 does not. Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) + nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/gcm.c | 2 ++ + 2 files changed, 6 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index f99f769..b0ec81b 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -125,6 +125,9 @@ else @@ -22,9 +26,9 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2 + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c +@@ -148,6 +151,7 @@ endif endif endif endif @@ -32,9 +36,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include <limits.h> @@ -42,7 +48,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ #define USE_ARM_GCM #endif diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index d5403397e..3d90e2d95 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 +From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 22 Feb 2017 11:36:11 +0200 Subject: [PATCH] nss: fix support cross compiling @@ -8,13 +8,14 @@ Let some make variables be assigned from outside makefile. Upstream-Status: Inappropriate [configuration] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- nss/coreconf/arch.mk | 2 +- nss/lib/freebl/Makefile | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 +index 790372d..2563134 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk @@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) @@ -27,7 +28,7 @@ index 06c276f..9c1eb51 100644 # diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 +index 52d827c..f99f769 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -36,6 +36,12 @@ ifdef USE_64 @@ -43,6 +44,3 @@ index 0ce1425..ebeb411 100644 ifdef USE_ABI32_FPU DEFINES += -DNSS_USE_ABI32_FPU endif --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch index de812d27b..e87dc9f76 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -1,3 +1,8 @@ +From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss,nspr: Add recipes + clang 3.9 add this warning to rightly flag undefined behavior, we relegate this to be just a warning instead of error and keep the behavior as it was. Right fix would @@ -18,10 +23,14 @@ for more details Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk +--- + nss/coreconf/Werror.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk +index a569a49..687fe58 100644 +--- a/nss/coreconf/Werror.mk ++++ b/nss/coreconf/Werror.mk @@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS ifdef CC_IS_CLANG # -Qunused-arguments : clang objects to arguments that it doesn't understand diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch index 547594d5b..6f02dbcb4 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -1,82 +1,56 @@ -nss: fix incorrect shebang of perl +From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait <ovidiu.panait@windriver.com> +Date: Mon, 13 Jul 2020 12:12:31 +0300 +Subject: [PATCH] nss: fix incorrect shebang of perl Replace incorrect shebang of perl with `#!/usr/bin/env perl'. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Upstream-Status: Pending +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + --- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) + nss/cmd/signver/examples/1/form.pl | 2 +- + nss/cmd/signver/examples/1/signedForm.pl | 2 +- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/iopr/server_scr/client.cgi | 2 +- + nss/tests/path_uniq | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime +diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl +index f2cfddc..af58d54 100755 +--- a/nss/cmd/signver/examples/1/form.pl ++++ b/nss/cmd/signver/examples/1/form.pl @@ -1,4 +1,4 @@ --#!/usr/local/bin/perl +-#! /usr/bin/perl +#!/usr/bin/env perl - # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl +index 847814c..64a31ff 100755 +--- a/nss/cmd/signver/examples/1/signedForm.pl ++++ b/nss/cmd/signver/examples/1/signedForm.pl @@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl +-#! /usr/bin/perl +#!/usr/bin/env perl - # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +index e67f6be..6cd85e6 100755 +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # + # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 +index d2a4942..3ba7323 100644 --- a/nss/coreconf/version.pl +++ b/nss/coreconf/version.pl @@ -1,4 +1,4 @@ @@ -86,7 +60,7 @@ index d2a4942..79359fe 100644 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 +index 4de9555..c15a069 100755 --- a/nss/tests/clean_tbx +++ b/nss/tests/clean_tbx @@ -1,4 +1,4 @@ @@ -95,8 +69,18 @@ index 4de9555..a7def9f 100755 ####################################################################### # +diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi +index 581ad06..34ea170 100644 +--- a/nss/tests/iopr/server_scr/client.cgi ++++ b/nss/tests/iopr/server_scr/client.cgi +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 +index f29f60a..850332a 100755 --- a/nss/tests/path_uniq +++ b/nss/tests/path_uniq @@ -1,4 +1,4 @@ @@ -105,6 +89,3 @@ index f29f60a..08fbffa 100755 ######################################################################## # --- -1.8.1.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch index 43c09d13e..fbfa828b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -1,4 +1,7 @@ -Fix nss multilib build on openSUSE 11.x 32bit +From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will fail with error: @@ -16,10 +19,15 @@ Upstream-Status: Pending Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> =================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile + +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2..e97fb5f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile @@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 include $(DEPTH)/coreconf/config.mk @@ -33,4 +41,4 @@ Index: nss-3.24/nss/coreconf/nsinstall/Makefile + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) PROGRAM = - else + TARGETS = diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch index 7661dc93a..7dbc1a372 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -1,12 +1,17 @@ -nss:no rpath for cross compiling +From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss:no rpath for cross compiling Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Upstream-Status: Inappropriate [configuration] + --- nss/cmd/platlibs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +index 6401778..e5c4e16 100644 --- a/nss/cmd/platlibs.mk +++ b/nss/cmd/platlibs.mk @@ -18,9 +18,9 @@ endif @@ -21,6 +26,3 @@ diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk endif endif --- -1.8.1.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 3a817faaa..5505ae36a 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -1,4 +1,8 @@ -nss does not build on mips with clang because wrong types are used? +From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss does not build on mips with clang because wrong types are + used? pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] if (addend < MP_DIGIT_MAX) { @@ -6,11 +10,16 @@ pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in + +--- + nss/lib/freebl/pqg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c +index 626b2fb..052ad36 100644 +--- a/nss/lib/freebl/pqg.c ++++ b/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) static SECStatus addToSeed(const SECItem *seed, diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch deleted file mode 100644 index aef91a7c3..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch +++ /dev/null @@ -1,36 +0,0 @@ -Enable uint128 on riscv64 - -Fixes -| verified/kremlin/kremlib/dist/minimal/LowStar_Endianness.h:29:37: error: 'load128_be' declared 'static' but never defined [-Werror=unused-function] -| 29 | inline static FStar_UInt128_uint128 load128_be(uint8_t *x0); -| | ^~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -56,7 +56,8 @@ typedef const char *Prims_string; - #include <emmintrin.h> - typedef __m128i FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) -+ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) - typedef unsigned __int128 FStar_UInt128_uint128; - #else - typedef struct FStar_UInt128_uint128_s { ---- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -23,9 +23,10 @@ - #include "FStar_UInt128.h" - #include "FStar_UInt_8_16_32_64.h" - #include "LowStar_Endianness.h" -- -+#include <stdint.h> - #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) -+ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) - - /* GCC + using native unsigned __int128 support */ - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.54.bb index 36e6cd8fc..4923f6868 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.54.bb @@ -32,12 +32,9 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://riscv.patch \ - file://0001-Enable-uint128-on-mips64.patch \ " -SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233" -SRC_URI[sha256sum] = "085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78" +SRC_URI[sha256sum] = "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -127,7 +124,8 @@ do_compile() { export CC="${CC} ${CFLAGS}" make -C ./nss CCC="${CXX} -g" \ OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" + RPATH="${RPATH}" \ + autobuild } do_compile[vardepsexclude] += "SITEINFO_BITS" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb index 3c93493f7..661673d6b 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb @@ -11,7 +11,7 @@ LDFLAGS_append_libc-musl = " -lexecinfo" SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "3ed23be326be0bf3c98428c1b4f4c948c1ded2048bd27f107380e12574797930" +SRC_URI[sha256sum] = "7614d447dc588403aff2ff97b253f46c5f03a6347d024618e84490b8ab4cd87b" S = "${WORKDIR}/Remmina-v${PV}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc index adf26e027..4968f1072 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/kjd/idna" LICENSE = "BSD-3-Clause & Python-2.0 & Unicode" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=cf36c8682cc154d2d4aa57bd6246b9a1" -SRC_URI[md5sum] = "870b8b80267f00f0faf1b7ba4bdbf14e" -SRC_URI[sha256sum] = "7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb" +SRC_URI[md5sum] = "7a910c706db30d758f377db2762c0f9a" +SRC_URI[sha256sum] = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6" RDEPENDS_${PN}_class-target = "\ ${PYTHON_PN}-codecs \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc new file mode 100644 index 000000000..f5d56db00 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc @@ -0,0 +1,11 @@ +SUMMARY = "Python 2 and 3 compatibility library" +HOMEPAGE = "https://xlsxwriter.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0960d52d61b0801760f39463288c2672" + +inherit pypi + +PYPI_PACKAGE = "XlsxWriter" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb deleted file mode 100644 index c495738c4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" -HOMEPAGE = "https://github.com/ilanschnell/bitarray" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=d331e1d54f5e78247388f5416c2ab928" - -SRC_URI[md5sum] = "81c48852b0bc538ac3ed25fae020360c" -SRC_URI[sha256sum] = "27a69ffcee3b868abab3ce8b17c69e02b63e722d4d64ffd91d659f81e9984954" - -inherit setuptools3 pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb new file mode 100644 index 000000000..4866e8464 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" +HOMEPAGE = "https://github.com/ilanschnell/bitarray" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" + +SRC_URI[md5sum] = "dfb3fe66ae989e4724747fcb0f704f56" +SRC_URI[sha256sum] = "9e26d3dc7fad932fed66e08da3fcf93dd15e8402aa84e764e1e2a9e1b6ae2b7f" + +inherit setuptools3 pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb new file mode 100644 index 000000000..a25380418 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "This module performs conversions between Python values and C bit field structs represented as Python byte strings." +HOMEPAGE = "https://github.com/eerimoq/bitstruct" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[md5sum] = "8eaf853c95e10ca4b6bca2fe5ff307c6" +SRC_URI[sha256sum] = "2b13f2c3e76b49e8cd854f7a1da590bb73ecbc6cbfacc2d479eacf2b88282d5d" + +PYPI_PACKAGE = "bitstruct" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb new file mode 100644 index 000000000..a9638fbd2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "CAN BUS tools in Python 3." +HOMEPAGE = "https://github.com/eerimoq/cantools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[md5sum] = "46b71bbfec33146d9dbba708489a8ae2" +SRC_URI[sha256sum] = "bd0ac5b16bb7fe2ada0c9436c91a0b3795217bed7126296dde1565919a3f44f1" + +PYPI_PACKAGE = "cantools" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb index 812539941..6b26da2a6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb @@ -4,7 +4,8 @@ DEPENDS +="${PYTHON_PN}-setuptools-scm-native" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "43ce11e8c2fe4971d386d1a60cf83bfa0a4a667b97668ba76acbf5e6398821aa" +SRC_URI[sha256sum] = "09e9607ea50e2ebb718791d475f11620cb244b0cc3758ce2e76cf36e8372ad64" +SRC_URI[md5sum] = "b034d7edfd22c1f98e600aaedbd90f39" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb index 7265d2c97..72558e10c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[md5sum] = "506e30fb011158abe5ce92f39866b271" -SRC_URI[sha256sum] = "f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052" +SRC_URI[md5sum] = "bfe80a336636160a3916467f55842bc5" +SRC_URI[sha256sum] = "1874bdc943654ba46d28f179c1846f5710eda3aeb265ff029e0ac2b52daae404" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb index 0c28948f6..123d17613 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b149 inherit pypi setuptools3 -RDEPENDS_${PN} += " python3-dateutil" +RDEPENDS_${PN} += " python3-dateutil python3-natsort" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb new file mode 100644 index 000000000..e4683911e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Provides modules to easily parse localized dates in almost any string formats commonly found on web pages" +HOMEPAGE = "https://github.com/scrapinghub/dateparser" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" + +SRC_URI[md5sum] = "78b4bf317f9b844631562abad5ce040b" +SRC_URI[sha256sum] = "e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa" + +PYPI_PACKAGE = "dateparser" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-tzlocal \ + ${PYTHON_PN}-ruamel-yaml \ +" + +# Ommitted ${PYTHON_PN}-convertdate, ${PYTHON_PN}-jdatetime ${PYTHON_PN}-umalqurra diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb new file mode 100644 index 000000000..91cff0cd1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Disk Cache -- Disk and file backed persistent cache." +HOMEPAGE = "http://www.grantjenks.com/docs/diskcache/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9e046ce8fae71087134866418f646ec3" + +SRC_URI[md5sum] = "21c9945e7707799e1c64956f8a54d4c3" +SRC_URI[sha256sum] = "bcee5a59f9c264e2809e58d01be6569a3bbb1e36a1e0fb83f7ef9b2075f95ce0" + +PYPI_PACKAGE = "diskcache" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb new file mode 100644 index 000000000..aba62f3ef --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb @@ -0,0 +1,13 @@ +SUMMARY = "ECDSA cryptographic signature library (pure python)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=66ffc5e30f76cbb5358fe54b645e5a1d" + +DEPENDS += "python3-pip python3-pbr" + +PYPI_PACKAGE = "ecdsa" +SRC_URI[sha256sum] = "8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-six python3-gmpy2 python3-pbr" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb new file mode 100644 index 000000000..b0ecb9d56 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Super-fast and clean conversions to numbers." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f797665cf3d3e0fdc0d488f5200c6f55" + +PYPI_PACKAGE = "fastnumbers" +SRC_URI[sha256sum] = "93ce2f9516fbf2bbf46c85e4abef783cc569e5fbbc665352efb9cdddbae517ec" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb deleted file mode 100644 index 104e7c28f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-flask-babel.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_1.0.0.bb index 0e507f337..d968be3ee 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_1.0.0.bb @@ -2,12 +2,11 @@ DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" -SRC_URI[md5sum] = "fcf2f360ff279d3133e40974804efd72" -SRC_URI[sha256sum] = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86" +SRC_URI[sha256sum] = "d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e" PYPI_PACKAGE = "Flask-Babel" -inherit pypi +inherit pypi setuptools3 RDEPENDS_${PN} += "\ ${PYTHON_PN}-speaklater \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb new file mode 100644 index 000000000..c6edcbb32 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb @@ -0,0 +1,13 @@ +SUMMARY = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x" +SECTION = "devel/python" +LICENSE = "GPL-3.0 | LGPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS += "gmp mpfr libmpc" + +PYPI_PACKAGE = "gmpy2" +PYPI_PACKAGE_EXT = "zip" +SRC_URI[sha256sum] = "dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb new file mode 100644 index 000000000..ff0a91c6f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "A wrapper for the Gnu Privacy Guard (GPG or GnuPG)" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b0b7ac63b60085b23fa9f7e1951daa1d" + +PYPI_PACKAGE = "python-gnupg" +SRC_URI[sha256sum] = "3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "gnupg-gpg" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch new file mode 100644 index 000000000..1b6e89043 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch @@ -0,0 +1,30 @@ +Fixed host contamination of include files + +python3-icu-2.5-r0 do_package_qa: QA Issue: python3-icu: The compile log indicates that host include and/or library paths were used. + +Also, don't use icu-config + +Upstream-Status: [inappropriate] OE specific +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: PyICU-2.5/setup.py +=================================================================== +--- PyICU-2.5.orig/setup.py ++++ PyICU-2.5/setup.py +@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU ma + + CONFIGURE_WITH_ICU_CONFIG = { + 'darwin': True, +- 'linux': True, ++ 'linux': False, + 'freebsd': False, # not tested + 'win32': False, # no icu-config + 'sunos5': False, # not tested +@@ -274,7 +274,6 @@ setup(name="PyICU", + ext_modules=[Extension('_icu', + [filename for filename in sorted(os.listdir(os.curdir)) + if filename.endswith('.cpp')], +- include_dirs=_includes, + extra_compile_args=_cflags, + extra_link_args=_lflags, + libraries=_libraries)], diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb new file mode 100644 index 000000000..5e8c8a3a0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb @@ -0,0 +1,13 @@ +SUMMARY = "Python extension wrapping the ICU C++ API" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7c4bfd81a21e3b6368bdcced992bf59" + +DEPENDS += "pkgconfig icu" + +PYPI_PACKAGE = "PyICU" +SRC_URI[sha256sum] = "a120b68c53f769f37bfb70b7e84ca12c3f4ab1e4df43e87a02dff05ae472cdbc" + +SRC_URI += "file://fix_host_include.patch" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb index a08ca714a..a08ca714a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb index e0b21ab55..59ff2ffe1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb @@ -2,10 +2,10 @@ SUMMARY = "A Python utility / library to sort Python imports." HOMEPAGE = "https://pypi.python.org/pypi/isort" LICENSE = "MIT" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "05d66f2eb7ce2c2d702e86bac24bf9e4" -SRC_URI[sha256sum] = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1" +SRC_URI[md5sum] = "64d552bbcef48219572cc39649c48fbd" +SRC_URI[sha256sum] = "145072eedc4927cc9c1f9478f2d83b2fc1e6469df4129c02ef4e8c742207a46c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb new file mode 100644 index 000000000..d3a9971e4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "McCabe checker, plugin for flake8" +HOMEPAGE = "https://github.com/dreamhost/cliff" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=aa0383f6aee4f5c20084a97cd13164c4" + +SRC_URI[md5sum] = "5a3f3fa6a4bad126c88aaaa7dab682f5" +SRC_URI[sha256sum] = "5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb new file mode 100644 index 000000000..39ab6d01f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A Python Mocking and Patching Library for Testing" +HOMEPAGE = "https://pypi.python.org/pypi/mock" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-mccabe \ + ${PYTHON_PN}-pep8 \ + ${PYTHON_PN}-pyflakes" + +SRC_URI[md5sum] = "6466619b89c2969dc57722ad73f85676" +SRC_URI[sha256sum] = "dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb new file mode 100644 index 000000000..e20cdf0fa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "Simple yet flexible natural sorting in Python." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" + +PYPI_PACKAGE = "natsort" +SRC_URI[sha256sum] = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-fastnumbers python3-icu" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb index bc7598c46..a120b24f1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb @@ -2,8 +2,8 @@ SUMMARY = "A network address manipulation library for Python." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6345d695ffe3776f68a56fe7962db44" -SRC_URI[md5sum] = "f254d6b61e07123f9e2643b1dcbd03df" -SRC_URI[sha256sum] = "d09252e5aec3913815d77eb8e8ea8fa6eb33521253e52f977f6abaa964776f3e" +SRC_URI[md5sum] = "34cad578473b66ad77bc3b2a7613ed4a" +SRC_URI[sha256sum] = "d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb index eb8a5a747..8f17068a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb @@ -7,4 +7,4 @@ SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d32681 inherit setuptools3 pypi -RDEPENDS_${PN} += "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint ${PYTHON_PN}-setuptools" +RDEPENDS_${PN} += "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint ${PYTHON_PN}-setuptools ${PYTHON_PN}-packaging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb index 0f78fd016..c75707e69 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb @@ -8,5 +8,7 @@ SRC_URI[sha256sum] = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d55 inherit pypi setuptools3 +BBCLASSEXTEND = "native" + DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb new file mode 100644 index 000000000..8291281ca --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Python style guide checker" +HOMEPAGE = "https://github.com/dreamhost/cliff" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=d8ebbbe831259ce010179d2f310b0f3e" + +SRC_URI[md5sum] = "a03bb494859e87b42601b61b1b043a0c" +SRC_URI[sha256sum] = "603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f61bed8" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing" + +SRC_URI[md5sum] = "603821d06db945c71d811b5a8d78423c" +SRC_URI[sha256sum] = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb index 8e1630476..333b015a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb @@ -21,6 +21,11 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-packaging \ +" + RDEPENDS_${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb index 170819d59..d61d501e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb @@ -2,8 +2,9 @@ SUMMARY = "A cross-platform process and system utilities module for Python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" -SRC_URI[md5sum] = "ed7b0f11ed214bcabbe76b7cf52f3ae3" -SRC_URI[sha256sum] = "685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e" +PYPI_SRC_URI = "https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1/psutil-${PV}.tar.gz" +SRC_URI[md5sum] = "50bf39b4faa268ba1da8a9730bb38bb6" +SRC_URI[sha256sum] = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch new file mode 100644 index 000000000..6455c95e7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch @@ -0,0 +1,30 @@ +From 3abfa65517959ad279481021fafefba28f955e76 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@balister.org> +Date: Fri, 10 Jul 2020 10:14:59 -0400 +Subject: [PATCH] Do not check pointer size when cross compiling. + +It is reasonable to build for 32 machine on a 64 bit build machine. Prevents: +| CMake Error at tools/FindPythonLibsNew.cmake:127 (message): +| Python config failure: Python is 64-bit, chosen compiler is 32-bit + +Signed-off-by: Philip Balister <philip@balister.org> +--- + tools/FindPythonLibsNew.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake +index d0c8fa2..8479e70 100644 +--- a/tools/FindPythonLibsNew.cmake ++++ b/tools/FindPythonLibsNew.cmake +@@ -123,7 +123,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) + + # Make sure the Python has the same pointer-size as the chosen compiler + # Skip if CMAKE_SIZEOF_VOID_P is not defined +-if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) ++if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) + if(PythonLibsNew_FIND_REQUIRED) + math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") + math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") +-- +2.25.4 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch new file mode 100644 index 000000000..07ab9a03b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch @@ -0,0 +1,39 @@ +From 918f3ef01c7a67f3beb67307966698474f144581 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@balister.org> +Date: Wed, 8 Jul 2020 09:41:43 -0400 +Subject: [PATCH] Do not strip binaries. + + * OpenEmbedded strips them after creating debug packages. + +Signed-off-by: Philip Balister <philip@balister.org> +--- + tools/pybind11Tools.cmake | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +index a3603ab..b4c8f63 100644 +--- a/tools/pybind11Tools.cmake ++++ b/tools/pybind11Tools.cmake +@@ -230,19 +230,6 @@ function(pybind11_add_module target_name) + + _pybind11_add_lto_flags(${target_name} ${ARG_THIN_LTO}) + +- if (NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) +- # Strip unnecessary sections of the binary on Linux/Mac OS +- if(CMAKE_STRIP) +- if(APPLE) +- add_custom_command(TARGET ${target_name} POST_BUILD +- COMMAND ${CMAKE_STRIP} -x $<TARGET_FILE:${target_name}>) +- else() +- add_custom_command(TARGET ${target_name} POST_BUILD +- COMMAND ${CMAKE_STRIP} $<TARGET_FILE:${target_name}>) +- endif() +- endif() +- endif() +- + if(MSVC) + # /MP enables multithreaded builds (relevant when there are many files), /bigobj is + # needed for bigger binding projects due to the limit to 64k addressable sections +-- +2.25.4 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb index dc3b8f6ad..46bba8d8d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb @@ -3,7 +3,18 @@ HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" -SRC_URI[md5sum] = "5355e1fd05c8eedef19cc9bfd3d82a77" -SRC_URI[sha256sum] = "ea5a4e7a880112915463826f1acbec5892df36dfe102ecb249229ac514fb54ad" +DEPENDS = "boost" -inherit pypi setuptools3 +SRC_URI = "git://github.com/pybind/pybind11.git \ + file://0001-Do-not-strip-binaries.patch \ + file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ + " +SRCREV = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" + +EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" + +inherit cmake python3native diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb index 3da979c0f..98dbf33b2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[md5sum] = "897e7acd6ac2c01f3df2e2d6b2e13c11" -SRC_URI[sha256sum] = "87fa9ad42425edd21e02a9240669e5763e52d975ee259a948a6fe07e6ab977b9" +SRC_URI[md5sum] = "6ca5102b09009c85424a9ab628005992" +SRC_URI[sha256sum] = "adcf478d7fc539e9decde59b2db7b6a4b1d679c4cf78d515d880adb1c4bc1c30" PYPI_PACKAGE = "PyChromecast" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.0.bb index 6a64ccb16..895c47b03 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.9.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.0.bb @@ -8,8 +8,8 @@ HOMEPAGE = "https://pymysql.readthedocs.io" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" -SRC_URI[md5sum] = "e5d9183cc0a775ac29f9e0365cca6556" -SRC_URI[sha256sum] = "d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7" +SRC_URI[md5sum] = "d08058b1592724d5808c43f56050f245" +SRC_URI[sha256sum] = "e14070bc84e050e0f80bf6063e31d276f03a0bb4d46b9eca2854566c4ae19837" PYPI_PACKAGE = "PyMySQL" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb index c28a0148b..198626311 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb @@ -1,12 +1,12 @@ SUMMARY = "World timezone definitions, modern and historical" HOMEPAGE = "http://pythonhosted.org/pytz" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4878a915709225bceab739bdc2a18e8d" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" inherit pypi setuptools3 ptest -SRC_URI[md5sum] = "c3d84a465fc56a4edd52cca8873ac0df" -SRC_URI[sha256sum] = "b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" +SRC_URI[md5sum] = "0349106ac02f2bfe565dd6d5594e3a15" +SRC_URI[sha256sum] = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-datetime \ @@ -31,6 +31,6 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/pytz install -d ${D}${PTEST_PATH}/pytz/tests cp -rf ${S}/pytz/tests/* ${D}${PTEST_PATH}/pytz/tests/ - cp -f ${S}/README.txt ${D}${PTEST_PATH}/ + cp -f ${S}/README.rst ${D}${PTEST_PATH}/ } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb new file mode 100644 index 000000000..df99d403d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "QR Code image generator" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" + +PYPI_PACKAGE = "qrcode" +SRC_URI[sha256sum] = "505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-six python3-pillow" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb index 1c8bba40d..88915b8fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb @@ -6,7 +6,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9cc728d6087e43796227b0a31422de6b" SRC_URI[md5sum] = "c96daf6b0c56687556e8a52748fd896c" SRC_URI[sha256sum] = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} RDEPENDS_${PN} += " \ python3-requests \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb index 3beb39718..cb1bc607b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb @@ -5,12 +5,30 @@ AUTHOR = "Ian Cordasco, Cory Benfield" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=71760e0f1dda8cff91b0bc9246caf571" +SRC_URI = "file://run-ptest \ + " + SRC_URI[md5sum] = "b1509735c4b4cf95df2619facbc3672e" SRC_URI[sha256sum] = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0" -inherit setuptools3 -inherit pypi +inherit pypi setuptools3 ptest RDEPENDS_${PN} += " \ ${PYTHON_PN}-requests (>=2.0.1) \ " + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-betamax \ + ${PYTHON_PN}-mock \ + ${PYTHON_PN}-multiprocessing \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/setup.py ${D}${PTEST_PATH} + # remove test test_multipart_encoder.py as it fails, + # downloaded file is not supported + rm -f ${D}${PTEST_PATH}/tests/test_multipart_encoder.py +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb new file mode 100644 index 000000000..759214fa3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb @@ -0,0 +1,44 @@ +SUMMARY = "Pure-Python RSA implementation" +SECTION = "devel/python" +AUTHOR = "Sybren A. Stuvel" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" + +SRC_URI[sha256sum] = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5" + +inherit pypi setuptools3 update-alternatives + +ALTERNATIVE_${PN} = "\ + pyrsa-decrypt \ + pyrsa-decrypt-bigfile \ + pyrsa-encrypt \ + pyrsa-encrypt-bigfile \ + pyrsa-keygen \ + pyrsa-priv2pub \ + pyrsa-sign \ + pyrsa-verify \ +" + +ALTERNATIVE_LINK_NAME[pyrsa-decrypt] = "${bindir}/pyrsa-decrypt" +ALTERNATIVE_LINK_NAME[pyrsa-decrypt-bigfile] = "${bindir}/pyrsa-decrypt-bigfile" +ALTERNATIVE_LINK_NAME[pyrsa-encrypt] = "${bindir}/pyrsa-encrypt" +ALTERNATIVE_LINK_NAME[pyrsa-encrypt-bigfile] = "${bindir}/pyrsa-encrypt-bigfile" +ALTERNATIVE_LINK_NAME[pyrsa-keygen] = "${bindir}/pyrsa-keygen" +ALTERNATIVE_LINK_NAME[pyrsa-priv2pub] = "${bindir}/pyrsa-priv2pub" +ALTERNATIVE_LINK_NAME[pyrsa-sign] = "${bindir}/pyrsa-sign" +ALTERNATIVE_LINK_NAME[pyrsa-verify] = "${bindir}/pyrsa-verify" +ALTERNATIVE_PRIORITY = "30" + + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pickle \ +" + +RDEPENDS_${PN} += "${PYTHON_PN}-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest new file mode 100644 index 000000000..43c03b594 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO test_semver.py --disable-warnings| sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb index b41ef5ddc..71cb1acec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb @@ -7,6 +7,18 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665 SRC_URI[md5sum] = "3e11ae9782121e8ffe9f8a8b763a8cb5" SRC_URI[sha256sum] = "c0a4a9d1e45557297a722ee9bac3de2ec2ea79016b6ffcaca609b0bc62cf4276" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_semver.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.2.bb index b76ae5299..cab0da6a1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.2.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" -SRC_URI[md5sum] = "8a5ed75c367b90fedc3d685742e2a1c7" -SRC_URI[sha256sum] = "2b4b2b738b3b99819a17feaf118265d0753d5536049ea570b3c43b51c4701e81" +SRC_URI[md5sum] = "27fba3bc75a32318bd3b163b8a31aa7e" +SRC_URI[sha256sum] = "75ecc79f26d99222a084fbdd1ce5aad3ac3a8bd535cd9059528452da38b68841" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb index 948af58aa..15b326bad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb @@ -6,4 +6,19 @@ LIC_FILES_CHKSUM = "file://README.md;md5=56a03d0ce7e492d4b9487b8aae957efe" PYPI_PACKAGE = "smpplib" SRC_URI[sha256sum] = "df4139a279b35fbb42a58f2a254a9c6daf362b04a7f94e208dc120e0b8a3fd4b" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + sed -i 's/mock/unittest.mock/g' ${D}${PTEST_PATH}/tests/* +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb index aa087c920..ae242af56 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb @@ -7,6 +7,20 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5a6fd3b0c24fc5a041a3d1bbb22c81b5" SRC_URI[md5sum] = "62a7481c7dbf6d8cc21e4e3a79c72034" SRC_URI[sha256sum] = "a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-beautifulsoup4 \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.0.bb index cf388fa7c..0a2bffdcc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "d0f137ec4fe5d98978970671a860882d" -SRC_URI[sha256sum] = "609912b87df5ad338ff8e44d13eaad4f4170a65b79ae9cb0aa5632598994a1b7" +SRC_URI[md5sum] = "6a39764d7aecc63a0990cf4635cb430d" +SRC_URI[sha256sum] = "38791aa5bed922b0a844513c5f9ed37774b68edc609e5ab8ab8d8fe0ce4315e5" DEPENDS += "${PYTHON_PN}-pbr-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb index a0167cf03..3786ccb85 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb @@ -6,7 +6,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" SRC_URI[md5sum] = "411df8eefd76ffa014328a46342bdf38" SRC_URI[sha256sum] = "529ef3d88189cc457f4340388028412f71be8091c2c943465146d4170fb67288" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} DEPENDS += "\ python3-distutils-extra-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb new file mode 100644 index 000000000..cba856143 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb @@ -0,0 +1,5 @@ +inherit setuptools3 +require python-xlsxwriter.inc + +SRC_URI[md5sum] = "20f8b7df7f1705fa2f7ac3f84789d2ca" +SRC_URI[sha256sum] = "828b3285fc95105f5b1946a6a015b31cf388bd5378fdc6604e4d1b7839df2e77" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch index e7533f476..0e64ce420 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch @@ -32,10 +32,10 @@ index bf08ac5..aada7aa 100644 And some warning classes: KickstartWarning - A generic warning class. -@@ -131,3 +134,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): +@@ -125,3 +128,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): + """A class for warnings occurring during parsing related to using deprecated commands and options. """ - pass + +class KickstartAuthError(KickstartError): + """An exception for errors relating to authentication failed while @@ -43,7 +43,7 @@ index bf08ac5..aada7aa 100644 + """ + def __init__(self, msg): + """Create a new KickstartAuthError exception instance with the -+ descriptive message val. val should be the return value of ++ descriptive message val. val should be the return value of + formatErrorMsg. + """ + KickstartError.__init__(self, msg) @@ -125,7 +125,7 @@ diff --git a/pykickstart/parser.py b/pykickstart/parser.py index d8880eb..22d14cb 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -787,7 +787,7 @@ class KickstartParser(object): +@@ -801,7 +801,7 @@ class KickstartParser(object): i = PutBackIterator(s.splitlines(True) + [""]) self._stateMachine(i) @@ -134,7 +134,7 @@ index d8880eb..22d14cb 100644 """Process a kickstart file, given by the filename f.""" if reset: self._reset() -@@ -808,7 +808,7 @@ class KickstartParser(object): +@@ -822,7 +822,7 @@ class KickstartParser(object): self.currentdir[self._includeDepth] = cd try: diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb index 041abd3e8..7aeb5d6c9 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ " -SRCREV = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3" +SRCREV = "4c93e84c8798da511da1c05f1912d2f908f8f85f" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb index c3de5964d..f4ef3f626 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin -SRC_URI[md5sum] = "afa0ef865a49f28165098d3fe625df44" -SRC_URI[sha256sum] = "ee4a51a35076d50cba3824079f8312585373ff2f0d9ebc740d8f3c0426430a19" +SRC_URI[md5sum] = "3087b3248e427822613e5583784b0ac0" +SRC_URI[sha256sum] = "194dbeb8751d8aaedf3850a7a9c770f09d32316a99683cde34d7d0fc5bdba31d" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb index 958ee644c..65ceb8c54 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "7f6faf5ae5ca276d073798a3ff8b0e5b" -SRC_URI[sha256sum] = "624acf6d46484bb35608a76424579571423e2aefa6579f6e444f5cfb5342ff9a" +SRC_URI[md5sum] = "adb064538b2e2cbc7ddd1d8ac57cec36" +SRC_URI[sha256sum] = "f5241910ea6411840b8c9f9471f0d262ab0583150bb82f9b280eccbaadb0ebbe" RRECOMMENDS_${PN} += "menulibre" |