[oe] warrior-next pull request
I don't see any record or recall if I sent a pull request for warrior-next, so here it is. The following changes since commit 6fa72d587aab8e9d56d67a2552eb9cfbe25c86d2: aufs-util: prevent native aufs-util depending on target kernel (2019-05-23 07:03:43 -0700) are available in the git repository at: git://git.openembedded.org/meta-openembedded warrior-next for you to fetch changes up to 8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0: turbostat: copy bits.h from kernel to turbostat (2019-06-16 08:15:44 -0700) Changqing Li (1): netkit-telnet: add rconflicts Hongxu Jia (1): crash: do not use unstable github archive tarballs Liwei Song (1): turbostat: copy bits.h from kernel to turbostat Martin Jansa (14): gtkwave: add distro_features_check umip: make MACHINE_ARCH mscgen: fix SRC_URI for multilib triggerhappy: fix issues python-cassandra-driver.inc: fix DEPENDS opencv: use the same package name in PACKAGES and RDEPENDS igmpproxy: remove 0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch and _GNU_SOURCE libvncserver: set PV in the recipe ccid: fix SRC_URI ne10, libopus: add armv7ve override as well hunspell: use git fetcher instead of github archive ttf-mplus, ttf-vlgothic: add ttf-mplus license libmikmod: fix SRC_URI leptonica: fix SRC_URI Mingli Yu (1): mariadb: Upgrade to 10.3.15 qi.c...@windriver.com (1): polkit: fix CVE-2019-6133 nick83ola (1): uthash: do not use unstable github archive tarballs .../recipes-connectivity/umip/umip_1.0.bb | 3 + ...xy.h-Include-sys-types.h-for-u_short-u_in.patch | 25 --- .../recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb | 6 +- .../netkit-telnet/netkit-telnet_0.17.bb | 1 + meta-oe/licenses/ttf-mplus | 16 ++ .../packagegroups/packagegroup-meta-oe.bb | 3 +- ...native_10.3.13.bb => mariadb-native_10.3.15.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- .../{mariadb_10.3.13.bb => mariadb_10.3.15.bb} | 0 ...pare-PolkitUnixProcess-uids-for-temporary.patch | 186 + meta-oe/recipes-extended/polkit/polkit_0.115.bb | 7 +- .../{triggerhappy_0.5.0.bb => triggerhappy_git.bb} | 22 +-- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 4 + .../recipes-graphics/leptonica/leptonica_1.74.4.bb | 2 +- .../libvncserver/libvncserver_git.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- .../ttf-fonts/ttf-vlgothic_20141206.bb | 2 +- meta-oe/recipes-kernel/crash/crash_7.2.5.bb | 8 +- meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 2 + .../recipes-multimedia/libopus/libopus_1.1.3.bb | 3 +- .../recipes-multimedia/mikmod/libmikmod_3.3.6.bb | 2 +- meta-oe/recipes-support/ccid/ccid_1.4.24.bb | 4 +- meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb | 7 +- meta-oe/recipes-support/mscgen/mscgen_0.20.bb | 2 +- meta-oe/recipes-support/ne10/ne10_1.2.1.bb | 4 +- meta-oe/recipes-support/opencv/opencv_3.4.5.bb | 2 +- meta-oe/recipes-support/uthash/uthash_2.1.0.bb | 7 +- .../python/python-cassandra-driver.inc | 2 +- 28 files changed, 258 insertions(+), 70 deletions(-) delete mode 100644 meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch create mode 100644 meta-oe/licenses/ttf-mplus rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.3.13.bb => mariadb-native_10.3.15.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.3.13.bb => mariadb_10.3.15.bb} (100%) create mode 100644 meta-oe/recipes-extended/polkit/polkit/0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch rename meta-oe/recipes-extended/triggerhappy/{triggerhappy_0.5.0.bb => triggerhappy_git.bb} (73%) -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-networking] libnftnl: update to 1.1.3
Signed-off-by: Oleksandr Kravchuk --- ...ove-exports-before-symbol-definition.patch | 59 ++-- ...cal-function-as-one-of-printf-family.patch | 307 ++ .../{libnftnl_1.1.1.bb => libnftnl_1.1.3.bb} | 4 +- 3 files changed, 209 insertions(+), 161 deletions(-) rename meta-networking/recipes-filter/libnftnl/{libnftnl_1.1.1.bb => libnftnl_1.1.3.bb} (86%) diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch index 995fd59a5..699d0d922 100644 --- a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch +++ b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch @@ -1,4 +1,4 @@ -From 21eb59fbd071ebffb8495232766824944fb521a0 Mon Sep 17 00:00:00 2001 +From 6b76c76e6b3f93c422d666f49ee68df9d5426078 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Wed, 7 Nov 2018 21:19:53 + Subject: [PATCH] Move exports before symbol definition @@ -10,11 +10,11 @@ clang. Signed-off-by: Alex Kiernan --- - src/flowtable.c | 54 +++--- + src/flowtable.c | 54 - 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/flowtable.c b/src/flowtable.c -index c1ddae4..d7434e3 100644 +index 1f7ba30..80de952 100644 --- a/src/flowtable.c +++ b/src/flowtable.c @@ -34,12 +34,13 @@ struct nftnl_flowtable { @@ -49,7 +49,7 @@ index c1ddae4..d7434e3 100644 void nftnl_flowtable_unset(struct nftnl_flowtable *c, uint16_t attr) { int i; -@@ -96,7 +97,6 @@ void nftnl_flowtable_unset(struct nftnl_flowtable *c, uint16_t attr) +@@ -95,7 +96,6 @@ void nftnl_flowtable_unset(struct nftnl_flowtable *c, uint16_t attr) c->flags &= ~(1 << attr); } @@ -57,7 +57,7 @@ index c1ddae4..d7434e3 100644 static uint32_t nftnl_flowtable_validate[NFTNL_FLOWTABLE_MAX + 1] = { [NFTNL_FLOWTABLE_HOOKNUM] = sizeof(uint32_t), -@@ -105,6 +105,7 @@ static uint32_t nftnl_flowtable_validate[NFTNL_FLOWTABLE_MAX + 1] = { +@@ -104,6 +104,7 @@ static uint32_t nftnl_flowtable_validate[NFTNL_FLOWTABLE_MAX + 1] = { [NFTNL_FLOWTABLE_FLAGS] = sizeof(uint32_t), }; @@ -65,7 +65,7 @@ index c1ddae4..d7434e3 100644 int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr, const void *data, uint32_t data_len) { -@@ -170,32 +171,32 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr, +@@ -169,32 +170,32 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr, c->flags |= (1 << attr); return 0; } @@ -103,7 +103,7 @@ index c1ddae4..d7434e3 100644 const void *nftnl_flowtable_get_data(const struct nftnl_flowtable *c, uint16_t attr, uint32_t *data_len) { -@@ -229,21 +230,21 @@ const void *nftnl_flowtable_get_data(const struct nftnl_flowtable *c, +@@ -228,21 +229,21 @@ const void *nftnl_flowtable_get_data(const struct nftnl_flowtable *c, } return NULL; } @@ -127,8 +127,8 @@ index c1ddae4..d7434e3 100644 +EXPORT_SYMBOL(nftnl_flowtable_get_u32); uint32_t nftnl_flowtable_get_u32(const struct nftnl_flowtable *c, uint16_t attr) { - uint32_t data_len; -@@ -253,8 +254,8 @@ uint32_t nftnl_flowtable_get_u32(const struct nftnl_flowtable *c, uint16_t attr) + uint32_t data_len = 0; +@@ -252,8 +253,8 @@ uint32_t nftnl_flowtable_get_u32(const struct nftnl_flowtable *c, uint16_t attr) return val ? *val : 0; } @@ -137,8 +137,8 @@ index c1ddae4..d7434e3 100644 +EXPORT_SYMBOL(nftnl_flowtable_get_s32); int32_t nftnl_flowtable_get_s32(const struct nftnl_flowtable *c, uint16_t attr) { - uint32_t data_len; -@@ -264,8 +265,8 @@ int32_t nftnl_flowtable_get_s32(const struct nftnl_flowtable *c, uint16_t attr) + uint32_t data_len = 0; +@@ -263,8 +264,8 @@ int32_t nftnl_flowtable_get_s32(const struct nftnl_flowtable *c, uint16_t attr) return val ? *val : 0; } @@ -148,7 +148,7 @@ index c1ddae4..d7434e3 100644 void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_flowtable *c) { -@@ -301,7 +302,6 @@ void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr *nlh, +@@ -300,7 +301,6 @@ void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr *nlh, if (c->flags & (1 << NFTNL_FLOWTABLE_SIZE)) mnl_attr_put_u32(nlh, NFTA_FLOWTABLE_SIZE, htonl(c->size)); } @@ -156,7 +156,7 @@ index c1ddae4..d7434e3 100644 static int nftnl_flowtable_parse_attr_cb(const struct nlattr *attr, void *data) { -@@ -412,6 +412,7 @@ static int nftnl_flowtable_parse_hook(struct nlattr *attr, struct nftnl_flowtabl +@@ -415,6 +415,7 @@ static int nftnl_flowtable_parse_hook(struct nlatt
[oe] [PATCH][meta-networking] miniupnpd: update to 2.1.20190210
License checksum changed due to modified copyright years. Signed-off-by: Oleksandr Kravchuk --- ...{miniupnpd_2.1.20190210.bb => miniupnpd_2.1.20190630.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-networking/recipes-connectivity/miniupnpd/{miniupnpd_2.1.20190210.bb => miniupnpd_2.1.20190630.bb} (88%) diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190210.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb similarity index 88% rename from meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190210.bb rename to meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb index d4093e511..6b8fdca4c 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190210.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb @@ -5,7 +5,7 @@ the network." SECTION = "networking" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91ac00c6b9f5c106e89291e196fe0234" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" inherit autotools gettext pkgconfig systemd @@ -15,8 +15,8 @@ SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;do file://miniupnpd.service \ file://0001-Add-OpenEmbedded-cross-compile-case.patch \ " -SRC_URI[md5sum] = "03b00c27106835e728a3b858ecf83390" -SRC_URI[sha256sum] = "1aaecd25cf152d99557dfe80c7508af9cb06e97ecad4786ce5dafb4c958d196b" +SRC_URI[md5sum] = "394e676f555d8047be69730d9c4d23a5" +SRC_URI[sha256sum] = "29f49fe6868597d041ee29f511fa7b65781b9e4e85ef2569a2381c2079e1743e" IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-networking] mosquitto: update to 1.6.3
Signed-off-by: Oleksandr Kravchuk --- .../mosquitto/{mosquitto_1.5.8.bb => mosquitto_1.6.3.bb} | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.5.8.bb => mosquitto_1.6.3.bb} (89%) diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.3.bb similarity index 89% rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.3.bb index 768b5930f..0a2555747 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.3.bb @@ -1,5 +1,7 @@ SUMMARY = "Open source MQTT v3.1/3.1.1 implemention" -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker that implements the MQ Telemetry Transport protocol version 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. " +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker that \ +implements the MQ Telemetry Transport protocol version 3.1 and 3.1.1. MQTT provides \ +a lightweight method of carrying out messaging using a publish/subscribe model. " HOMEPAGE = "http://mosquitto.org/"; SECTION = "console/network" LICENSE = "EPL-1.0 | EDL-1.0" @@ -14,8 +16,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ " -SRC_URI[md5sum] = "bbbcceb32db3657d9d436a8440a9db1c" -SRC_URI[sha256sum] = "78d7e70c3794dc3a1d484b4f2f8d3addebe9c2da3f5a1cebe557f7d13beb0da4" +SRC_URI[md5sum] = "bd19cf124459ee26040912786ef177f7" +SRC_URI[sha256sum] = "9ef5cc75f4fe31d7bf50654ddf4728ad9e1ae2e5609a4b42ecbbcb4a209ed17e" inherit systemd update-rc.d useradd @@ -66,6 +68,7 @@ PACKAGE_BEFORE_PN = "${PN}-examples" FILES_${PN} = "${sbindir}/mosquitto \ ${bindir}/mosquitto_passwd \ + ${bindir}/mosquitto_rr \ ${sysconfdir}/mosquitto \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/mosquitto.service \ -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-networking] uftp: update to 4.9.11
Signed-off-by: Oleksandr Kravchuk --- .../recipes-support/tnftp/tnftp_20190602.bb | 39 +++ .../uftp/{uftp_4.9.9.bb => uftp_4.9.11.bb}| 4 +- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/tnftp/tnftp_20190602.bb rename meta-networking/recipes-support/uftp/{uftp_4.9.9.bb => uftp_4.9.11.bb} (77%) diff --git a/meta-networking/recipes-support/tnftp/tnftp_20190602.bb b/meta-networking/recipes-support/tnftp/tnftp_20190602.bb new file mode 100644 index 0..83ad11b0e --- /dev/null +++ b/meta-networking/recipes-support/tnftp/tnftp_20190602.bb @@ -0,0 +1,39 @@ +SUMMARY = "Enhanced NetBSD ftp client" +DESCRIPTION = "tnftp (formerly known as lukemftp) is a port of the NetBSD FTP client \ +to other systems. It offers many enhancements over the traditional \ +BSD FTP client, including command-line editing, command-line fetches \ +of FTP and HTTP URLs (including via proxies), command-line uploads of \ +FTP URLs, context-sensitive word completion, dynamic progress bar, \ +IPv6 support, modification time preservation, paging of local and \ +remote files, passive mode support (with fallback to active mode), \ +SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ +throttling." + +SECTION = "net" +LICENSE = "BSD-4-Clause" + +DEPENDS = "ncurses" + +SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ +file://tnftp-autotools.patch \ +" + +inherit autotools update-alternatives pkgconfig + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "ftp" +ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" +ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" + +FILES_${PN} = "${bindir}/tnftp" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" +SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" +SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" + +PACKAGECONFIG ?= "openssl \ +${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +" +PACKAGECONFIG[openssl] = "--enable-ssl, --disable-ssl --with-ssl=no, openssl" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-networking/recipes-support/uftp/uftp_4.9.9.bb b/meta-networking/recipes-support/uftp/uftp_4.9.11.bb similarity index 77% rename from meta-networking/recipes-support/uftp/uftp_4.9.9.bb rename to meta-networking/recipes-support/uftp/uftp_4.9.11.bb index a64d081cf..8b47bd16f 100644 --- a/meta-networking/recipes-support/uftp/uftp_4.9.9.bb +++ b/meta-networking/recipes-support/uftp/uftp_4.9.11.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/"; SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "154e2c82a33fd4999040f8836e2dca2c" -SRC_URI[sha256sum] = "c04bc75a88fc3d57504269f260be4d0b1bc440508b5a5ca587df6c16b771aa48" +SRC_URI[md5sum] = "c0bc86b3067825a3866de9ef80c7451a" +SRC_URI[sha256sum] = "2ddc835a35f669d55df27ab6883ba19bb00bc8e4b66897ceaedb160b02246b1a" DEPENDS = "openssl" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-networking] ipvsadm: update to 1.30
Signed-off-by: Oleksandr Kravchuk --- .../ipvsadm/{ipvsadm_1.29.bb => ipvsadm_1.30.bb}| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-networking/recipes-support/ipvsadm/{ipvsadm_1.29.bb => ipvsadm_1.30.bb} (90%) diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb similarity index 90% rename from meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb rename to meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb index 4f3c16dc3..22cb88ac1 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb @@ -16,14 +16,14 @@ LIC_FILES_CHKSUM = "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3 DEPENDS += "libnl popt" -SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.gz \ +SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.xz \ file://0001-Modify-the-Makefile-for-cross-compile.patch \ file://0003-ipvsadm-remove-dependency-on-bash.patch \ file://makefile-add-ldflags.patch \ " -SRC_URI[md5sum] = "88b35030b4766b3e44ad15aacdef65c4" -SRC_URI[sha256sum] = "297f5cd459c3eef81ed0ca32e53bf320ed6b132fe7ed6ea5e44aa6b1fbd2a7de" +SRC_URI[md5sum] = "97f11b6af1920fde5a9d9eac0d7f9e50" +SRC_URI[sha256sum] = "95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c" UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for version 1.6.
Signed-off-by: Yongxin Liu --- meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 38 +++ 1 file changed, 38 insertions(+) create mode 100644 meta-oe/recipes-security/keyutils/keyutils_1.6.bb diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb new file mode 100644 index 0..3a26c902a --- /dev/null +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb @@ -0,0 +1,38 @@ +SUMMARY = "Linux Key Management Utilities" +DESCRIPTION = "These tools are used to control the key management system built into the Linux." + +SECTION = "base" + +LICENSE = "LGPLv2.1+ & GPLv2.0+" +LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ +file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" + +PV = "1.6+git${SRCPV}" + +SRC_URI = "\ +git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \ +" + +SRCREV = "4723f0185d11b13df243ad3cd41fbddfed53b5b1" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'" + +INSTALL_FLAGS = "\ +LIBDIR=${libdir} \ +USRLIBDIR=${libdir} \ +BINDIR=${bindir} \ +SBINDIR=${sbindir} \ +ETCDIR=${sysconfdir} \ +SHAREDIR=${datadir} \ +MANDIR=${mandir} \ +INCLUDEDIR=${includedir} \ +DESTDIR=${D} \ +" + +do_install() { +cd ${S} && oe_runmake ${INSTALL_FLAGS} install +} + +FILES_${PN} += "${datadir}/request-key-debug.sh" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/2] ndctl: v63 -> v65
Add keyutils to DEPENDS. Set FILES to package /usr/share/daxctl/daxctl.conf. Signed-off-by: Yongxin Liu --- meta-oe/recipes-core/ndctl/{ndctl_v63.bb => ndctl_v65.bb} | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) rename meta-oe/recipes-core/ndctl/{ndctl_v63.bb => ndctl_v65.bb} (88%) diff --git a/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-oe/recipes-core/ndctl/ndctl_v65.bb similarity index 88% rename from meta-oe/recipes-core/ndctl/ndctl_v63.bb rename to meta-oe/recipes-core/ndctl/ndctl_v65.bb index 2f299b1ba..69ee1d476 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v63.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v65.bb @@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" inherit autotools-brokensep pkgconfig bash-completion systemd -SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" +SRCREV = "ed17fd14608d8de072c8c090ffc5fcf78c4f48ff" SRC_URI = "git://github.com/pmem/ndctl.git" -DEPENDS = "kmod udev json-c" +DEPENDS = "kmod udev json-c keyutils" S = "${WORKDIR}/git" @@ -28,3 +28,5 @@ do_configure_prepend() { SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +FILES_${PN} += "${datadir}/daxctl/daxctl.conf" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for version 1.6.
On 7/7/19 6:52 PM, Yongxin Liu wrote: > Signed-off-by: Yongxin Liu > --- > meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 38 > +++ > 1 file changed, 38 insertions(+) > create mode 100644 meta-oe/recipes-security/keyutils/keyutils_1.6.bb > > diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb > b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb > new file mode 100644 > index 0..3a26c902a > --- /dev/null > +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb This recipe is in meta-security and contains ptests. Did you want the ptests and other fixes too? - armin > @@ -0,0 +1,38 @@ > +SUMMARY = "Linux Key Management Utilities" > +DESCRIPTION = "These tools are used to control the key management system > built into the Linux." > + > +SECTION = "base" > + > +LICENSE = "LGPLv2.1+ & GPLv2.0+" > +LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ > +file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" > + > +PV = "1.6+git${SRCPV}" > + > +SRC_URI = "\ > +git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \ > +" > + > +SRCREV = "4723f0185d11b13df243ad3cd41fbddfed53b5b1" > + > +S = "${WORKDIR}/git" > + > +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'" > + > +INSTALL_FLAGS = "\ > +LIBDIR=${libdir} \ > +USRLIBDIR=${libdir} \ > +BINDIR=${bindir} \ > +SBINDIR=${sbindir} \ > +ETCDIR=${sysconfdir} \ > +SHAREDIR=${datadir} \ > +MANDIR=${mandir} \ > +INCLUDEDIR=${includedir} \ > +DESTDIR=${D} \ > +" > + > +do_install() { > +cd ${S} && oe_runmake ${INSTALL_FLAGS} install > +} > + > +FILES_${PN} += "${datadir}/request-key-debug.sh" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for version 1.6.
> -Original Message- > From: akuster808 [mailto:akuster...@gmail.com] > Sent: Monday, July 8, 2019 09:59 > To: Liu, Yongxin; raj.k...@gmail.com; openembedded- > de...@lists.openembedded.org > Subject: Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for > version 1.6. > > > > On 7/7/19 6:52 PM, Yongxin Liu wrote: > > Signed-off-by: Yongxin Liu > > --- > > meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 38 > +++ > > 1 file changed, 38 insertions(+) > > create mode 100644 meta-oe/recipes-security/keyutils/keyutils_1.6.bb > > > > diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta- > oe/recipes-security/keyutils/keyutils_1.6.bb > > new file mode 100644 > > index 0..3a26c902a > > --- /dev/null > > +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb > This recipe is in meta-security and contains ptests. Did you want the > ptests and other fixes too? This recipe is intended to be used by other recipes in OE. For other layers, I think they can use their own keyutils. Thanks, Yongxin > - armin > > @@ -0,0 +1,38 @@ > > +SUMMARY = "Linux Key Management Utilities" > > +DESCRIPTION = "These tools are used to control the key management > system built into the Linux." > > + > > +SECTION = "base" > > + > > +LICENSE = "LGPLv2.1+ & GPLv2.0+" > > +LIC_FILES_CHKSUM = > "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ > > + > file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" > > + > > +PV = "1.6+git${SRCPV}" > > + > > +SRC_URI = "\ > > + > git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \ > > +" > > + > > +SRCREV = "4723f0185d11b13df243ad3cd41fbddfed53b5b1" > > + > > +S = "${WORKDIR}/git" > > + > > +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'" > > + > > +INSTALL_FLAGS = "\ > > +LIBDIR=${libdir} \ > > +USRLIBDIR=${libdir} \ > > +BINDIR=${bindir} \ > > +SBINDIR=${sbindir} \ > > +ETCDIR=${sysconfdir} \ > > +SHAREDIR=${datadir} \ > > +MANDIR=${mandir} \ > > +INCLUDEDIR=${includedir} \ > > +DESTDIR=${D} \ > > +" > > + > > +do_install() { > > +cd ${S} && oe_runmake ${INSTALL_FLAGS} install > > +} > > + > > +FILES_${PN} += "${datadir}/request-key-debug.sh" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for version 1.6.
On 7/7/19 7:03 PM, Liu, Yongxin wrote: >> -Original Message- >> From: akuster808 [mailto:akuster...@gmail.com] >> Sent: Monday, July 8, 2019 09:59 >> To: Liu, Yongxin; raj.k...@gmail.com; openembedded- >> de...@lists.openembedded.org >> Subject: Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for >> version 1.6. >> >> >> >> On 7/7/19 6:52 PM, Yongxin Liu wrote: >>> Signed-off-by: Yongxin Liu >>> --- >>> meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 38 >> +++ >>> 1 file changed, 38 insertions(+) >>> create mode 100644 meta-oe/recipes-security/keyutils/keyutils_1.6.bb >>> >>> diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta- >> oe/recipes-security/keyutils/keyutils_1.6.bb >>> new file mode 100644 >>> index 0..3a26c902a >>> --- /dev/null >>> +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb >> This recipe is in meta-security and contains ptests. Did you want the >> ptests and other fixes too? > This recipe is intended to be used by other recipes in OE. > For other layers, I think they can use their own keyutils. I mean, it should move out of meta-security to meta-oe. And if you don't want to do that, you should pick up the fixes. Please have a look and compare. http://git.yoctoproject.org/cgit/cgit.cgi/meta-security/tree/recipes-security/keyutils/keyutils_1.6.bb - armin > > Thanks, > Yongxin > >> - armin >>> @@ -0,0 +1,38 @@ >>> +SUMMARY = "Linux Key Management Utilities" >>> +DESCRIPTION = "These tools are used to control the key management >> system built into the Linux." >>> + >>> +SECTION = "base" >>> + >>> +LICENSE = "LGPLv2.1+ & GPLv2.0+" >>> +LIC_FILES_CHKSUM = >> "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ >>> + >> file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" >>> + >>> +PV = "1.6+git${SRCPV}" >>> + >>> +SRC_URI = "\ >>> + >> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \ >>> +" >>> + >>> +SRCREV = "4723f0185d11b13df243ad3cd41fbddfed53b5b1" >>> + >>> +S = "${WORKDIR}/git" >>> + >>> +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'" >>> + >>> +INSTALL_FLAGS = "\ >>> +LIBDIR=${libdir} \ >>> +USRLIBDIR=${libdir} \ >>> +BINDIR=${bindir} \ >>> +SBINDIR=${sbindir} \ >>> +ETCDIR=${sysconfdir} \ >>> +SHAREDIR=${datadir} \ >>> +MANDIR=${mandir} \ >>> +INCLUDEDIR=${includedir} \ >>> +DESTDIR=${D} \ >>> +" >>> + >>> +do_install() { >>> +cd ${S} && oe_runmake ${INSTALL_FLAGS} install >>> +} >>> + >>> +FILES_${PN} += "${datadir}/request-key-debug.sh" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking] mosquitto: update to 1.6.3
On 7/7/19 5:35 PM, Oleksandr Kravchuk wrote: > Signed-off-by: Oleksandr Kravchuk > --- > .../mosquitto/{mosquitto_1.5.8.bb => mosquitto_1.6.3.bb} | 9 ++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.5.8.bb => > mosquitto_1.6.3.bb} (89%) > > diff --git > a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb > b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.3.bb > similarity index 89% > rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb > rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.3.bb > index 768b5930f..0a2555747 100644 > --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.8.bb > +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.3.bb There is more here than just a version updates. Please explain what the other changes are. - armin > @@ -1,5 +1,7 @@ > SUMMARY = "Open source MQTT v3.1/3.1.1 implemention" > -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker > that implements the MQ Telemetry Transport protocol version 3.1 and 3.1.1. > MQTT provides a lightweight method of carrying out messaging using a > publish/subscribe model. " > +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker > that \ > +implements the MQ Telemetry Transport protocol version 3.1 and 3.1.1. MQTT > provides \ > +a lightweight method of carrying out messaging using a publish/subscribe > model. " > HOMEPAGE = "http://mosquitto.org/"; > SECTION = "console/network" > LICENSE = "EPL-1.0 | EDL-1.0" > @@ -14,8 +16,8 @@ SRC_URI = > "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ > file://mosquitto.init \ > " > > -SRC_URI[md5sum] = "bbbcceb32db3657d9d436a8440a9db1c" > -SRC_URI[sha256sum] = > "78d7e70c3794dc3a1d484b4f2f8d3addebe9c2da3f5a1cebe557f7d13beb0da4" > +SRC_URI[md5sum] = "bd19cf124459ee26040912786ef177f7" > +SRC_URI[sha256sum] = > "9ef5cc75f4fe31d7bf50654ddf4728ad9e1ae2e5609a4b42ecbbcb4a209ed17e" > > inherit systemd update-rc.d useradd > > @@ -66,6 +68,7 @@ PACKAGE_BEFORE_PN = "${PN}-examples" > > FILES_${PN} = "${sbindir}/mosquitto \ > ${bindir}/mosquitto_passwd \ > + ${bindir}/mosquitto_rr \ > ${sysconfdir}/mosquitto \ > ${sysconfdir}/init.d \ > ${systemd_unitdir}/system/mosquitto.service \ -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking] libnftnl: update to 1.1.3
On 7/7/19 5:10 PM, Oleksandr Kravchuk wrote: > Signed-off-by: Oleksandr Kravchuk > --- > ...ove-exports-before-symbol-definition.patch | 59 ++-- > ...cal-function-as-one-of-printf-family.patch | 307 ++ > .../{libnftnl_1.1.1.bb => libnftnl_1.1.3.bb} | 4 +- > 3 files changed, 209 insertions(+), 161 deletions(-) > rename meta-networking/recipes-filter/libnftnl/{libnftnl_1.1.1.bb => > libnftnl_1.1.3.bb} (86%) There is more here than just an update. Please explain in commit. - armin > > diff --git > a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch > > b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch > index 995fd59a5..699d0d922 100644 > --- > a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch > +++ > b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch > @@ -1,4 +1,4 @@ > -From 21eb59fbd071ebffb8495232766824944fb521a0 Mon Sep 17 00:00:00 2001 > +From 6b76c76e6b3f93c422d666f49ee68df9d5426078 Mon Sep 17 00:00:00 2001 > From: Alex Kiernan > Date: Wed, 7 Nov 2018 21:19:53 + > Subject: [PATCH] Move exports before symbol definition > @@ -10,11 +10,11 @@ clang. > > Signed-off-by: Alex Kiernan > --- > - src/flowtable.c | 54 +++--- > + src/flowtable.c | 54 - > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/src/flowtable.c b/src/flowtable.c > -index c1ddae4..d7434e3 100644 > +index 1f7ba30..80de952 100644 > --- a/src/flowtable.c > +++ b/src/flowtable.c > @@ -34,12 +34,13 @@ struct nftnl_flowtable { > @@ -49,7 +49,7 @@ index c1ddae4..d7434e3 100644 > void nftnl_flowtable_unset(struct nftnl_flowtable *c, uint16_t attr) > { > int i; > -@@ -96,7 +97,6 @@ void nftnl_flowtable_unset(struct nftnl_flowtable *c, > uint16_t attr) > +@@ -95,7 +96,6 @@ void nftnl_flowtable_unset(struct nftnl_flowtable *c, > uint16_t attr) > > c->flags &= ~(1 << attr); > } > @@ -57,7 +57,7 @@ index c1ddae4..d7434e3 100644 > > static uint32_t nftnl_flowtable_validate[NFTNL_FLOWTABLE_MAX + 1] = { > [NFTNL_FLOWTABLE_HOOKNUM] = sizeof(uint32_t), > -@@ -105,6 +105,7 @@ static uint32_t > nftnl_flowtable_validate[NFTNL_FLOWTABLE_MAX + 1] = { > +@@ -104,6 +104,7 @@ static uint32_t > nftnl_flowtable_validate[NFTNL_FLOWTABLE_MAX + 1] = { > [NFTNL_FLOWTABLE_FLAGS] = sizeof(uint32_t), > }; > > @@ -65,7 +65,7 @@ index c1ddae4..d7434e3 100644 > int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr, >const void *data, uint32_t data_len) > { > -@@ -170,32 +171,32 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable > *c, uint16_t attr, > +@@ -169,32 +170,32 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable > *c, uint16_t attr, > c->flags |= (1 << attr); > return 0; > } > @@ -103,7 +103,7 @@ index c1ddae4..d7434e3 100644 > const void *nftnl_flowtable_get_data(const struct nftnl_flowtable *c, >uint16_t attr, uint32_t *data_len) > { > -@@ -229,21 +230,21 @@ const void *nftnl_flowtable_get_data(const struct > nftnl_flowtable *c, > +@@ -228,21 +229,21 @@ const void *nftnl_flowtable_get_data(const struct > nftnl_flowtable *c, > } > return NULL; > } > @@ -127,8 +127,8 @@ index c1ddae4..d7434e3 100644 > +EXPORT_SYMBOL(nftnl_flowtable_get_u32); > uint32_t nftnl_flowtable_get_u32(const struct nftnl_flowtable *c, uint16_t > attr) > { > - uint32_t data_len; > -@@ -253,8 +254,8 @@ uint32_t nftnl_flowtable_get_u32(const struct > nftnl_flowtable *c, uint16_t attr) > + uint32_t data_len = 0; > +@@ -252,8 +253,8 @@ uint32_t nftnl_flowtable_get_u32(const struct > nftnl_flowtable *c, uint16_t attr) > > return val ? *val : 0; > } > @@ -137,8 +137,8 @@ index c1ddae4..d7434e3 100644 > +EXPORT_SYMBOL(nftnl_flowtable_get_s32); > int32_t nftnl_flowtable_get_s32(const struct nftnl_flowtable *c, uint16_t > attr) > { > - uint32_t data_len; > -@@ -264,8 +265,8 @@ int32_t nftnl_flowtable_get_s32(const struct > nftnl_flowtable *c, uint16_t attr) > + uint32_t data_len = 0; > +@@ -263,8 +264,8 @@ int32_t nftnl_flowtable_get_s32(const struct > nftnl_flowtable *c, uint16_t attr) > > return val ? *val : 0; > } > @@ -148,7 +148,7 @@ index c1ddae4..d7434e3 100644 > void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr *nlh, >const struct nftnl_flowtable *c) > { > -@@ -301,7 +302,6 @@ void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr > *nlh, > +@@ -300,7 +301,6 @@ void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr > *nlh, > if (c->flags & (1 << NFTNL_FLOWTABLE_SIZE)) > mnl_attr_put_u32(nlh, NFTA_FLOWTABLE_SIZE, htonl(c->
Re: [oe] [PATCH][meta-networking] uftp: update to 4.9.11
On 7/7/19 5:47 PM, Oleksandr Kravchuk wrote: > Signed-off-by: Oleksandr Kravchuk > --- > .../recipes-support/tnftp/tnftp_20190602.bb | 39 +++ > .../uftp/{uftp_4.9.9.bb => uftp_4.9.11.bb}| 4 +- > 2 files changed, 41 insertions(+), 2 deletions(-) > create mode 100644 meta-networking/recipes-support/tnftp/tnftp_20190602.bb > rename meta-networking/recipes-support/uftp/{uftp_4.9.9.bb => > uftp_4.9.11.bb} (77%) There is a new recipe here too. please submit independently. - armin > > diff --git a/meta-networking/recipes-support/tnftp/tnftp_20190602.bb > b/meta-networking/recipes-support/tnftp/tnftp_20190602.bb > new file mode 100644 > index 0..83ad11b0e > --- /dev/null > +++ b/meta-networking/recipes-support/tnftp/tnftp_20190602.bb > @@ -0,0 +1,39 @@ > +SUMMARY = "Enhanced NetBSD ftp client" > +DESCRIPTION = "tnftp (formerly known as lukemftp) is a port of the NetBSD > FTP client \ > +to other systems. It offers many enhancements over the traditional \ > +BSD FTP client, including command-line editing, command-line fetches \ > +of FTP and HTTP URLs (including via proxies), command-line uploads of \ > +FTP URLs, context-sensitive word completion, dynamic progress bar, \ > +IPv6 support, modification time preservation, paging of local and \ > +remote files, passive mode support (with fallback to active mode), \ > +SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ > +throttling." > + > +SECTION = "net" > +LICENSE = "BSD-4-Clause" > + > +DEPENDS = "ncurses" > + > +SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ > +file://tnftp-autotools.patch \ > +" > + > +inherit autotools update-alternatives pkgconfig > + > +ALTERNATIVE_PRIORITY = "100" > + > +ALTERNATIVE_${PN} = "ftp" > +ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" > +ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" > + > +FILES_${PN} = "${bindir}/tnftp" > + > +LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" > +SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" > +SRC_URI[sha256sum] = > "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" > + > +PACKAGECONFIG ?= "openssl \ > +${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ > +" > +PACKAGECONFIG[openssl] = "--enable-ssl, --disable-ssl --with-ssl=no, openssl" > +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," > diff --git a/meta-networking/recipes-support/uftp/uftp_4.9.9.bb > b/meta-networking/recipes-support/uftp/uftp_4.9.11.bb > similarity index 77% > rename from meta-networking/recipes-support/uftp/uftp_4.9.9.bb > rename to meta-networking/recipes-support/uftp/uftp_4.9.11.bb > index a64d081cf..8b47bd16f 100644 > --- a/meta-networking/recipes-support/uftp/uftp_4.9.9.bb > +++ b/meta-networking/recipes-support/uftp/uftp_4.9.11.bb > @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = > "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" > UPSTREAM_CHECK_URI = > "https://sourceforge.net/projects/uftp-multicast/files/source-tar/"; > > SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" > -SRC_URI[md5sum] = "154e2c82a33fd4999040f8836e2dca2c" > -SRC_URI[sha256sum] = > "c04bc75a88fc3d57504269f260be4d0b1bc440508b5a5ca587df6c16b771aa48" > +SRC_URI[md5sum] = "c0bc86b3067825a3866de9ef80c7451a" > +SRC_URI[sha256sum] = > "2ddc835a35f669d55df27ab6883ba19bb00bc8e4b66897ceaedb160b02246b1a" > > DEPENDS = "openssl" > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking] ipvsadm: update to 1.30
On 7/7/19 5:53 PM, Oleksandr Kravchuk wrote: > Signed-off-by: Oleksandr Kravchuk > --- > .../ipvsadm/{ipvsadm_1.29.bb => ipvsadm_1.30.bb}| 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename meta-networking/recipes-support/ipvsadm/{ipvsadm_1.29.bb => > ipvsadm_1.30.bb} (90%) > > diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb > b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb > similarity index 90% > rename from meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb > rename to meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb > index 4f3c16dc3..22cb88ac1 100644 > --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb > +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb > @@ -16,14 +16,14 @@ LIC_FILES_CHKSUM = > "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3 > > DEPENDS += "libnl popt" > > -SRC_URI = > "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.gz \ > +SRC_URI = > "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.xz \ Is the src uri dropping gz files? - armin > file://0001-Modify-the-Makefile-for-cross-compile.patch \ > file://0003-ipvsadm-remove-dependency-on-bash.patch \ > file://makefile-add-ldflags.patch \ > " > > -SRC_URI[md5sum] = "88b35030b4766b3e44ad15aacdef65c4" > -SRC_URI[sha256sum] = > "297f5cd459c3eef81ed0ca32e53bf320ed6b132fe7ed6ea5e44aa6b1fbd2a7de" > +SRC_URI[md5sum] = "97f11b6af1920fde5a9d9eac0d7f9e50" > +SRC_URI[sha256sum] = > "95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c" > > UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking] ipvsadm: update to 1.30
On 08/07/2019 04:44, akuster808 wrote: > > On 7/7/19 5:53 PM, Oleksandr Kravchuk wrote: >> Signed-off-by: Oleksandr Kravchuk >> --- >> .../ipvsadm/{ipvsadm_1.29.bb => ipvsadm_1.30.bb}| 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> rename meta-networking/recipes-support/ipvsadm/{ipvsadm_1.29.bb => >> ipvsadm_1.30.bb} (90%) >> >> diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb >> b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb >> similarity index 90% >> rename from meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb >> rename to meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb >> index 4f3c16dc3..22cb88ac1 100644 >> --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb >> +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb >> @@ -16,14 +16,14 @@ LIC_FILES_CHKSUM = >> "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3 >> >> DEPENDS += "libnl popt" >> >> -SRC_URI = >> "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.gz >> \ >> +SRC_URI = >> "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.xz >> \ > Is the src uri dropping gz files? > > - armin No, it is not. xz is almost always smaller, so I thought it's better to use it. Any reasons I shouldn't? >> file://0001-Modify-the-Makefile-for-cross-compile.patch \ >> file://0003-ipvsadm-remove-dependency-on-bash.patch \ >> file://makefile-add-ldflags.patch \ >> " >> >> -SRC_URI[md5sum] = "88b35030b4766b3e44ad15aacdef65c4" >> -SRC_URI[sha256sum] = >> "297f5cd459c3eef81ed0ca32e53bf320ed6b132fe7ed6ea5e44aa6b1fbd2a7de" >> +SRC_URI[md5sum] = "97f11b6af1920fde5a9d9eac0d7f9e50" >> +SRC_URI[sha256sum] = >> "95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c" >> >> UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" >> -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking] ipvsadm: update to 1.30
On 7/7/19 7:47 PM, Oleksandr Kravchuk wrote: > On 08/07/2019 04:44, akuster808 wrote: >> On 7/7/19 5:53 PM, Oleksandr Kravchuk wrote: >>> Signed-off-by: Oleksandr Kravchuk >>> --- >>> .../ipvsadm/{ipvsadm_1.29.bb => ipvsadm_1.30.bb}| 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> rename meta-networking/recipes-support/ipvsadm/{ipvsadm_1.29.bb => >>> ipvsadm_1.30.bb} (90%) >>> >>> diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb >>> b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb >>> similarity index 90% >>> rename from meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb >>> rename to meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb >>> index 4f3c16dc3..22cb88ac1 100644 >>> --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb >>> +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb >>> @@ -16,14 +16,14 @@ LIC_FILES_CHKSUM = >>> "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3 >>> >>> DEPENDS += "libnl popt" >>> >>> -SRC_URI = >>> "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.gz >>> \ >>> +SRC_URI = >>> "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.xz >>> \ >> Is the src uri dropping gz files? >> >> - armin > No, it is not. xz is almost always smaller, so I thought it's better to > use it. Any reasons I shouldn't? nope. just wasn't mentioned. Thanks, Armin >>> file://0001-Modify-the-Makefile-for-cross-compile.patch \ >>> file://0003-ipvsadm-remove-dependency-on-bash.patch \ >>> file://makefile-add-ldflags.patch \ >>> " >>> >>> -SRC_URI[md5sum] = "88b35030b4766b3e44ad15aacdef65c4" >>> -SRC_URI[sha256sum] = >>> "297f5cd459c3eef81ed0ca32e53bf320ed6b132fe7ed6ea5e44aa6b1fbd2a7de" >>> +SRC_URI[md5sum] = "97f11b6af1920fde5a9d9eac0d7f9e50" >>> +SRC_URI[sha256sum] = >>> "95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c" >>> >>> UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" >>> -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for version 1.6.
> -Original Message- > From: akuster808 [mailto:akuster...@gmail.com] > Sent: Monday, July 8, 2019 10:09 > To: Liu, Yongxin; raj.k...@gmail.com; openembedded- > de...@lists.openembedded.org > Subject: Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for > version 1.6. > > > > On 7/7/19 7:03 PM, Liu, Yongxin wrote: > >> -Original Message- > >> From: akuster808 [mailto:akuster...@gmail.com] > >> Sent: Monday, July 8, 2019 09:59 > >> To: Liu, Yongxin; raj.k...@gmail.com; openembedded- > >> de...@lists.openembedded.org > >> Subject: Re: [oe] [meta-oe][PATCH v2 1/2] keyutils: add new recipe for > >> version 1.6. > >> > >> > >> > >> On 7/7/19 6:52 PM, Yongxin Liu wrote: > >>> Signed-off-by: Yongxin Liu > >>> --- > >>> meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 38 > >> +++ > >>> 1 file changed, 38 insertions(+) > >>> create mode 100644 meta-oe/recipes-security/keyutils/keyutils_1.6.bb > >>> > >>> diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb > b/meta- > >> oe/recipes-security/keyutils/keyutils_1.6.bb > >>> new file mode 100644 > >>> index 0..3a26c902a > >>> --- /dev/null > >>> +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb > >> This recipe is in meta-security and contains ptests. Did you want the > >> ptests and other fixes too? > > This recipe is intended to be used by other recipes in OE. > > For other layers, I think they can use their own keyutils. > > I mean, it should move out of meta-security to meta-oe. And if you > don't want to do that, you should pick up the fixes. Thanks Armin. I will move it from meta-security to meta-oe. --Yongxin > > Please have a look and compare. > http://git.yoctoproject.org/cgit/cgit.cgi/meta-security/tree/recipes- > security/keyutils/keyutils_1.6.bb > > - armin > > > > > Thanks, > > Yongxin > > > >> - armin > >>> @@ -0,0 +1,38 @@ > >>> +SUMMARY = "Linux Key Management Utilities" > >>> +DESCRIPTION = "These tools are used to control the key management > >> system built into the Linux." > >>> + > >>> +SECTION = "base" > >>> + > >>> +LICENSE = "LGPLv2.1+ & GPLv2.0+" > >>> +LIC_FILES_CHKSUM = > >> "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ > >>> + > >> file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" > >>> + > >>> +PV = "1.6+git${SRCPV}" > >>> + > >>> +SRC_URI = "\ > >>> + > >> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \ > >>> +" > >>> + > >>> +SRCREV = "4723f0185d11b13df243ad3cd41fbddfed53b5b1" > >>> + > >>> +S = "${WORKDIR}/git" > >>> + > >>> +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'" > >>> + > >>> +INSTALL_FLAGS = "\ > >>> +LIBDIR=${libdir} \ > >>> +USRLIBDIR=${libdir} \ > >>> +BINDIR=${bindir} \ > >>> +SBINDIR=${sbindir} \ > >>> +ETCDIR=${sysconfdir} \ > >>> +SHAREDIR=${datadir} \ > >>> +MANDIR=${mandir} \ > >>> +INCLUDEDIR=${includedir} \ > >>> +DESTDIR=${D} \ > >>> +" > >>> + > >>> +do_install() { > >>> +cd ${S} && oe_runmake ${INSTALL_FLAGS} install > >>> +} > >>> + > >>> +FILES_${PN} += "${datadir}/request-key-debug.sh" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-mako: upgrade 1.0.12 -> 1.0.13
-Upgrade from python-mako_1.0.12.bb to python-mako_1.0.13.bb. -Add python3-mako_1.0.13.bb. Signed-off-by: Zang Ruochen --- meta-python/recipes-devtools/python/python-mako.inc | 4 ++-- .../python/{python-mako_1.0.12.bb => python-mako_1.0.13.bb} | 0 meta-python/recipes-devtools/python/python3-mako_1.0.13.bb| 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-mako_1.0.12.bb => python-mako_1.0.13.bb} (100%) create mode 100644 meta-python/recipes-devtools/python/python3-mako_1.0.13.bb diff --git a/meta-python/recipes-devtools/python/python-mako.inc b/meta-python/recipes-devtools/python/python-mako.inc index dc27ada74..0b3fe1449 100644 --- a/meta-python/recipes-devtools/python/python-mako.inc +++ b/meta-python/recipes-devtools/python/python-mako.inc @@ -8,8 +8,8 @@ PYPI_PACKAGE = "Mako" inherit pypi -SRC_URI[md5sum] = "4a7aef27217a8e6c1a29447c9b1b00ab" -SRC_URI[sha256sum] = "0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162" +SRC_URI[md5sum] = "ad6c7dcb5d39c99f4fdf4fec892c5dee" +SRC_URI[sha256sum] = "95ee720cc3453063788515d55bd7ce4a2a77b7b209e4ac70ec5c86091eb02541" RDEPENDS_${PN} = " \ ${PYTHON_PN}-html \ diff --git a/meta-python/recipes-devtools/python/python-mako_1.0.12.bb b/meta-python/recipes-devtools/python/python-mako_1.0.13.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-mako_1.0.12.bb rename to meta-python/recipes-devtools/python/python-mako_1.0.13.bb diff --git a/meta-python/recipes-devtools/python/python3-mako_1.0.13.bb b/meta-python/recipes-devtools/python/python3-mako_1.0.13.bb new file mode 100644 index 0..22ceeeb39 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-mako_1.0.13.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-mako.inc -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-typing: upgrade 3.6.6 -> 3.7.4
-Upgrade from python-typing_3.6.6.bb to python-typing_3.7.4.bb. Signed-off-by: Zang Ruochen --- meta-python/recipes-devtools/python/python-typing.inc | 4 ++-- .../python/{python-typing_3.6.6.bb => python-typing_3.7.4.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-typing_3.6.6.bb => python-typing_3.7.4.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-typing.inc b/meta-python/recipes-devtools/python/python-typing.inc index 82c2ab74f..b392b7521 100644 --- a/meta-python/recipes-devtools/python/python-typing.inc +++ b/meta-python/recipes-devtools/python/python-typing.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/python/typing"; LICENSE = "PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" -SRC_URI[md5sum] = "64614206b4bdc0864fc0e0bccd69efc9" -SRC_URI[sha256sum] = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d" +SRC_URI[md5sum] = "8a3e4b822bac02b9b33c97e7d4f1521c" +SRC_URI[sha256sum] = "53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-typing_3.6.6.bb b/meta-python/recipes-devtools/python/python-typing_3.7.4.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-typing_3.6.6.bb rename to meta-python/recipes-devtools/python/python-typing_3.7.4.bb -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 5/9] keyutils: fix QA WARNING
From: Armin Kuster WARNING: keyutils-1.6-r0 do_package: QA Issue: keyutils: Files/directories were installed but not shipped in any package: /lib/pkgconfig /lib/pkgconfig/libkeyutils.pc Signed-off-by: Armin Kuster --- keyutils_1.6.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyutils_1.6.bb b/keyutils_1.6.bb index 730e1741e..054e0c139 100644 --- a/keyutils_1.6.bb +++ b/keyutils_1.6.bb @@ -35,6 +35,7 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ " do_install () { +install -d ${D}/${nonarch_base_libdir}/pkgconfig oe_runmake DESTDIR=${D} install } @@ -43,4 +44,6 @@ do_install_ptest () { sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh } +FILES_${PN}-dev += "${nonarch_base_libdir}/pkgconfig/libkeyutils.pc" + RDEPENDS_${PN}-ptest += "glibc-utils lsb" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 4/9] keyutils: improve ptests
From: Armin Kuster Tests need lsb Signed-off-by: Armin Kuster --- keyutils_1.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyutils_1.6.bb b/keyutils_1.6.bb index 1d7427da5..730e1741e 100644 --- a/keyutils_1.6.bb +++ b/keyutils_1.6.bb @@ -43,4 +43,4 @@ do_install_ptest () { sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh } -RDEPENDS_${PN}-ptest += "glibc-utils" +RDEPENDS_${PN}-ptest += "glibc-utils lsb" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 1/9] keyutils: add new recipe
From: Jackie Huang keyutils is utilities to control the kernel key management facility and to provide a mechanism by which the kernel call back to userspace to get a key instantiated. It's required by ecryptfs-utils. Signed-off-by: Jackie Huang Signed-off-by: Armin Kuster --- ...ix-error-report-by-adding-default-message.patch | 42 files/keyutils-test-fix-output-format.patch| 41 files/keyutils-use-relative-path-for-link.patch| 28 ++ files/run-ptest| 3 ++ keyutils_1.5.10.bb | 45 ++ 5 files changed, 159 insertions(+) create mode 100644 files/keyutils-fix-error-report-by-adding-default-message.patch create mode 100644 files/keyutils-test-fix-output-format.patch create mode 100644 files/keyutils-use-relative-path-for-link.patch create mode 100755 files/run-ptest create mode 100644 keyutils_1.5.10.bb diff --git a/files/keyutils-fix-error-report-by-adding-default-message.patch b/files/keyutils-fix-error-report-by-adding-default-message.patch new file mode 100644 index 0..acd91c01c --- /dev/null +++ b/files/keyutils-fix-error-report-by-adding-default-message.patch @@ -0,0 +1,42 @@ +fix keyutils test error report + +Upstream-Status: Pending + +"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED. +"Required key not available" may be the reason of EKEYREVOKED. +EXPIRED and REVOKED are 2 status of kernel security keys features. +But the userspace keyutils lib will output the error message, which may +have several reasons. + +Signed-off-by: Han Chao + +diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +index bbca00a..739e9d0 100644 +--- a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +@@ -227,11 +227,12 @@ function expect_error () + ;; + EKEYEXPIRED) + my_err="Key has expired" +- alt_err="Unknown error 127" ++ alt_err="Permission denied" + ;; + EKEYREVOKED) + my_err="Key has been revoked" +- alt_err="Unknown error 128" ++ alt_err="Permission denied" ++ alt2_err="Required key not available" + ;; + EKEYREJECTED) + my_err="Key has been rejected" +@@ -249,6 +250,9 @@ function expect_error () + elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err" >&/dev/null + then + : ++elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err" >&/dev/null ++then ++ : + elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err" >&/dev/null + then + : + diff --git a/files/keyutils-test-fix-output-format.patch b/files/keyutils-test-fix-output-format.patch new file mode 100644 index 0..a4ffd50ce --- /dev/null +++ b/files/keyutils-test-fix-output-format.patch @@ -0,0 +1,41 @@ +From 49b6321368e4bd3cd233d045cd09004ddd7968b2 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Mon, 15 May 2017 14:52:00 +0800 +Subject: [PATCH] keyutils: fix output format + +keyutils ptest output format is incorrect, according to yocto +Development Manual +(http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#testing-packages-with-ptest) +5.10.6. Testing Packages With ptestThe test generates output in the format used by Automake: +: +where the result can be PASS, FAIL, or SKIP, and the testname can be any +identifying string. +So we should change the test result format to match yocto ptest rules. + +Upstream-Status: Inappropriate [OE ptest specific] + +Signed-off-by: Li Wang +Signed-off-by: Jackie Huang +--- + tests/runtest.sh | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/tests/runtest.sh b/tests/runtest.sh +index b6eaa7c..84263fb 100644 +--- a/tests/runtest.sh b/tests/runtest.sh +@@ -21,6 +21,11 @@ for i in ${TESTS}; do + echo "### RUNNING TEST $i" + if [[ $AUTOMATED != 0 ]] ; then + bash ./runtest.sh ++if [ $? != 0 ]; then ++echo "FAIL: $i" ++else ++echo "PASS: $i" ++fi + else + bash ./runtest.sh || exit 1 + fi +-- +2.11.0 + diff --git a/files/keyutils-use-relative-path-for-link.patch b/files/keyutils-use-relative-path-for-link.patch new file mode 100644 index 0..dde1af44a --- /dev/null +++ b/files/keyutils-use-relative-path-for-link.patch @@ -0,0 +1,28 @@ +Subject: [PATCH] keyutils: use relative path for link + +The absolute path of the symlink will be invalid +when populated in sysroot, so use relative path instead. + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 824bbbf..8ce3a13 100644 +--- a/Makefile b/Makefile +@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0) + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$
[oe] [meta-oe][PATCH v3 8/9] keyutils: move recipe and patches from meta-security to meta-oe
keyutils is originally in https://git.yoctoproject.org/git/meta-security. Move it to meta-oe since other recipes in OE depend on it. Signed-off-by: Yongxin Liu --- .../recipes-security/keyutils/files}/fix_library_install_path.patch | 0 .../files}/keyutils-fix-error-report-by-adding-default-message.patch | 0 .../keyutils/files}/keyutils-test-fix-output-format.patch | 0 {files => meta-oe/recipes-security/keyutils/files}/run-ptest | 0 keyutils_1.6.bb => meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {files => meta-oe/recipes-security/keyutils/files}/fix_library_install_path.patch (100%) rename {files => meta-oe/recipes-security/keyutils/files}/keyutils-fix-error-report-by-adding-default-message.patch (100%) rename {files => meta-oe/recipes-security/keyutils/files}/keyutils-test-fix-output-format.patch (100%) rename {files => meta-oe/recipes-security/keyutils/files}/run-ptest (100%) rename keyutils_1.6.bb => meta-oe/recipes-security/keyutils/keyutils_1.6.bb (100%) diff --git a/files/fix_library_install_path.patch b/meta-oe/recipes-security/keyutils/files/fix_library_install_path.patch similarity index 100% rename from files/fix_library_install_path.patch rename to meta-oe/recipes-security/keyutils/files/fix_library_install_path.patch diff --git a/files/keyutils-fix-error-report-by-adding-default-message.patch b/meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch similarity index 100% rename from files/keyutils-fix-error-report-by-adding-default-message.patch rename to meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch diff --git a/files/keyutils-test-fix-output-format.patch b/meta-oe/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch similarity index 100% rename from files/keyutils-test-fix-output-format.patch rename to meta-oe/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch diff --git a/files/run-ptest b/meta-oe/recipes-security/keyutils/files/run-ptest similarity index 100% rename from files/run-ptest rename to meta-oe/recipes-security/keyutils/files/run-ptest diff --git a/keyutils_1.6.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb similarity index 100% rename from keyutils_1.6.bb rename to meta-oe/recipes-security/keyutils/keyutils_1.6.bb -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 6/9] keyutils: fix pulling in glibc when musl enabled
From: Armin Kuster Signed-off-by: Armin Kuster --- keyutils_1.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyutils_1.6.bb b/keyutils_1.6.bb index 054e0c139..c961fa293 100644 --- a/keyutils_1.6.bb +++ b/keyutils_1.6.bb @@ -46,4 +46,6 @@ do_install_ptest () { FILES_${PN}-dev += "${nonarch_base_libdir}/pkgconfig/libkeyutils.pc" -RDEPENDS_${PN}-ptest += "glibc-utils lsb" +RDEPENDS_${PN}-ptest += "lsb" +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" +RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 9/9] ndctl: v63 -> v65
Add keyutils to DEPENDS. Set FILES to package /usr/share/daxctl/daxctl.conf. Signed-off-by: Yongxin Liu --- meta-oe/recipes-core/ndctl/{ndctl_v63.bb => ndctl_v65.bb} | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) rename meta-oe/recipes-core/ndctl/{ndctl_v63.bb => ndctl_v65.bb} (88%) diff --git a/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-oe/recipes-core/ndctl/ndctl_v65.bb similarity index 88% rename from meta-oe/recipes-core/ndctl/ndctl_v63.bb rename to meta-oe/recipes-core/ndctl/ndctl_v65.bb index 2f299b1ba..69ee1d476 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v63.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v65.bb @@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" inherit autotools-brokensep pkgconfig bash-completion systemd -SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" +SRCREV = "ed17fd14608d8de072c8c090ffc5fcf78c4f48ff" SRC_URI = "git://github.com/pmem/ndctl.git" -DEPENDS = "kmod udev json-c" +DEPENDS = "kmod udev json-c keyutils" S = "${WORKDIR}/git" @@ -28,3 +28,5 @@ do_configure_prepend() { SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +FILES_${PN} += "${datadir}/daxctl/daxctl.conf" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 7/9] keyutils: fix library install path
From: Armin Kuster [v2] fix multilib support Als add native support Signed-off-by: Armin Kuster --- files/fix_library_install_path.patch | 28 keyutils_1.6.bb | 14 -- 2 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 files/fix_library_install_path.patch diff --git a/files/fix_library_install_path.patch b/files/fix_library_install_path.patch new file mode 100644 index 0..938fe2eb5 --- /dev/null +++ b/files/fix_library_install_path.patch @@ -0,0 +1,28 @@ +From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Tue, 26 Sep 2017 07:59:51 + +Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link + +The absolute path of the symlink will be invalid +when populated in sysroot, so use relative path instead. + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Wenzong Fan +{rebased for 1.6] +Signed-off-by: Armin Kuster + +Index: keyutils-1.6/Makefile +=== +--- keyutils-1.6.orig/Makefile keyutils-1.6/Makefile +@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0) + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$(USRLIBDIR) +- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) + sed \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@prefix\@,$(PREFIX),g' \ diff --git a/keyutils_1.6.bb b/keyutils_1.6.bb index c961fa293..4d3a96f29 100644 --- a/keyutils_1.6.bb +++ b/keyutils_1.6.bb @@ -12,13 +12,13 @@ LICENSE = "LGPLv2.1+ & GPLv2.0+" LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" - -inherit siteinfo ptest +inherit siteinfo autotools-brokensep ptest SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ file://keyutils-test-fix-output-format.patch \ file://keyutils-fix-error-report-by-adding-default-message.patch \ file://run-ptest \ + file://fix_library_install_path.patch \ " SRC_URI[md5sum] = "191987b0ab46bb5b50efd70a6e6ce808" @@ -28,14 +28,15 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ NO_ARLIB=1 \ BINDIR=${base_bindir} \ SBINDIR=${base_sbindir} \ -LIBDIR=${base_libdir} \ -USRLIBDIR=${base_libdir} \ +LIBDIR=${libdir} \ +USRLIBDIR=${libdir} \ +INCLUDEDIR=${includedir} \ BUILDFOR=${SITEINFO_BITS}-bit \ NO_GLIBC_KEYERR=1 \ " do_install () { -install -d ${D}/${nonarch_base_libdir}/pkgconfig +install -d ${D}/${libdir}/pkgconfig oe_runmake DESTDIR=${D} install } @@ -44,8 +45,9 @@ do_install_ptest () { sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh } -FILES_${PN}-dev += "${nonarch_base_libdir}/pkgconfig/libkeyutils.pc" RDEPENDS_${PN}-ptest += "lsb" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" + +BBCLASSEXTEND = "native nativesdk" -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 2/9] keyutils: Fix build with usrmerge
From: Alex Kiernan Update BINDIR and SBINDIR so keyutils builds with usrmerge ERROR: keyutils-1.5.10-r0 do_package: QA Issue: keyutils: Files/directories were installed but not shipped in any package: /sbin/key.dns_resolver /sbin/request-key /bin/keyctl Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. keyutils: 3 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Alex Kiernan Signed-off-by: Armin Kuster --- keyutils_1.5.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyutils_1.5.10.bb b/keyutils_1.5.10.bb index 2ead8fa19..a4222b9e9 100644 --- a/keyutils_1.5.10.bb +++ b/keyutils_1.5.10.bb @@ -27,6 +27,8 @@ SRC_URI[sha256sum] = "115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ NO_ARLIB=1 \ +BINDIR=${base_bindir} \ +SBINDIR=${base_sbindir} \ LIBDIR=${base_libdir} \ USRLIBDIR=${base_libdir} \ BUILDFOR=${SITEINFO_BITS}-bit \ -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 3/9] keyutils: update to 1.6
From: Armin Kuster remove patch now included in update: keyutils-use-relative-path-for-link.patch Signed-off-by: Armin Kuster --- files/keyutils-use-relative-path-for-link.patch | 28 - keyutils_1.5.10.bb => keyutils_1.6.bb | 5 ++--- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 files/keyutils-use-relative-path-for-link.patch rename keyutils_1.5.10.bb => keyutils_1.6.bb (86%) diff --git a/files/keyutils-use-relative-path-for-link.patch b/files/keyutils-use-relative-path-for-link.patch deleted file mode 100644 index dde1af44a..0 --- a/files/keyutils-use-relative-path-for-link.patch +++ /dev/null @@ -1,28 +0,0 @@ -Subject: [PATCH] keyutils: use relative path for link - -The absolute path of the symlink will be invalid -when populated in sysroot, so use relative path instead. - -Upstream-Status: Pending - -Signed-off-by: Jackie Huang - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 824bbbf..8ce3a13 100644 a/Makefile -+++ b/Makefile -@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0) - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) -- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) - endif - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key --- -2.11.0 - diff --git a/keyutils_1.5.10.bb b/keyutils_1.6.bb similarity index 86% rename from keyutils_1.5.10.bb rename to keyutils_1.6.bb index a4222b9e9..1d7427da5 100644 --- a/keyutils_1.5.10.bb +++ b/keyutils_1.6.bb @@ -16,14 +16,13 @@ LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ inherit siteinfo ptest SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ - file://keyutils-use-relative-path-for-link.patch \ file://keyutils-test-fix-output-format.patch \ file://keyutils-fix-error-report-by-adding-default-message.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "3771676319bc7b84b1549b5c63ff5243" -SRC_URI[sha256sum] = "115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6" +SRC_URI[md5sum] = "191987b0ab46bb5b50efd70a6e6ce808" +SRC_URI[sha256sum] = "d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115" EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ NO_ARLIB=1 \ -- 2.14.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel