[OE-core] [PATCH V3 07/11] dropbear: add default config file to disable root login
From: Jackie Huang
root login is disabled by default for openssh and we can
enable it through IMAGE_FEATURES 'debug-tweaks' or
'allow-empty-password', so change to the same default
behavior for dropbear.
Signed-off-by: Jackie Huang
---
meta/recipes-core/dropbear/dropbear.inc | 3 +++
meta/recipes-core/dropbear/dropbear/dropbear.default | 2 ++
2 files changed, 5 insertions(+)
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index 16ac644..9596363 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -20,6 +20,7 @@ SRC_URI =
"http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
file://dropbearkey.service \
file://dropbear@.service \
file://dropbear.socket \
+ file://dropbear.default \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}',
'', d)} "
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
@@ -63,6 +64,8 @@ do_install() {
${D}${sbindir} \
${D}${localstatedir}
+ install -m 0644 ${WORKDIR}/dropbear.default
${D}${sysconfdir}/default/dropbear
+
install -m 0755 dropbearmulti ${D}${sbindir}/
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.default
b/meta/recipes-core/dropbear/dropbear/dropbear.default
new file mode 100644
index 000..522453a
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear.default
@@ -0,0 +1,2 @@
+# Disallow root logins by default
+DROPBEAR_EXTRA_ARGS="-w"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 09/11] populate_sdk_ext.bbclass: add ESDK_MANIFEST_EXCLUDES
From: Chen Qi
Add ESDK_MANIFEST_EXCLUDES to enable excluding items in sdk-conf-manifest.
By default, files under conf/ are all added to sdk-conf-manifest, as the
manifest file is set to 'conf/*'.
However, there are situations where some configuration files under conf/
directory are not intended to be added to sdk-conf-manifest, thus adding
ESDK_MANIFEST_EXCLUDES to enable users to do this.
This variable takes the form of glob matching.
e.g.
ESDK_MANIFEST_EXCLUDES = "conf/autogen*"
This would exclude all files under conf/ starting with 'autogen' from
sdk-conf-manifest.
Signed-off-by: Chen Qi
---
meta/classes/populate_sdk_ext.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index e1bba49..017c4b6 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -484,12 +484,18 @@ python copy_buildsystem () {
# sdk_ext_postinst() below) thus the checksum we take here would always
# be different.
manifest_file_list = ['conf/*']
+esdk_manifest_excludes = (d.getVar('ESDK_MANIFEST_EXCLUDES') or '').split()
+esdk_manifest_excludes_list = []
+for exclude_item in esdk_manifest_excludes:
+esdk_manifest_excludes_list += glob.glob(os.path.join(baseoutpath,
exclude_item))
manifest_file = os.path.join(baseoutpath, 'conf', 'sdk-conf-manifest')
with open(manifest_file, 'w') as f:
for item in manifest_file_list:
for fn in glob.glob(os.path.join(baseoutpath, item)):
if fn == manifest_file:
continue
+if fn in esdk_manifest_excludes_list:
+continue
chksum = bb.utils.sha256_file(fn)
f.write('%s\t%s\n' % (chksum, os.path.relpath(fn,
baseoutpath)))
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 08/11] toolchain-scripts.bbclass: do not extend dependency if extended already
From: Kai Kang
When set MULTILIBS with two or more items, such as for mips64:
MULTILIBS ?= "multilib:lib32 multilib:libn32"
It expands dependency once in mutlib.bbclass, and expand again in
toolchain-scripts.bbclass which causes error:
| ERROR: Nothing PROVIDES 'virtual/lib32-libn32-libc'. Close matches:
| virtual/libn32-libc
| virtual/lib32-libc
| virtual/libn32-librpc
| ERROR: Required build target 'libn32-meta-ide-support' has no buildable
providers.
| Missing or unbuildable dependency chain was: ['libn32-meta-ide-support',
'virtual/lib32-libn32-libc']
Signed-off-by: Kai Kang
Signed-off-by: Robert Yang
---
meta/classes/toolchain-scripts.bbclass | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 71da5e5..848bff4 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -170,7 +170,18 @@ python __anonymous () {
deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split():
deps += " %s:do_populate_sysroot" % dep
-for variant in (d.getVar('MULTILIB_VARIANTS') or "").split():
+ml_variants = (d.getVar('MULTILIB_VARIANTS') or "").split()
+
+# don't extend if dep has been extended already
+extended = False
+for variant in ml_variants:
+if dep.startswith(variant) or dep.startswith('virtual/' + variant):
+extended = True
+break
+if extended:
+continue
+
+for variant in ml_variants:
clsextend = oe.classextend.ClassExtender(variant, d)
newdep = clsextend.extend_name(dep)
deps += " %s:do_populate_sysroot" % newdep
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 10/11] rpcbind: add option to make user able to use fixed port number
From: Li Wang
Add option "-p" to specify fixed port number
Signed-off-by: Li Wang
Signed-off-by: Hongxu Jia
Signed-off-by: Yi Zhao
---
.../rpcbind_add_option_to_fix_port_number.patch| 130 +
meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 1 +
2 files changed, 131 insertions(+)
create mode 100644
meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
diff --git
a/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
new file mode 100644
index 000..434b6b1
--- /dev/null
+++
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
@@ -0,0 +1,130 @@
+From 76f8598fd20727908e760cbb497dd6a17eda4af5 Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Wed, 17 Sep 2014 13:22:14 +0800
+Subject: [PATCH] add option to make users able to use fixed port number
+
+Upstream-Status: Submitted
[https://sourceforge.net/p/rpcbind/discussion/716839/thread/32af721d/]
+
+Signed-off-by: Li Wang
+Signed-off-by: Roy Li
+Signed-off-by: Yi Zhao
+---
+ man/rpcbind.8 | 4 +++-
+ src/rpcb_svc_com.c | 17 +
+ src/rpcbind.c | 8 ++--
+ 3 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/man/rpcbind.8 b/man/rpcbind.8
+index af6200f..2e6146b 100644
+--- a/man/rpcbind.8
b/man/rpcbind.8
+@@ -11,7 +11,7 @@
+ .Nd universal addresses to RPC program number mapper
+ .Sh SYNOPSIS
+ .Nm
+-.Op Fl adhiLls
++.Op Fl adhpiLls
+ .Sh DESCRIPTION
+ The
+ .Nm
+@@ -107,6 +107,8 @@ will automatically add
+ and if IPv6 is enabled,
+ .Li ::1
+ to the list.
++.It Fl p
++Bind for fixed UDP port number
+ .It Fl i
+ .Dq Insecure
+ mode.
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index 8aef9e5..c2632a4 100644
+--- a/src/rpcb_svc_com.c
b/src/rpcb_svc_com.c
+@@ -48,6 +48,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -497,6 +498,7 @@ xdr_opaque_parms(XDR *xdrs, struct r_rmtcall_args *cap)
+
+ static struct rmtcallfd_list *rmthead;
+ static struct rmtcallfd_list *rmttail;
++extern unsigned short fixed_port;
+
+ int
+ create_rmtcall_fd(struct netconfig *nconf)
+@@ -504,6 +506,8 @@ create_rmtcall_fd(struct netconfig *nconf)
+ int fd;
+ struct rmtcallfd_list *rmt;
+ SVCXPRT *xprt;
++ struct __rpc_sockinfo si;
++ struct t_bind taddr;
+
+ if ((fd = __rpc_nconf2fd(nconf)) == -1) {
+ if (debugging)
+@@ -512,6 +516,19 @@ create_rmtcall_fd(struct netconfig *nconf)
+ nconf->nc_device, errno);
+ return (-1);
+ }
++
++ if (fixed_port) {
++ __rpc_fd2sockinfo(fd, );
++ memset(, 0, sizeof(taddr));
++ taddr.addr.maxlen = taddr.addr.len = si.si_alen;
++ taddr.addr.buf = malloc(si.si_alen);
++ if (taddr.addr.buf == NULL) {
++ return -1;
++ }
++ *(unsigned short *)(&(taddr.addr.buf[0])) = si.si_af;
++ *(unsigned short *)(&(taddr.addr.buf[2])) = htons(fixed_port);
++ xprt = svc_tli_create(fd, nconf, , RPC_MAXDATASIZE,
RPC_MAXDATASIZE);
++ } else
+ xprt = svc_tli_create(fd, 0, (struct t_bind *) 0, 0, 0);
+ if (xprt == NULL) {
+ if (debugging)
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index 137011b..dc3d2d6 100644
+--- a/src/rpcbind.c
b/src/rpcbind.c
+@@ -111,6 +111,7 @@ int runasdaemon = 0;
+ int insecure = 0;
+ int oldstyle_local = 0;
+ int verboselog = 0;
++unsigned short fixed_port = 0;
+
+ char **hosts = NULL;
+ int nhosts = 0;
+@@ -869,7 +870,7 @@ parseargs(int argc, char *argv[])
+ {
+ int c;
+ oldstyle_local = 1;
+- while ((c = getopt(argc, argv, "adh:ilswf")) != -1) {
++ while ((c = getopt(argc, argv, "adh:p:ilswf")) != -1) {
+ switch (c) {
+ case 'a':
+ doabort = 1;/* when debugging, do an abort on */
+@@ -887,6 +888,9 @@ parseargs(int argc, char *argv[])
+ if (hosts[nhosts - 1] == NULL)
+ errx(1, "Out of memory");
+ break;
++ case 'p':
++ fixed_port = atoi(optarg);
++ break;
+ case 'i':
+ insecure = 1;
+ break;
+@@ -905,7 +909,7 @@ parseargs(int argc, char *argv[])
+ break;
+ #endif
+ default:/* error */
+- fprintf(stderr, "usage: rpcbind [-adhilswf]\n");
++ fprintf(stderr, "usage: rpcbind [-adhpilswf]\n");
+ exit (1);
+ }
+ }
+--
+1.9.1
+
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
index dcdee6c..3c6774c 100644
---
[OE-core] [PATCH V3 11/11] openssl-nativesdk: Fix "can't open config file" warning
From: Ovidiu Panait
When SDK is not installed in the default location, openssl will not be
able to find the the openssl.cnf config file:
"WARNING: can't open config file: /usr/lib/ssl/openssl.cnf"
To fix this, we need to provide the environment variable $OPENSSL_CONF
pointing to the correct config file location.
Signed-off-by: Ovidiu Panait
Signed-off-by: Yi Zhao
---
.../openssl/openssl/environment.d-openssl.sh | 1 +
meta/recipes-connectivity/openssl/openssl10.inc | 7 +++
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 5 +
meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 11 +++
4 files changed, 24 insertions(+)
create mode 100644
meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
diff --git a/meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
b/meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
new file mode 100644
index 000..b9cc24a
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
@@ -0,0 +1 @@
+export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf"
diff --git a/meta/recipes-connectivity/openssl/openssl10.inc
b/meta/recipes-connectivity/openssl/openssl10.inc
index f7a8de8..55dfb7a 100644
--- a/meta/recipes-connectivity/openssl/openssl10.inc
+++ b/meta/recipes-connectivity/openssl/openssl10.inc
@@ -282,5 +282,12 @@ do_install_append_class-native() {
OPENSSL_ENGINES=${libdir}/ssl/engines
}
+do_install_append_class-nativesdk() {
+mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+install -m 644 ${WORKDIR}/environment.d-openssl.sh
${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+}
+
+FILES_${PN}_append_class-nativesdk = "
${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
+
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 413ebf3..7cae553 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -47,6 +47,11 @@ SRC_URI_append_class-target = "\
file://reproducible-cflags.patch \
file://reproducible-mkbuildinf.patch \
"
+
+SRC_URI_append_class-nativesdk = " \
+ file://environment.d-openssl.sh \
+ "
+
SRC_URI[md5sum] = "44279b8557c3247cbe324e2322ecd114"
SRC_URI[sha256sum] =
"ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 94b75eb..29f83a3 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -19,6 +19,10 @@ SRC_URI =
"http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \
"
+SRC_URI_append_class-nativesdk = " \
+ file://environment.d-openssl.sh \
+ "
+
S = "${WORKDIR}/openssl-${PV}"
inherit lib_package multilib_header ptest
@@ -142,6 +146,13 @@ do_install_append_class-native () {
sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
}
+do_install_append_class-nativesdk() {
+mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+install -m 644 ${WORKDIR}/environment.d-openssl.sh
${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+}
+
+FILES_${PN}_append_class-nativesdk = "
${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
+
do_install_ptest() {
cp -r * ${D}${PTEST_PATH}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 03/11] busybox: handle syslog
From: "Yadi.hu"
If CONFIG_KLOGD is not enabled, then the related service file should
not be installed, The error message is below:
Cannot add dependency job for unit busybox-klogd.service,
ignoring: Unit busybox-klogd.service failed to load:
No such file or directory.
So we should first check the configuration before we install these
service files.
Signed-off-by: Yadi.hu
Signed-off-by: Mingli Yu
---
meta/recipes-core/busybox/busybox.inc | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index d1675c3..8c6dbba 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -315,20 +315,24 @@ do_install () {
fi
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
+install -d ${D}${systemd_unitdir}/system
+sed 's,@base_sbindir@,${base_sbindir},g' <
${WORKDIR}/busybox-klogd.service.in \
+> ${D}${systemd_unitdir}/system/busybox-klogd.service
+fi
+
if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
install -d ${D}${systemd_unitdir}/system
sed 's,@base_sbindir@,${base_sbindir},g' <
${WORKDIR}/busybox-syslog.service.in \
> ${D}${systemd_unitdir}/system/busybox-syslog.service
+if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ;
then
+sed -i '/klog/d'
${D}${systemd_unitdir}/system/busybox-syslog.service
+fi
if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default
${D}${sysconfdir}/default/busybox-syslog
fi
fi
-if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
-install -d ${D}${systemd_unitdir}/system
-sed 's,@base_sbindir@,${base_sbindir},g' <
${WORKDIR}/busybox-klogd.service.in \
- > ${D}${systemd_unitdir}/system/busybox-klogd.service
-fi
fi
# Remove the sysvinit specific configuration file for systemd systems to
avoid confusion
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 04/11] xinetd: add Init Script Actions to xinetd script
From: Shan Hai The chkconfig fails to list the xinetd service because the xinetd lacks Init Script Actions in it, add the actions to fix it. Signed-off-by: Shan Hai Signed-off-by: Mingli Yu --- meta/recipes-extended/xinetd/xinetd/xinetd.init | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init index 777c2c8..a021410 100644 --- a/meta/recipes-extended/xinetd/xinetd/xinetd.init +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init @@ -1,5 +1,15 @@ #!/bin/sh -# +### BEGIN INIT INFO +# Provides: inetd +# Required-Start:$local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start or stop the xinetd daemon. +### END INIT INFO + # /etc/init.d/xinetd -- script to start and stop xinetd. # Source function library. -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 01/11] base.bbclass: Add buildcfg multilib values
From: Mark Hatle
When displaying the buildcfg for the end user, add in processing
of the multilib variants. Only the items that are not the same as
the DEFAULTTUNE are displayed.
I.e.:
Build Configuration:
BB_VERSION= "1.19.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "CentOS-6.4"
DISTRO_VERSION= "oe-core.0"
MACHINE = "qemux86-64"
DEFAULTTUNE = "x86-64"
TARGET_SYS= "x86_64-oe-linux"
TUNE_FEATURES = "m64"
TARGET_FPU= ""
lib32: DEFAULTTUNE = "x86"
lib32: TARGET_SYS= "i586-oe-linux"
lib32: TUNE_FEATURES = "m32"
meta = "master:1975f3d7bbeb184489a5d0a2e0de231f317d3e1b"
The order of the displayed elements was changed slightly to group the
host information together, as well as group the target information
together.
Signed-off-by: Mark Hatle
Signed-off-by: Hongxu Jia
Signed-off-by: Robert Yang
---
meta/classes/base.bbclass | 13 -
meta/conf/bitbake.conf| 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 1a359a0..47ecff4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -188,7 +188,7 @@ def get_layers_branch_rev(d):
return layers_branch_rev
-BUILDCFG_FUNCS ??= "buildcfg_vars get_layers_branch_rev buildcfg_neededvars"
+BUILDCFG_FUNCS ??= "buildcfg_vars buildcfg_multilibs get_layers_branch_rev
buildcfg_neededvars"
BUILDCFG_FUNCS[type] = "list"
def buildcfg_vars(d):
@@ -198,6 +198,17 @@ def buildcfg_vars(d):
if value is not None:
yield '%-20s = "%s"' % (var, value)
+def buildcfg_multilibs(d):
+variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+for variant in variants.split():
+localdata = get_multilib_datastore(variant, d)
+statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
+for var in statusvars:
+origvalue = d.getVar(var, True)
+variantvalue = localdata.getVar(var, True)
+if origvalue and variantvalue and origvalue != variantvalue:
+yield '%-7s %-17s = "%s"' % (variant + ":", var, variantvalue)
+
def buildcfg_neededvars(d):
needed_vars = oe.data.typed_value("BUILDCFG_NEEDEDVARS", d)
pesteruser = []
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3b2ef9f..1d9c715 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -698,7 +698,7 @@ PREFERRED_PROVIDER_virtual/fakeroot-native ?=
"pseudo-native"
# Pre-build configuration output
BUILDCFG_HEADER = "Build Configuration:"
-BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING TARGET_SYS MACHINE
DISTRO DISTRO_VERSION TUNE_FEATURES TARGET_FPU"
+BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING DISTRO DISTRO_VERSION
MACHINE DEFAULTTUNE TARGET_SYS TUNE_FEATURES TARGET_FPU"
BUILDCFG_VARS[type] = "list"
BUILDCFG_NEEDEDVARS = "TARGET_ARCH TARGET_OS"
BUILDCFG_NEEDEDVARS[type] = "list"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 02/11] lsof: fix LSOF_CCV in version.h
From: Jian Liu
When using cross compiler to build the package "lsof" on a host,
the value of LSOF_CCV in version.h genegrated by the Makefile
is the version of the compiler on the host while it should be
the version of cross compiler.
On Ubuntu host before fixed:
#define LSOF_CCV"4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) "
After fixed:
#define LSOF_CCV"4.9.1 (GCC) "
Signed-off-by: Jian Liu
Signed-off-by: Wenzong Fan
---
.../files/Configure-fix-LSOF_CCV-assignment.patch | 42 ++
meta/recipes-extended/lsof/lsof_4.89.bb| 4 ++-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
diff --git
a/meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
b/meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
new file mode 100644
index 000..17c5c4b
--- /dev/null
+++ b/meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
@@ -0,0 +1,42 @@
+From c197389c9d8ccdbfcfe1dc31da6b4ce69b90ecf6 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan
+Date: Thu, 23 Oct 2014 03:43:27 -0400
+Subject: [PATCH] Configure: fix LSOF_CCV assignment
+
+When using cross compiler to build the package "lsof" on a host,
+the value of LSOF_CCV in version.h genegrated by the Makefile
+is the version of the compiler on the host while it should be
+the version of cross compiler.
+
+On Ubuntu host before fixed:
+ #define LSOF_CCV"4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) "
+
+After fixed:
+ #define LSOF_CCV"4.9.1 (GCC) "
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan
+Signed-off-by: Robert Yang
+
+---
+ Configure |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Configure b/Configure
+index 29c1292..e5a199f 100755
+--- a/Configure
b/Configure
+@@ -2705,8 +2705,8 @@ LOCKF_OWNER4
+ if test "X$LSOF_CC" = "X" # {
+ then
+ LSOF_CC=cc
+- LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+ fi# }
++LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+ if test "X$LINUX_CONF_CC" = "X" # {
+ then
+ LINUX_CONF_CC=$LSOF_CC
+--
+1.7.9.5
+
diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb
b/meta/recipes-extended/lsof/lsof_4.89.bb
index 14546db..52b40dc 100644
--- a/meta/recipes-extended/lsof/lsof_4.89.bb
+++ b/meta/recipes-extended/lsof/lsof_4.89.bb
@@ -13,7 +13,8 @@ LIC_FILES_CHKSUM =
"file://00README;beginline=645;endline=679;md5=964df275d26429
SRC_URI =
"http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2
\
file://lsof-remove-host-information.patch \
- "
+ file://Configure-fix-LSOF_CCV-assignment.patch \
+"
SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386"
SRC_URI[sha256sum] =
"81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718"
@@ -40,6 +41,7 @@ python do_unpack () {
export LSOF_INCLUDE = "${STAGING_INCDIR}"
do_configure () {
+ export LSOF_CC="${CC}"
export LSOF_AR="${AR} cr"
export LSOF_RANLIB="${RANLIB}"
if [ "x${GLIBCVERSION}" != "x" ]; then
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 00/11] meta: various fixes
* V3: - Fix RP's comments Fix comments for "lsof: fix LSOF_CCV in version.h" Fix "rootfs-postcommands: split ssh_allow_empty_password" since it caused a oe-selftest case failed. - Drop already merge commits - Drop unneeded commit: gcc-sanitizers: Fix libtool .la files - Drop an incorrect commit which caused oe-selftest failed: glibc: re-package for libnss-db This one needs rework. - Ran "oe-selftest -a" to test it. * V2: Rebase to up-to-date master branch and drop already merged patches. * V1: Initial version // Robert The following changes since commit cd195bdf5dd2c8ff03c58a63dcabe88b142d2a9c: oe-pkgdata-util: package-info: Re-add support for the --extra option (2018-06-04 15:14:43 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/fix_from_wr http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/fix_from_wr Chen Qi (1): populate_sdk_ext.bbclass: add ESDK_MANIFEST_EXCLUDES Jackie Huang (2): rootfs-postcommands: split ssh_allow_empty_password dropbear: add default config file to disable root login Jian Liu (1): lsof: fix LSOF_CCV in version.h Kai Kang (1): toolchain-scripts.bbclass: do not extend dependency if extended already Li Wang (1): rpcbind: add option to make user able to use fixed port number Mark Hatle (1): base.bbclass: Add buildcfg multilib values Ovidiu Panait (1): openssl-nativesdk: Fix "can't open config file" warning Robert Yang (1): oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN Shan Hai (1): xinetd: add Init Script Actions to xinetd script Yadi.hu (1): busybox: handle syslog meta/classes/base.bbclass | 13 ++- meta/classes/image.bbclass | 2 +- meta/classes/populate_sdk_ext.bbclass | 6 + meta/classes/rootfs-postcommands.bbclass | 25 +++- meta/classes/toolchain-scripts.bbclass | 13 ++- meta/conf/bitbake.conf | 2 +- meta/lib/oe/copy_buildsystem.py| 18 +++ meta/lib/oeqa/selftest/cases/imagefeatures.py | 4 +- .../openssl/openssl/environment.d-openssl.sh | 1 + meta/recipes-connectivity/openssl/openssl10.inc| 7 ++ .../recipes-connectivity/openssl/openssl_1.0.2o.bb | 5 + .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 11 ++ meta/recipes-core/busybox/busybox.inc | 14 ++- meta/recipes-core/dropbear/dropbear.inc| 3 + .../dropbear/dropbear/dropbear.default | 2 + .../files/Configure-fix-LSOF_CCV-assignment.patch | 42 +++ meta/recipes-extended/lsof/lsof_4.89.bb| 4 +- .../rpcbind_add_option_to_fix_port_number.patch| 130 + meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 1 + meta/recipes-extended/xinetd/xinetd/xinetd.init| 12 +- 20 files changed, 299 insertions(+), 16 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default create mode 100644 meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch create mode 100644 meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 05/11] oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN
It is helpful when exclude a lot of layers. It uses python re, and
supports multiple patterns (separated by space).
Signed-off-by: Robert Yang
---
meta/lib/oe/copy_buildsystem.py | 18 ++
1 file changed, 18 insertions(+)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index 4b94806..c43c2bd 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -1,5 +1,12 @@
# This class should provide easy access to the different aspects of the
# buildsystem such as layers, bitbake location, etc.
+#
+# SDK_LAYERS_EXCLUDE: Layers which will be excluded from SDK layers.
+# SDK_LAYERS_EXCLUDE_PATTERN: The simiar to SDK_LAYERS_EXCLUDE, this supports
+# python regular expression, use space as
separator,
+# e.g.: ".*-downloads closed-.*"
+#
+
import stat
import shutil
@@ -23,8 +30,10 @@ class BuildSystem(object):
self.context = context
self.layerdirs = [os.path.abspath(pth) for pth in
d.getVar('BBLAYERS').split()]
self.layers_exclude = (d.getVar('SDK_LAYERS_EXCLUDE') or "").split()
+self.layers_exclude_pattern = d.getVar('SDK_LAYERS_EXCLUDE_PATTERN')
def copy_bitbake_and_layers(self, destdir, workspace_name=None):
+import re
# Copy in all metadata layers + bitbake (as repositories)
layers_copied = []
bb.utils.mkdirhier(destdir)
@@ -40,8 +49,17 @@ class BuildSystem(object):
# Exclude layers
for layer_exclude in self.layers_exclude:
if layer_exclude in layers:
+bb.note('Excluded %s from sdk layers since it is in
SDK_LAYERS_EXCLUDE' % layer_exclude)
layers.remove(layer_exclude)
+if self.layers_exclude_pattern:
+layers_cp = layers[:]
+for pattern in self.layers_exclude_pattern.split():
+for layer in layers_cp:
+if re.match(pattern, layer):
+bb.note('Excluded %s from sdk layers since matched
SDK_LAYERS_EXCLUDE_PATTERN' % layer)
+layers.remove(layer)
+
workspace_newname = workspace_name
if workspace_newname:
layernames = [os.path.basename(layer) for layer in layers]
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 06/11] rootfs-postcommands: split ssh_allow_empty_password
From: Jackie Huang
"allow root login" should not be bundled in ssh_allow_empty_password,
because some distro may want only one of "allow root login" and "allow
empty password", so split it out into ssh_allow_root_login and add new
imagefeature allow-root-login so they can be controlled separately,
debug-tweaks will still include both of them.
Signed-off-by: Jackie Huang
---
meta/classes/image.bbclass| 2 +-
meta/classes/rootfs-postcommands.bbclass | 25 ++---
meta/lib/oeqa/selftest/cases/imagefeatures.py | 4 ++--
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2247b30..28e64ba 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -23,7 +23,7 @@ inherit ${TESTIMAGECLASS}
# IMAGE_FEATURES may contain any available package group
IMAGE_FEATURES ?= ""
IMAGE_FEATURES[type] = "list"
-IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs
empty-root-password allow-empty-password post-install-logging"
+IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs
empty-root-password allow-empty-password allow-root-login post-install-logging"
# Generate companion debugfs?
IMAGE_GEN_DEBUGFS ?= "0"
diff --git a/meta/classes/rootfs-postcommands.bbclass
b/meta/classes/rootfs-postcommands.bbclass
index 221869e..7dde2f8 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -2,9 +2,12 @@
# Zap the root password if debug-tweaks feature is not enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [
'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ; ",d)}'
-# Allow dropbear/openssh to accept logins from accounts with an empty password
string if debug-tweaks is enabled
+# Allow dropbear/openssh to accept logins from accounts with an empty password
string if debug-tweaks or allow-empty-password is enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [
'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}'
+# Allow dropbear/openssh to accept root logins if debug-tweaks or
allow-root-login is enabled
+ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [
'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}'
+
# Enable postinst logging if debug-tweaks is enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [
'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}'
@@ -143,12 +146,11 @@ zap_empty_root_password () {
}
#
-# allow dropbear/openssh to accept root logins and logins from accounts with
an empty password string
+# allow dropbear/openssh to accept logins from accounts with an empty password
string
#
ssh_allow_empty_password () {
for config in sshd_config sshd_config_readonly; do
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then
- sed -i
's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
sed -i
's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
fi
done
@@ -171,6 +173,23 @@ ssh_allow_empty_password () {
fi
}
+#
+# allow dropbear/openssh to accept root logins
+#
+ssh_allow_root_login () {
+ for config in sshd_config sshd_config_readonly; do
+ if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then
+ sed -i
's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
+ fi
+ done
+
+ if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then
+ if grep -q DROPBEAR_EXTRA_ARGS
${IMAGE_ROOTFS}${sysconfdir}/default/dropbear 2>/dev/null ; then
+ sed -i '/^DROPBEAR_EXTRA_ARGS=/ s/-w//'
${IMAGE_ROOTFS}${sysconfdir}/default/dropbear
+ fi
+ fi
+}
+
ssh_disable_dns_lookup () {
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
sed -i -e 's:#UseDNS yes:UseDNS no:'
${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 09e0b20..b60ab8a 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -23,7 +23,7 @@ class ImageFeatures(OESelftestTestCase):
AutomatedBy: Daniel Istrate
"""
-features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh
empty-root-password allow-empty-password"\n'
+features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh
empty-root-password allow-empty-password allow-root-login"\n'
features += 'INHERIT += "extrausers"\n'
features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {};
Re: [OE-core] [PATCH] gmp: do the multilib_header magic for gmp.h
Sorry, I did't noticed that. yes, it have merged On 06/05/2018 05:37 PM, Richard Purdie wrote: On Tue, 2018-06-05 at 15:25 +0800, Changqing Li wrote: Ping Already merged? http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=master=cc8f888018f55e6227b846429186307000d76a2 Cheers, Richard -- BRs Sandy(Li Changqing) +861084778653 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4] ltp: bump to release 20180515
this version looks good to me.
On Tue, Jun 5, 2018 at 3:23 PM, Daniel Díaz wrote:
> The following patches have made it to upstream:
> * 0001-configure-Fix-default-value-of-without-numa-switch-i.patch
> * 0001-configure-add-knob-to-control-numa-support.patch
> * 0003-Add-knob-to-control-tirpc-support.patch
> * 0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
> * 0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
>
> These patches have been refreshed in order to apply cleanly
> and without any fuzz:
> * 0004-build-Add-option-to-select-libc-implementation.patch
> * 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
> * 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
> * 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
> * 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
>
> This next patch was added to the set of patches that make LTP
> build with musl:
> * 0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
>
> Signed-off-by: Daniel Díaz
> ---
> v2: Actually change SRCREV, refresh/remove patches as needed.
> v3: Patch diff with -M.
> v4: Add patch for fs/read_all and musl.
>
> .../ltp/0001-Disable-rpc01-on-glibc-and-musl.patch | 29
> ...ix-default-value-of-without-numa-switch-i.patch | 31 -
> ...onfigure-add-knob-to-control-numa-support.patch | 50 --
> .../0003-Add-knob-to-control-tirpc-support.patch | 46 -
> ...-Add-option-to-select-libc-implementation.patch | 77
> +-
> ...__GLIBC_PREREQ-is-defined-before-using-it.patch | 26
> ...010-replace-__BEGIN_DECLS-and-__END_DECLS.patch | 75 -
> ..._GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch | 27
> ...n.h-Use-sighandler_t-instead-of-__sighand.patch | 20 +++---
> ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 2 +-
> ...fine-FNM_EXTMATCH-if-not-already-like-und.patch | 44 +
> ...-make-is_fuse-return-zero-if-fs_type-is-N.patch | 40 ---
> .../ltp/{ltp_20180118.bb => ltp_20180515.bb} | 9 +--
> 13 files changed, 132 insertions(+), 344 deletions(-)
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
> create mode 100644
> meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
> rename meta/recipes-extended/ltp/{ltp_20180118.bb => ltp_20180515.bb} (91%)
>
> diff --git
> a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
> b/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
> deleted file mode 100644
> index 78c6dfb..000
> --- a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From ff39e6b69f0b26dad8ab685ee6116ff92bc363db Mon Sep 17 00:00:00 2001
> -From: Khem Raj
> -Date: Sat, 28 Apr 2018 00:08:55 -0700
> -Subject: [PATCH] Disable rpc01 on glibc and musl
> -
> -It is not buildable with libtirpc
> -
> -Signed-off-by: Khem Raj
>
> -Upstream-Status: Pending
> -
> - testcases/network/rpc/basic_tests/Makefile | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/testcases/network/rpc/basic_tests/Makefile
> b/testcases/network/rpc/basic_tests/Makefile
> -index 66e9d5675..16a64e7da 100644
> a/testcases/network/rpc/basic_tests/Makefile
> -+++ b/testcases/network/rpc/basic_tests/Makefile
> -@@ -23,4 +23,7 @@
> - top_srcdir?= ../../../..
> -
> - include $(top_srcdir)/include/mk/env_pre.mk
> -+
> -+FILTER_OUT_DIRS += rpc01
> -+
> - include $(top_srcdir)/include/mk/generic_trunk_target.mk
> ---
> -2.17.0
> -
> diff --git
> a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
>
> b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
> deleted file mode 100644
> index da62687..000
> ---
> a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From 4ace68a6ba501907a0741dba5f5f155e06a74c35 Mon Sep 17 00:00:00 2001
> -From: Petr Vorel
> -Date: Wed, 7 Feb 2018 11:09:49 +0100
> -Subject: [PATCH] configure: Fix default value of --without-numa switch in
> help
> -
> -The default value is no.
> -
> -Fixes: 39a85a1f1 ("configure: add knob to control numa support")
> -
> -Signed-off-by: Petr Vorel
> -Upstream-Status:
[OE-core] [PATCH v4] ltp: bump to release 20180515
The following patches have made it to upstream:
* 0001-configure-Fix-default-value-of-without-numa-switch-i.patch
* 0001-configure-add-knob-to-control-numa-support.patch
* 0003-Add-knob-to-control-tirpc-support.patch
* 0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
* 0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
These patches have been refreshed in order to apply cleanly
and without any fuzz:
* 0004-build-Add-option-to-select-libc-implementation.patch
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
* 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
* 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
* 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
This next patch was added to the set of patches that make LTP
build with musl:
* 0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
Signed-off-by: Daniel Díaz
---
v2: Actually change SRCREV, refresh/remove patches as needed.
v3: Patch diff with -M.
v4: Add patch for fs/read_all and musl.
.../ltp/0001-Disable-rpc01-on-glibc-and-musl.patch | 29
...ix-default-value-of-without-numa-switch-i.patch | 31 -
...onfigure-add-knob-to-control-numa-support.patch | 50 --
.../0003-Add-knob-to-control-tirpc-support.patch | 46 -
...-Add-option-to-select-libc-implementation.patch | 77 +-
...__GLIBC_PREREQ-is-defined-before-using-it.patch | 26
...010-replace-__BEGIN_DECLS-and-__END_DECLS.patch | 75 -
..._GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch | 27
...n.h-Use-sighandler_t-instead-of-__sighand.patch | 20 +++---
...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 2 +-
...fine-FNM_EXTMATCH-if-not-already-like-und.patch | 44 +
...-make-is_fuse-return-zero-if-fs_type-is-N.patch | 40 ---
.../ltp/{ltp_20180118.bb => ltp_20180515.bb} | 9 +--
13 files changed, 132 insertions(+), 344 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
rename meta/recipes-extended/ltp/{ltp_20180118.bb => ltp_20180515.bb} (91%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
b/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
deleted file mode 100644
index 78c6dfb..000
--- a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ff39e6b69f0b26dad8ab685ee6116ff92bc363db Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sat, 28 Apr 2018 00:08:55 -0700
-Subject: [PATCH] Disable rpc01 on glibc and musl
-
-It is not buildable with libtirpc
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
-
- testcases/network/rpc/basic_tests/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/testcases/network/rpc/basic_tests/Makefile
b/testcases/network/rpc/basic_tests/Makefile
-index 66e9d5675..16a64e7da 100644
a/testcases/network/rpc/basic_tests/Makefile
-+++ b/testcases/network/rpc/basic_tests/Makefile
-@@ -23,4 +23,7 @@
- top_srcdir?= ../../../..
-
- include $(top_srcdir)/include/mk/env_pre.mk
-+
-+FILTER_OUT_DIRS += rpc01
-+
- include $(top_srcdir)/include/mk/generic_trunk_target.mk
---
-2.17.0
-
diff --git
a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
deleted file mode 100644
index da62687..000
---
a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4ace68a6ba501907a0741dba5f5f155e06a74c35 Mon Sep 17 00:00:00 2001
-From: Petr Vorel
-Date: Wed, 7 Feb 2018 11:09:49 +0100
-Subject: [PATCH] configure: Fix default value of --without-numa switch in help
-
-The default value is no.
-
-Fixes: 39a85a1f1 ("configure: add knob to control numa support")
-
-Signed-off-by: Petr Vorel
-Upstream-Status: Accepted
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b39a31d..d66ea00 100644
a/configure.ac
-+++ b/configure.ac
-@@ -86,7 +86,7 @@ fi
- # Numa
- AC_ARG_WITH([numa],
- AC_HELP_STRING([--without-numa],
--[without numa
Re: [OE-core] [PATCH 1/3] opkg: avoid running postinst scripts twice when using systemd
Would love to see this merged, this is a long-standing issue.
On Tue, May 15, 2018 at 7:05 AM Stefan Agner wrote:
> From: Stefan Agner
>
> OpenEmbedded has a built-in mechanism to run postinst scripts offline
> at build time or, if necessary, on first boot (delayed execution). If
> the latter is the case and systemd is in use, two services end up
> doing the same thing:
> - opkg-configure.service starts "opkg configure" directly.
> - run-postinsts.service starts "/usr/sbin/run-postinsts" which runs
> postinst scripts stored in /etc/ipk-postinsts/ or "opkg configure"
> if package management is installed.
>
> Since the run-postinsts.service is also used in cases where no
> package management is in use, it is the primary means of handling
> postinsts.
>
> Get rid of the opkg-configure.service to avoid duplicate opkg
> configure execution.
>
> Signed-off-by: Stefan Agner
> ---
> meta/recipes-devtools/opkg/opkg/opkg-configure.service | 17
> -
> meta/recipes-devtools/opkg/opkg_0.3.6.bb | 14
> --
> 2 files changed, 31 deletions(-)
> delete mode 100644 meta/recipes-devtools/opkg/opkg/opkg-configure.service
>
> diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service
> b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
> deleted file mode 100644
> index 432c3ddc28..00
> --- a/meta/recipes-devtools/opkg/opkg/opkg-configure.service
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -[Unit]
> -Description=Opkg first boot configure
> -DefaultDependencies=no
> -After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
> -Before=sysinit.target
> -
> -[Service]
> -Type=oneshot
> -EnvironmentFile=-@SYSCONFDIR@/default/postinst
> -ExecStart=-@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then
> @BINDIR@/opkg configure > $LOGFILE 2>&1; else @BINDIR@/opkg configure; fi"
> -ExecStartPost=@BASE_BINDIR@/systemctl --no-reload disable
> opkg-configure.service
> -StandardOutput=syslog
> -RemainAfterExit=No
> -
> -[Install]
> -WantedBy=basic.target
> -WantedBy=sysinit.target
> diff --git a/meta/recipes-devtools/opkg/opkg_0.3.6.bb
> b/meta/recipes-devtools/opkg/opkg_0.3.6.bb
> index 70f20af739..579b51166c 100644
> --- a/meta/recipes-devtools/opkg/opkg_0.3.6.bb
> +++ b/meta/recipes-devtools/opkg/opkg_0.3.6.bb
> @@ -12,7 +12,6 @@ DEPENDS = "libarchive"
> PE = "1"
>
> SRC_URI = "
> http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
> - file://opkg-configure.service \
> file://opkg.conf \
>
> file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
> "
> @@ -22,8 +21,6 @@ SRC_URI[sha256sum] =
> "f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf
>
> inherit autotools pkgconfig systemd
>
> -SYSTEMD_SERVICE_${PN} = "opkg-configure.service"
> -
> target_localstatedir := "${localstatedir}"
> OPKGLIBDIR = "${target_localstatedir}/lib"
>
> @@ -46,16 +43,6 @@ do_install_append () {
>
> # We need to create the lock directory
> install -d ${D}${OPKGLIBDIR}/opkg
> -
> - if
> ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
> - install -d ${D}${systemd_unitdir}/system
> - install -m 0644 ${WORKDIR}/opkg-configure.service
> ${D}${systemd_unitdir}/system/
> - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> - -e 's,@SYSCONFDIR@,${sysconfdir},g' \
> - -e 's,@BINDIR@,${bindir},g' \
> - -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
> -
> ${D}${systemd_unitdir}/system/opkg-configure.service
> - fi
> }
>
> RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config
> libarchive"
> @@ -68,7 +55,6 @@ RPROVIDES_${PN} = "opkg-collateral"
> PACKAGES =+ "libopkg"
>
> FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
> -FILES_${PN} += "${systemd_unitdir}/system/"
>
> BBCLASSEXTEND = "native nativesdk"
>
> --
> 2.13.6
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3] minicom: fix SRC_URI
The Debian mirror network can't be relied upon as files are removed
once they're not in any releases. For this reason, we prefer
snapshot.debian.org for SRC_URI (with DEBIAN_MIRROR for the upstream
check).
Ross
On 4 June 2018 at 17:39, Oleksandr Kravchuk
wrote:
> The original source, alioth.debian.org has been permanently taken down
> by the Debian Project. Use Debian mirrors instead.
>
> Source: https://wiki.debian.org/Alioth
>
> Signed-off-by: Oleksandr Kravchuk
> ---
> meta/recipes-extended/minicom/minicom_2.7.1.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/minicom/minicom_2.7.1.bb
> b/meta/recipes-extended/minicom/minicom_2.7.1.bb
> index e6afe2b655..d963da7436 100644
> --- a/meta/recipes-extended/minicom/minicom_2.7.1.bb
> +++ b/meta/recipes-extended/minicom/minicom_2.7.1.bb
> @@ -1,5 +1,5 @@
> SUMMARY = "Text-based modem control and terminal emulation program"
> -HOMEPAGE = "http://alioth.debian.org/projects/minicom/;
> +HOMEPAGE = "https://salsa.debian.org/minicom-team/minicom/;
> DESCRIPTION = "Minicom is a text-based modem control and terminal emulation
> program for Unix-like operating systems"
> SECTION = "console/network"
> DEPENDS = "ncurses virtual/libiconv"
> @@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \
>
> file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81"
>
> -SRC_URI =
> "https://alioth.debian.org/frs/download.php/latestfile/3/${BP}.tar.gz \
> +SRC_URI = "${DEBIAN_MIRROR}/main/m/minicom/minicom_${PV}.orig.tar.gz \
> file://allow.to.disable.lockdev.patch \
> file://0001-fix-minicom-h-v-return-value-is-not-0.patch \
> file://0001-Fix-build-issus-surfaced-due-to-musl.patch \
> @@ -16,7 +16,7 @@ SRC_URI =
> "https://alioth.debian.org/frs/download.php/latestfile/3/${BP}.tar.gz
> SRC_URI[md5sum] = "9021cb8c5445f6e6e74b2acc39962d62"
> SRC_URI[sha256sum] =
> "532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1"
>
> -UPSTREAM_CHECK_URI = "https://alioth.debian.org/frs/?group_id=30018;
> +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/m/minicom/"
>
> PACKAGECONFIG ??= ""
> PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev"
> --
> 2.17.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3] iso-codes: update to 3.79 and fix SRC_URI
Maybe, if it was commonly needed. But 99.9% of tarball upgrades can be
done with a simple recipe file rename, with the version propagating
into the tarball path and filename via ${PV}.
Alex
2018-06-05 21:45 GMT+03:00 Burton, Ross :
> Well that's frustrating isn't it. Need a way of teaching devtool
> upgrade how to find new tarball URLs from a HTML page maybe?
>
> Ross
>
> On 5 June 2018 at 18:08, Alexander Kanavin wrote:
>> This was discussed in private. The maintainer uploaded tarballs have a
>> random hash in the URI, which will break 'devtool upgrade' and make
>> manual updates inconvenient. And autogenerated tarballs are likely to
>> suffer from same issue as githb ones.
>>
>> Alex
>>
>> 2018-06-05 20:04 GMT+03:00 Oleksandr Kravchuk
>> :
>>> Ross -
>>>
>>> We've discussed this. Check out discussion of v2 of the patch, please.
>>>
>>>
>>>
>>> On 05/06/18 19:00, Burton, Ross wrote:
No need to change to git, salsa has a tarball at
https://salsa.debian.org/iso-codes-team/iso-codes/tags.
Ross
On 5 June 2018 at 17:06, Oleksandr Kravchuk
wrote:
>
> Updated package to version 3.79.
>
> The original FTP server, alioth.debian.org has been permanently taken
> down by the Debian Project and replaced with salsa.debian.org.
>
> Source: https://wiki.debian.org/Alioth
>
> Also added HOMEPAGE, and BUGTRACKER.
>
> Signed-off-by: Oleksandr Kravchuk
> ---
> .../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb} | 10 +++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
> rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb =>
> iso-codes_3.79.bb} (56%)
>
> diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
> b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
> similarity index 56%
> rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
> rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
> index bd613ac573..72cb542f18 100644
> --- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
> +++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
> @@ -1,15 +1,19 @@
> SUMMARY = "ISO language, territory, currency, script codes and their
> translations"
> +HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
> +BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
> +
> LICENSE = "LGPLv2.1"
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
>
> -SRC_URI =
> "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
> -SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
> -SRC_URI[sha256sum] =
> "21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
> +SRC_URI =
> "git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
> +SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
>
> # inherit gettext cannot be used, because it adds gettext-native to
> BASEDEPENDS which
> # are inhibited by allarch
> DEPENDS = "gettext-native"
>
> +S = "${WORKDIR}/git"
> +
> inherit allarch autotools
>
> FILES_${PN} += "${datadir}/xml/"
> --
> 2.17.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>
>>>
>>> --
>>> ___
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3] iso-codes: update to 3.79 and fix SRC_URI
Well that's frustrating isn't it. Need a way of teaching devtool
upgrade how to find new tarball URLs from a HTML page maybe?
Ross
On 5 June 2018 at 18:08, Alexander Kanavin wrote:
> This was discussed in private. The maintainer uploaded tarballs have a
> random hash in the URI, which will break 'devtool upgrade' and make
> manual updates inconvenient. And autogenerated tarballs are likely to
> suffer from same issue as githb ones.
>
> Alex
>
> 2018-06-05 20:04 GMT+03:00 Oleksandr Kravchuk
> :
>> Ross -
>>
>> We've discussed this. Check out discussion of v2 of the patch, please.
>>
>>
>>
>> On 05/06/18 19:00, Burton, Ross wrote:
>>>
>>> No need to change to git, salsa has a tarball at
>>> https://salsa.debian.org/iso-codes-team/iso-codes/tags.
>>>
>>> Ross
>>>
>>> On 5 June 2018 at 17:06, Oleksandr Kravchuk
>>> wrote:
Updated package to version 3.79.
The original FTP server, alioth.debian.org has been permanently taken
down by the Debian Project and replaced with salsa.debian.org.
Source: https://wiki.debian.org/Alioth
Also added HOMEPAGE, and BUGTRACKER.
Signed-off-by: Oleksandr Kravchuk
---
.../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb} | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb =>
iso-codes_3.79.bb} (56%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
similarity index 56%
rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
index bd613ac573..72cb542f18 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
@@ -1,15 +1,19 @@
SUMMARY = "ISO language, territory, currency, script codes and their
translations"
+HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
+BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
+
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM =
"file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI =
"https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
-SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
-SRC_URI[sha256sum] =
"21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
+SRC_URI =
"git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
+SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
DEPENDS = "gettext-native"
+S = "${WORKDIR}/git"
+
inherit allarch autotools
FILES_${PN} += "${datadir}/xml/"
--
2.17.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3] iso-codes: update to 3.79 and fix SRC_URI
This was discussed in private. The maintainer uploaded tarballs have a
random hash in the URI, which will break 'devtool upgrade' and make
manual updates inconvenient. And autogenerated tarballs are likely to
suffer from same issue as githb ones.
Alex
2018-06-05 20:04 GMT+03:00 Oleksandr Kravchuk
:
> Ross -
>
> We've discussed this. Check out discussion of v2 of the patch, please.
>
>
>
> On 05/06/18 19:00, Burton, Ross wrote:
>>
>> No need to change to git, salsa has a tarball at
>> https://salsa.debian.org/iso-codes-team/iso-codes/tags.
>>
>> Ross
>>
>> On 5 June 2018 at 17:06, Oleksandr Kravchuk
>> wrote:
>>>
>>> Updated package to version 3.79.
>>>
>>> The original FTP server, alioth.debian.org has been permanently taken
>>> down by the Debian Project and replaced with salsa.debian.org.
>>>
>>> Source: https://wiki.debian.org/Alioth
>>>
>>> Also added HOMEPAGE, and BUGTRACKER.
>>>
>>> Signed-off-by: Oleksandr Kravchuk
>>> ---
>>> .../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb} | 10 +++---
>>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>> rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb =>
>>> iso-codes_3.79.bb} (56%)
>>>
>>> diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
>>> b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
>>> similarity index 56%
>>> rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
>>> rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
>>> index bd613ac573..72cb542f18 100644
>>> --- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
>>> +++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
>>> @@ -1,15 +1,19 @@
>>> SUMMARY = "ISO language, territory, currency, script codes and their
>>> translations"
>>> +HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
>>> +BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
>>> +
>>> LICENSE = "LGPLv2.1"
>>> LIC_FILES_CHKSUM =
>>> "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
>>>
>>> -SRC_URI =
>>> "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
>>> -SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
>>> -SRC_URI[sha256sum] =
>>> "21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
>>> +SRC_URI =
>>> "git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
>>> +SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
>>>
>>> # inherit gettext cannot be used, because it adds gettext-native to
>>> BASEDEPENDS which
>>> # are inhibited by allarch
>>> DEPENDS = "gettext-native"
>>>
>>> +S = "${WORKDIR}/git"
>>> +
>>> inherit allarch autotools
>>>
>>> FILES_${PN} += "${datadir}/xml/"
>>> --
>>> 2.17.0
>>>
>>> --
>>> ___
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] bc:1.06 -> 1.07.1
On 5 June 2018 at 09:10, Hong Liu wrote:
> +PR = "r3"
As this was an upgrade you can remove PR.
> +SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
Whilst you're here, ${BP} is BPN-PV so this can be
${GNU_MIRROR}/${BPN}/${BP}.tar.gz
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3] iso-codes: update to 3.79 and fix SRC_URI
Ross -
We've discussed this. Check out discussion of v2 of the patch, please.
On 05/06/18 19:00, Burton, Ross wrote:
No need to change to git, salsa has a tarball at
https://salsa.debian.org/iso-codes-team/iso-codes/tags.
Ross
On 5 June 2018 at 17:06, Oleksandr Kravchuk
wrote:
Updated package to version 3.79.
The original FTP server, alioth.debian.org has been permanently taken
down by the Debian Project and replaced with salsa.debian.org.
Source: https://wiki.debian.org/Alioth
Also added HOMEPAGE, and BUGTRACKER.
Signed-off-by: Oleksandr Kravchuk
---
.../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb} | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb =>
iso-codes_3.79.bb} (56%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
similarity index 56%
rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
index bd613ac573..72cb542f18 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
@@ -1,15 +1,19 @@
SUMMARY = "ISO language, territory, currency, script codes and their
translations"
+HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
+BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
+
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI =
"https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
-SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
-SRC_URI[sha256sum] =
"21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
+SRC_URI =
"git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
+SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
DEPENDS = "gettext-native"
+S = "${WORKDIR}/git"
+
inherit allarch autotools
FILES_${PN} += "${datadir}/xml/"
--
2.17.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3] iso-codes: update to 3.79 and fix SRC_URI
No need to change to git, salsa has a tarball at
https://salsa.debian.org/iso-codes-team/iso-codes/tags.
Ross
On 5 June 2018 at 17:06, Oleksandr Kravchuk
wrote:
> Updated package to version 3.79.
>
> The original FTP server, alioth.debian.org has been permanently taken
> down by the Debian Project and replaced with salsa.debian.org.
>
> Source: https://wiki.debian.org/Alioth
>
> Also added HOMEPAGE, and BUGTRACKER.
>
> Signed-off-by: Oleksandr Kravchuk
> ---
> .../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb} | 10 +++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
> rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb =>
> iso-codes_3.79.bb} (56%)
>
> diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
> b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
> similarity index 56%
> rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
> rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
> index bd613ac573..72cb542f18 100644
> --- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
> +++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
> @@ -1,15 +1,19 @@
> SUMMARY = "ISO language, territory, currency, script codes and their
> translations"
> +HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
> +BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
> +
> LICENSE = "LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
>
> -SRC_URI =
> "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
> -SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
> -SRC_URI[sha256sum] =
> "21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
> +SRC_URI =
> "git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
> +SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
>
> # inherit gettext cannot be used, because it adds gettext-native to
> BASEDEPENDS which
> # are inhibited by allarch
> DEPENDS = "gettext-native"
>
> +S = "${WORKDIR}/git"
> +
> inherit allarch autotools
>
> FILES_${PN} += "${datadir}/xml/"
> --
> 2.17.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
On 06/05/2018 05:04 AM, Peter Kjellerstedt wrote:
-Original Message-
From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
Sent: den 5 juni 2018 12:37
To: Peter Kjellerstedt ; Martin Kelly
; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
On Tue, 2018-06-05 at 10:09 +, Peter Kjellerstedt wrote:
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
Of
Martin Kelly
Sent: den 5 juni 2018 01:06
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
Two functions is uses a mix of spaces and tabs. The rest of the
file
uses tabs, so switch to tabs uniformly.
Signed-off-by: Martin Kelly
---
meta/classes/toolchain-scripts.bbclass | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 71da5e5409..a72436167c 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -122,7 +122,7 @@ toolchain_create_post_relocate_script() {
rm -f $script
touch $script
-cat >> $script <> $script <
This part should be indented using tabs as well.
@@ -166,13 +166,13 @@ toolchain_create_sdk_siteconfig () {
toolchain_create_sdk_siteconfig[vardepsexclude] =
"TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
python __anonymous () {
-import oe.classextend
-deps = ""
-for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or
"").split():
-deps += " %s:do_populate_sysroot" % dep
-for variant in (d.getVar('MULTILIB_VARIANTS') or
"").split():
-clsextend = oe.classextend.ClassExtender(variant, d)
-newdep = clsextend.extend_name(dep)
-deps += " %s:do_populate_sysroot" % newdep
-d.appendVarFlag('do_configure', 'depends', deps)
+ import oe.classextend
+ deps = ""
+ for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or
"").split():
+ deps += " %s:do_populate_sysroot" % dep
+ for variant in (d.getVar('MULTILIB_VARIANTS') or
"").split():
+ clsextend =
oe.classextend.ClassExtender(variant, d)
+ newdep = clsextend.extend_name(dep)
+ deps += " %s:do_populate_sysroot" %
newdep
+ d.appendVarFlag('do_configure', 'depends', deps)
This is Python code. I believe the OE-Core standard is for Python
code
to be indented using four spaces (whereas shell code should be
indented
using tabs).
I noticed this last bit and simply dropped that patch hunk.
Cheers,
Richard
You might want to update the commit message then as well, as it refers
to the two functions that are modified, which is no longer the case.
//Peter
Thanks all; good point about Python and the commit message. I thought
about using the one-line || version, but like Richard, I find the
explicit if statement more readable, and more consistent with what the
rest of the function does.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: Update 18.0.2 -> 18.1.1
This includes all bugfixes of 18.0.x series and major new
features. For list of changes check:
https://www.mesa3d.org/relnotes/18.1.0.html
https://www.mesa3d.org/relnotes/18.1.1.html
Signed-off-by: Otavio Salvador
---
...am-explictly-add-lib-expat-to-intel-.patch | 18
...0001-Use-wayland-scanner-in-the-path.patch | 34 ---
...0002-Simplify-wayland-scanner-lookup.patch | 38 +
...winsys-svga-drm-Include-sys-types.h.patch} | 12 +++---
...-gloat.patch => 0004-hardware-gloat.patch} | 15 +++
...-version-when-using-LLVM-Git-releas.patch} | 13 +++---
...Use-Python-3-to-execute-the-scripts.patch} | 12 +++---
.../mesa/files/disable-asm-on-non-gcc.patch | 29 -
.../mesa/files/vulkan-mkdir.patch | 41 ---
.../{mesa-gl_18.0.2.bb => mesa-gl_18.1.1.bb} | 0
.../mesa/{mesa_18.0.2.bb => mesa_18.1.1.bb} | 18
11 files changed, 84 insertions(+), 146 deletions(-)
delete mode 100644
meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
create mode 100644
meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch
rename
meta/recipes-graphics/mesa/files/{0001-winsys-svga-drm-Include-sys-types.h.patch
=> 0003-winsys-svga-drm-Include-sys-types.h.patch} (80%)
rename meta/recipes-graphics/mesa/files/{0002-hardware-gloat.patch =>
0004-hardware-gloat.patch} (80%)
rename meta/recipes-graphics/mesa/files/{llvm-config-version.patch =>
0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch} (77%)
rename
meta/recipes-graphics/mesa/files/{Use-Python-3-to-execute-the-scripts.patch =>
0006-Use-Python-3-to-execute-the-scripts.patch} (76%)
delete mode 100644
meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch
delete mode 100644 meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
rename meta/recipes-graphics/mesa/{mesa-gl_18.0.2.bb => mesa-gl_18.1.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_18.0.2.bb => mesa_18.1.1.bb} (54%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
index f908d46550..c4157483d9 100644
---
a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
+++
b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
@@ -1,8 +1,9 @@
-From 342311dbb190735b7b32ab20f81c1d8dbcfe717a Mon Sep 17 00:00:00 2001
+From 327c3dcbfa005f5d1b2fcda07ca1198d65bd23c5 Mon Sep 17 00:00:00 2001
From: Hongxu Jia
Date: Wed, 11 Oct 2017 15:40:42 +0800
-Subject: [PATCH] Makefile.vulkan.am: explictly add lib expat to intel
+Subject: [PATCH 1/6] Makefile.vulkan.am: explictly add lib expat to intel
libvulkan's lib depends
+Organization: O.S. Systems Software LTDA.
While built with "-fvisibility=default"
...
@@ -28,11 +29,11 @@ Signed-off-by: Hongxu Jia
src/intel/Makefile.vulkan.am | 1 +
1 file changed, 1 insertion(+)
-Index: mesa-17.3.6/src/intel/Makefile.vulkan.am
-===
mesa-17.3.6.orig/src/intel/Makefile.vulkan.am
-+++ mesa-17.3.6/src/intel/Makefile.vulkan.am
-@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \
+diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
+index 4125cb205a..356c4f8452 100644
+--- a/src/intel/Makefile.vulkan.am
b/src/intel/Makefile.vulkan.am
+@@ -161,6 +161,7 @@ VULKAN_LIB_DEPS = \
$(LIBDRM_LIBS) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS) \
@@ -40,3 +41,6 @@ Index: mesa-17.3.6/src/intel/Makefile.vulkan.am
-lm
if HAVE_PLATFORM_ANDROID
+--
+2.17.1
+
diff --git
a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
deleted file mode 100644
index 2444b2846b..00
---
a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen
-Date: Tue, 15 Nov 2016 15:20:49 +0200
-Subject: [PATCH] Simplify wayland-scanner lookup
-
-Don't use pkg-config to lookup the path of a binary that's in the path.
-
-Alternatively we'd have to prefix the path returned by pkg-config with
-PKG_CONFIG_SYSROOT_DIR.
-
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen
- configure.ac | 7 +--
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-Index: mesa-17.3.6/configure.ac
-===
mesa-17.3.6.orig/configure.ac
-+++ mesa-17.3.6/configure.ac
-@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then
- with_platforms=$with_egl_platforms
- fi
-
--PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
--WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner
[OE-core] [meta-oe][PATCH v3] iso-codes: update to 3.79 and fix SRC_URI
Updated package to version 3.79.
The original FTP server, alioth.debian.org has been permanently taken
down by the Debian Project and replaced with salsa.debian.org.
Source: https://wiki.debian.org/Alioth
Also added HOMEPAGE, and BUGTRACKER.
Signed-off-by: Oleksandr Kravchuk
---
.../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb} | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb}
(56%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
similarity index 56%
rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
index bd613ac573..72cb542f18 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
@@ -1,15 +1,19 @@
SUMMARY = "ISO language, territory, currency, script codes and their
translations"
+HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
+BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
+
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI =
"https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
-SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
-SRC_URI[sha256sum] =
"21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
+SRC_URI =
"git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
+SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
DEPENDS = "gettext-native"
+S = "${WORKDIR}/git"
+
inherit allarch autotools
FILES_${PN} += "${datadir}/xml/"
--
2.17.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v2] iso-codes: update to 3.79 and fix SRC_URI
2018-06-05 18:48 GMT+03:00 Oleksandr Kravchuk : > +UPSTREAM_CHECK_URI = "https://salsa.debian.org/iso-codes-team/iso-codes/tags; This is needed only when taking source from tarballs, and the contents of the tarball-containing directory cannot be listed due to web server configuration (but the tarballs are referred to from some other webpage). The upstream version checker downloads the webpage, and goes over html links in it to determine which of those links point to the tarball, and of those, which is the latest tarball. When taking the source from git, the upstream checker lists git tags directly from the repo clone, sorts them and picks the latest. You can also fine-tune how the latest version is matched against the tarball filenames through UPSTREAM_CHECK_REGEX, or against git tags through UPSTREAM_CHECK_GITTAGREGEX but it's not needed here. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH v2] iso-codes: update to 3.79 and fix SRC_URI
Updated package to version 3.79.
The original FTP server, alioth.debian.org has been permanently taken
down by the Debian Project and replaced with salsa.debian.org.
Source: https://wiki.debian.org/Alioth
Also added UPSTREAM_CHECK_URI, HOMEPAGE, and BUGTRACKER.
Signed-off-by: Oleksandr Kravchuk
---
.../{iso-codes_3.77.bb => iso-codes_3.79.bb} | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb}
(50%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
similarity index 50%
rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
index bd613ac573..3fadd459c8 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
@@ -1,15 +1,21 @@
SUMMARY = "ISO language, territory, currency, script codes and their
translations"
+HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes;
+BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues;
+
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI =
"https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
-SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
-SRC_URI[sha256sum] =
"21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
+SRC_URI =
"git://g...@salsa.debian.org/iso-codes-team/iso-codes.git;protocol=git"
+SRCREV = "c1d5dd96b33cb815ebc21d2708bc045b1545249d"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
DEPENDS = "gettext-native"
+UPSTREAM_CHECK_URI = "https://salsa.debian.org/iso-codes-team/iso-codes/tags;
+
+S = "${WORKDIR}/git"
+
inherit allarch autotools
FILES_${PN} += "${datadir}/xml/"
--
2.17.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] strongswan: package up sbin debug files
On Tue, Jun 05, 2018 at 10:39:36AM -0400, Chris Patterson wrote:
> (after looking at it again, I realize I misfired on the prefix tag and
> maintainer CC - will resend)
Actually, wrong list -
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> On Tue, Jun 5, 2018 at 10:35 AM, Chris Patterson wrote:
> > ping :)
> >
> > On Fri, May 11, 2018 at 2:38 PM, Chris Patterson wrote:
> >> From: Chris Patterson
> >>
> >> Signed-off-by: Chris Patterson
> >> ---
> >> meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git
> >> a/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> >> b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> >> index f2fe1f1..5cae6ac 100644
> >> --- a/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> >> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> >> @@ -46,7 +46,7 @@ inherit autotools systemd pkgconfig
> >> RRECOMMENDS_${PN} = "kernel-module-ipsec"
> >>
> >> FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}"
> >> -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/ipsec/.debug
> >> ${libexecdir}/ipsec/.debug"
> >> +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug
> >> ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
> >> FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la"
> >> FILES_${PN}-staticdev += "${libdir}/ipsec/*.a"
> >>
> >> --
> >> 2.1.4
> >>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] iso-codes: update to 3.79 and fix SRC_URI
2018-06-05 18:22 GMT+03:00 Oleksandr Kravchuk
:
> -SRC_URI =
> "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
> -SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
> -SRC_URI[sha256sum] =
> "21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
> +SRC_URI = "${DEBIAN_MIRROR}/main/i/iso-codes/iso-codes_${PV}.orig.tar.xz"
> +SRC_URI[md5sum] = "5875d7aa41b1acd7b218631ff7b85464"
> +SRC_URI[sha256sum] =
> "cbafd36cd4c588a254c0a5c42e682190c3784ceaf2a098da4c9c4a0cbc842822"
Please use the original upstream git repo. We take sources from
DEBIAN_MIRROR if the primary upstream source is absent or
inaccessible, but this is not the case here:
https://salsa.debian.org/iso-codes-team/iso-codes
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] iso-codes: update to 3.79 and fix SRC_URI
Updated package to version 3.79.
The original FTP server, alioth.debian.org has been permanently taken
down by the Debian Project and replaced with salsa.debian.org.
Source: https://wiki.debian.org/Alioth
Signed-off-by: Oleksandr Kravchuk
---
.../iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb}| 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.77.bb => iso-codes_3.79.bb}
(58%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
similarity index 58%
rename from meta/recipes-support/iso-codes/iso-codes_3.77.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.79.bb
index bd613ac573..9f982a2668 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.77.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.79.bb
@@ -2,14 +2,16 @@ SUMMARY = "ISO language, territory, currency, script codes
and their translation
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI =
"https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz;
-SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
-SRC_URI[sha256sum] =
"21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
+SRC_URI = "${DEBIAN_MIRROR}/main/i/iso-codes/iso-codes_${PV}.orig.tar.xz"
+SRC_URI[md5sum] = "5875d7aa41b1acd7b218631ff7b85464"
+SRC_URI[sha256sum] =
"cbafd36cd4c588a254c0a5c42e682190c3784ceaf2a098da4c9c4a0cbc842822"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
DEPENDS = "gettext-native"
+UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/i/iso-codes/"
+
inherit allarch autotools
FILES_${PN} += "${datadir}/xml/"
--
2.17.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] strongswan: package up sbin debug files
(after looking at it again, I realize I misfired on the prefix tag and
maintainer CC - will resend)
On Tue, Jun 5, 2018 at 10:35 AM, Chris Patterson wrote:
> ping :)
>
> On Fri, May 11, 2018 at 2:38 PM, Chris Patterson wrote:
>> From: Chris Patterson
>>
>> Signed-off-by: Chris Patterson
>> ---
>> meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
>> b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
>> index f2fe1f1..5cae6ac 100644
>> --- a/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
>> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
>> @@ -46,7 +46,7 @@ inherit autotools systemd pkgconfig
>> RRECOMMENDS_${PN} = "kernel-module-ipsec"
>>
>> FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}"
>> -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/ipsec/.debug
>> ${libexecdir}/ipsec/.debug"
>> +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug
>> ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
>> FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la"
>> FILES_${PN}-staticdev += "${libdir}/ipsec/*.a"
>>
>> --
>> 2.1.4
>>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] strongswan: package up sbin debug files
ping :)
On Fri, May 11, 2018 at 2:38 PM, Chris Patterson wrote:
> From: Chris Patterson
>
> Signed-off-by: Chris Patterson
> ---
> meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> index f2fe1f1..5cae6ac 100644
> --- a/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
> @@ -46,7 +46,7 @@ inherit autotools systemd pkgconfig
> RRECOMMENDS_${PN} = "kernel-module-ipsec"
>
> FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}"
> -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/ipsec/.debug
> ${libexecdir}/ipsec/.debug"
> +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug
> ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
> FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la"
> FILES_${PN}-staticdev += "${libdir}/ipsec/*.a"
>
> --
> 2.1.4
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] packagegroup-self-hosted: remove libsdl
By default we now build our own libSDL, so don't ship libsdl in the self-hosted group. Signed-off-by: Ross Burton --- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index f1273e8a171..28f06d9c5aa 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -188,8 +188,6 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\ libgl-dev \ libglu \ libglu-dev \ -libsdl \ -libsdl-dev \ libx11-dev \ adwaita-icon-theme \ xdg-utils \ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] qemu: only build SDL UI if X11 is enabled
The SDL UI now assumes that it is using X11 because it includes X headers, so
only enable it if X11 is enabled.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/qemu/qemu.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index faaea781cd7..2f73b21c30e 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -74,11 +74,12 @@ do_install_append() {
# END of qemu-mips workaround
PACKAGECONFIG ??= " \
-fdt sdl kvm \
+fdt kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sdl', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
"
PACKAGECONFIG_class-native ??= "fdt alsa kvm"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
+PACKAGECONFIG_class-nativesdk ??= "fdt kvm
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sdl', '', d)}"
# Handle distros such as CentOS 5 32-bit that do not have kvm support
PACKAGECONFIG_class-native_remove = "${@'kvm' if not
os.path.exists('/usr/include/linux/kvm.h') else ''}"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] local.conf.sample: update libsdl mentions to libsdl2
Qemu now builds with libsdl2, so update the local.conf.sample to reflect this. Signed-off-by: Ross Burton --- meta-poky/conf/local.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample index aa8df40b87e..d28bf58a1e7 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/local.conf.sample @@ -234,12 +234,12 @@ BB_DISKMON_DIRS ??= "\ # Qemu configuration # # By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl-native will +# seen. The two lines below enable the SDL backend too. By default libsdl2-native will # be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl-native then uncomment the ASSUME_PROVIDED line below. +# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. PACKAGECONFIG_append_pn-qemu-native = " sdl" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +#ASSUME_PROVIDED += "libsdl2-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] shared-mime-info: fix license statement
The freedesktop.org.xml data and the update-mime-database tool are both GPLv2 as per COPYING, so change LICENSE to GPLv2. test-mime-magic.c is LGPLv2+ but we don't install that so isn't relevant. Signed-off-by: Ross Burton --- meta/recipes-support/shared-mime-info/shared-mime-info.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc index 1f51225b0ee..344da7ea77c 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc +++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc @@ -2,7 +2,7 @@ SUMMARY = "Shared MIME type database and specification" HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info; SECTION = "base" -LICENSE = "LGPLv2+" +LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cpan_build.bbclass: adopt to recent EU::MM
> Am 05.06.2018 um 10:43 schrieb Richard Purdie
> :
>
> On Mon, 2018-05-28 at 20:55 +0200, Jens Rehsack wrote:
>> The modern the time, the improvements in ExtUtils::MakeMaker.
>>
>> Nowadays, .packlist and perllocal.pod aren't touched anymore when appropriate
>> flags set during configure stage. Controlling the flags globally avoids
>> dual-life recipes need share patching.
>>
>> Further: remove prepending ${PERL_ARCHLIB} in PERL5LIB - it's wrong (search
>> order is site_lib, vendor_lib, core) - and ${PERL_ARCHLIB} contains core
>> libpath only ...
>>
>> Signed-off-by: Jens Rehsack
>> ---
>> meta/classes/cpan.bbclass | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
> I put this in for testing but I see:
>
> $ SDKMACHINE="i686" bitbake nativesdk-libxml-parser-perl
> [...]
> ERROR: nativesdk-libxml-parser-perl-2.44-r0 do_package:
> nativesdk-libxml-parser-perl: chrpath command failed with exit code 7:
> b'/media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/package/opt/poky/2.5+snapshot/sysroots/i686-pokysdk-linux/usr/lib/perl/vendor_perl/5.24.1/auto/XML/Parser/Expat/Expat.so:
>
> RPATH=/media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/recipe-sysroot/opt/poky/2.5+snapshot/sysroots/i686-pokysdk-linux/usr/lib\n'b"new
> rpath
> '$ORIGIN/../../../../../../../../../../../../../../media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/recipe-sysroot/opt/poky/2.5+snapshot/sysroots/i686-pokysdk-linux/usr/lib'
> too large; maximum length 176\n"
> ERROR: nativesdk-libxml-parser-perl-2.44-r0 do_package: Function failed:
> perform_packagecopy
> ERROR: Logfile of failure stored in:
> /media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/temp/log.do_package.23783
> ERROR: Task
> (virtual:nativesdk:/media/build1/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb:do_package)
> failed with exit code '1'
>
> which seems to reproduce fairly readily both locally and on the
> autobuilders. Reverting this patch resolves it.
Without having tested that - this seems to come from
- export PERL5LIB="${PERL_ARCHLIB}"
which is, when do not causing above build failure, kind-of bug-using :)
Always prepending ${PERL_ARCHLIB} causes for cross-building the attempt
of loading sdk-modules, which is evil.
I'll try to have a detailed look later today or tomorrow.
Cheers
--
Jens Rehsack - rehs...@gmail.com
signature.asc
Description: Message signed with OpenPGP
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
> -Original Message-
> From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> Sent: den 5 juni 2018 12:37
> To: Peter Kjellerstedt ; Martin Kelly
> ; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
>
> On Tue, 2018-06-05 at 10:09 +, Peter Kjellerstedt wrote:
> > > -Original Message-
> > > From: openembedded-core-boun...@lists.openembedded.org
> > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
> > > Of
> > > Martin Kelly
> > > Sent: den 5 juni 2018 01:06
> > > To: openembedded-core@lists.openembedded.org
> > > Subject: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
> > >
> > > Two functions is uses a mix of spaces and tabs. The rest of the
> > > file
> > > uses tabs, so switch to tabs uniformly.
> > >
> > > Signed-off-by: Martin Kelly
> > > ---
> > > meta/classes/toolchain-scripts.bbclass | 20 ++--
> > > 1 file changed, 10 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/meta/classes/toolchain-scripts.bbclass
> > > b/meta/classes/toolchain-scripts.bbclass
> > > index 71da5e5409..a72436167c 100644
> > > --- a/meta/classes/toolchain-scripts.bbclass
> > > +++ b/meta/classes/toolchain-scripts.bbclass
> > > @@ -122,7 +122,7 @@ toolchain_create_post_relocate_script() {
> > > rm -f $script
> > > touch $script
> > >
> > > -cat >> $script < > > + cat >> $script < > > if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then
> > > for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*.sh; do
> > > \$s "\$1"
> >
> > This part should be indented using tabs as well.
> >
> > > @@ -166,13 +166,13 @@ toolchain_create_sdk_siteconfig () {
> > > toolchain_create_sdk_siteconfig[vardepsexclude] =
> > > "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
> > >
> > > python __anonymous () {
> > > -import oe.classextend
> > > -deps = ""
> > > -for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or
> > > "").split():
> > > -deps += " %s:do_populate_sysroot" % dep
> > > -for variant in (d.getVar('MULTILIB_VARIANTS') or
> > > "").split():
> > > -clsextend = oe.classextend.ClassExtender(variant, d)
> > > -newdep = clsextend.extend_name(dep)
> > > -deps += " %s:do_populate_sysroot" % newdep
> > > -d.appendVarFlag('do_configure', 'depends', deps)
> > > + import oe.classextend
> > > + deps = ""
> > > + for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or
> > > "").split():
> > > + deps += " %s:do_populate_sysroot" % dep
> > > + for variant in (d.getVar('MULTILIB_VARIANTS') or
> > > "").split():
> > > + clsextend =
> > > oe.classextend.ClassExtender(variant, d)
> > > + newdep = clsextend.extend_name(dep)
> > > + deps += " %s:do_populate_sysroot" %
> newdep
> > > + d.appendVarFlag('do_configure', 'depends', deps)
> >
> > This is Python code. I believe the OE-Core standard is for Python
> > code
> > to be indented using four spaces (whereas shell code should be
> > indented
> > using tabs).
>
> I noticed this last bit and simply dropped that patch hunk.
>
> Cheers,
>
> Richard
You might want to update the commit message then as well, as it refers
to the two functions that are modified, which is no longer the case.
//Peter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for PATCHTOOL = "patch"
> -Original Message- > From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] > Sent: den 5 juni 2018 12:50 > To: Peter Kjellerstedt ; Hong Liu > ; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for > PATCHTOOL = "patch" > > On Tue, 2018-06-05 at 10:43 +, Peter Kjellerstedt wrote: > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf > > > Of > > > Hong Liu > > > Sent: den 5 juni 2018 10:11 > > > To: openembedded-core@lists.openembedded.org > > > Subject: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for > > > PATCHTOOL = "patch" > > > > > > When switch PATCHTOOL to patch, applying 'key-replay-cve- > > > multiple.patch' failed: > > > > > > checking file src/ap/ieee802_11.c > > > checking file src/ap/wpa_auth.c > > > checking file src/ap/wpa_auth.h > > > checking file src/ap/wpa_auth_ft.c > > > checking file src/ap/wpa_auth_i.h > > > checking file src/common/wpa_common.h > > > checking file src/rsn_supp/wpa.c > > > checking file src/rsn_supp/wpa_i.h > > > checking file src/rsn_supp/wpa.c > > > Hunk #1 FAILED at 709. > > > Hunk #2 FAILED at 757. > > > Hunk #3 succeeded at 840 (offset -12 lines). > > > Hunk #4 FAILED at 868. > > > Hunk #5 FAILED at 900. > > > Hunk #6 FAILED at 924. > > > Hunk #7 succeeded at 1536 (offset -38 lines). > > > Hunk #8 FAILED at 2386. > > > Hunk #9 FAILED at 2920. > > > Hunk #10 succeeded at 2940 (offset -46 lines). > > > Hunk #11 FAILED at 2998. > > > 8 out of 11 hunks FAILED > > > checking file src/rsn_supp/wpa_i.h > > > Hunk #1 FAILED at 32. > > > 1 out of 1 hunk FAILED > > > checking file src/common/wpa_common.h > > > Hunk #1 succeeded at 215 with fuzz 1. > > > checking file src/rsn_supp/wpa.c > > > checking file src/rsn_supp/wpa_i.h > > > checking file src/ap/wpa_auth.c > > > Hunk #1 succeeded at 1898 (offset -3 lines). > > > Hunk #2 succeeded at 2470 (offset -3 lines). > > > checking file src/rsn_supp/tdls.c > > > checking file wpa_supplicant/wnm_sta.c > > > checking file src/rsn_supp/wpa.c > > > Hunk #1 succeeded at 2378 (offset -62 lines). > > > checking file src/rsn_supp/wpa_ft.c > > > checking file src/rsn_supp/wpa_i.h > > > Hunk #1 succeeded at 123 (offset -5 lines). > > > > > > So split the wpa-supplicant/key-replay-cve-multiple to 8 patches. > > > > Why does it need to be split into eight separate patches? Isn't it > > just a case of having to regenerate the patch so that the hunk > > contexts match the current code? > > You're technically right but I think separate patches may be a lot > clearer... > > Cheers, > > Richard I should probably have looked at the patches and not just the new file names. I just assumed the original patch was split along the file borders, but I now see that it was actually split according to functionality. However, it might be an idea to let git format-patch regenerate the file names to better indicate their contents. //Peter -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for PATCHTOOL = "patch"
On Tue, 2018-06-05 at 10:43 +, Peter Kjellerstedt wrote: > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf > > Of > > Hong Liu > > Sent: den 5 juni 2018 10:11 > > To: openembedded-core@lists.openembedded.org > > Subject: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for > > PATCHTOOL = "patch" > > > > When switch PATCHTOOL to patch, applying 'key-replay-cve- > > multiple.patch' failed: > > > > checking file src/ap/ieee802_11.c > > checking file src/ap/wpa_auth.c > > checking file src/ap/wpa_auth.h > > checking file src/ap/wpa_auth_ft.c > > checking file src/ap/wpa_auth_i.h > > checking file src/common/wpa_common.h > > checking file src/rsn_supp/wpa.c > > checking file src/rsn_supp/wpa_i.h > > checking file src/rsn_supp/wpa.c > > Hunk #1 FAILED at 709. > > Hunk #2 FAILED at 757. > > Hunk #3 succeeded at 840 (offset -12 lines). > > Hunk #4 FAILED at 868. > > Hunk #5 FAILED at 900. > > Hunk #6 FAILED at 924. > > Hunk #7 succeeded at 1536 (offset -38 lines). > > Hunk #8 FAILED at 2386. > > Hunk #9 FAILED at 2920. > > Hunk #10 succeeded at 2940 (offset -46 lines). > > Hunk #11 FAILED at 2998. > > 8 out of 11 hunks FAILED > > checking file src/rsn_supp/wpa_i.h > > Hunk #1 FAILED at 32. > > 1 out of 1 hunk FAILED > > checking file src/common/wpa_common.h > > Hunk #1 succeeded at 215 with fuzz 1. > > checking file src/rsn_supp/wpa.c > > checking file src/rsn_supp/wpa_i.h > > checking file src/ap/wpa_auth.c > > Hunk #1 succeeded at 1898 (offset -3 lines). > > Hunk #2 succeeded at 2470 (offset -3 lines). > > checking file src/rsn_supp/tdls.c > > checking file wpa_supplicant/wnm_sta.c > > checking file src/rsn_supp/wpa.c > > Hunk #1 succeeded at 2378 (offset -62 lines). > > checking file src/rsn_supp/wpa_ft.c > > checking file src/rsn_supp/wpa_i.h > > Hunk #1 succeeded at 123 (offset -5 lines). > > > > So split the wpa-supplicant/key-replay-cve-multiple to 8 patches. > > Why does it need to be split into eight separate patches? Isn't it > just a case of having to regenerate the patch so that the hunk > contexts match the current code? You're technically right but I think separate patches may be a lot clearer... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for PATCHTOOL = "patch"
> -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Hong Liu > Sent: den 5 juni 2018 10:11 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for > PATCHTOOL = "patch" > > When switch PATCHTOOL to patch, applying 'key-replay-cve- > multiple.patch' failed: > > checking file src/ap/ieee802_11.c > checking file src/ap/wpa_auth.c > checking file src/ap/wpa_auth.h > checking file src/ap/wpa_auth_ft.c > checking file src/ap/wpa_auth_i.h > checking file src/common/wpa_common.h > checking file src/rsn_supp/wpa.c > checking file src/rsn_supp/wpa_i.h > checking file src/rsn_supp/wpa.c > Hunk #1 FAILED at 709. > Hunk #2 FAILED at 757. > Hunk #3 succeeded at 840 (offset -12 lines). > Hunk #4 FAILED at 868. > Hunk #5 FAILED at 900. > Hunk #6 FAILED at 924. > Hunk #7 succeeded at 1536 (offset -38 lines). > Hunk #8 FAILED at 2386. > Hunk #9 FAILED at 2920. > Hunk #10 succeeded at 2940 (offset -46 lines). > Hunk #11 FAILED at 2998. > 8 out of 11 hunks FAILED > checking file src/rsn_supp/wpa_i.h > Hunk #1 FAILED at 32. > 1 out of 1 hunk FAILED > checking file src/common/wpa_common.h > Hunk #1 succeeded at 215 with fuzz 1. > checking file src/rsn_supp/wpa.c > checking file src/rsn_supp/wpa_i.h > checking file src/ap/wpa_auth.c > Hunk #1 succeeded at 1898 (offset -3 lines). > Hunk #2 succeeded at 2470 (offset -3 lines). > checking file src/rsn_supp/tdls.c > checking file wpa_supplicant/wnm_sta.c > checking file src/rsn_supp/wpa.c > Hunk #1 succeeded at 2378 (offset -62 lines). > checking file src/rsn_supp/wpa_ft.c > checking file src/rsn_supp/wpa_i.h > Hunk #1 succeeded at 123 (offset -5 lines). > > So split the wpa-supplicant/key-replay-cve-multiple to 8 patches. Why does it need to be split into eight separate patches? Isn't it just a case of having to regenerate the patch so that the hunk contexts match the current code? > Signed-off-by: Hong Liu > --- > .../wpa-supplicant/key-replay-cve-multiple.patch | 1025 > > .../wpa-supplicant/key-replay-cve-multiple1.patch | 191 > .../wpa-supplicant/key-replay-cve-multiple2.patch | 249 + > .../wpa-supplicant/key-replay-cve-multiple3.patch | 183 > .../wpa-supplicant/key-replay-cve-multiple4.patch | 78 ++ > .../wpa-supplicant/key-replay-cve-multiple5.patch | 63 ++ > .../wpa-supplicant/key-replay-cve-multiple6.patch | 131 +++ > .../wpa-supplicant/key-replay-cve-multiple7.patch | 42 + > .../wpa-supplicant/key-replay-cve-multiple8.patch | 81 ++ > .../wpa-supplicant/wpa-supplicant_2.6.bb |9 +- > 10 files changed, 1026 insertions(+), 1026 deletions(-) > delete mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple1.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple2.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple3.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple4.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple5.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple6.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple7.patch > create mode 100644 > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple8.patch //Peter -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] ltp: bump to release 20180515
On Sun, 2018-06-03 at 22:48 -0500, Daniel Díaz wrote: > The following patches have made it to upstream: > * 0001-configure-Fix-default-value-of-without-numa-switch-i.patch > * 0001-configure-add-knob-to-control-numa-support.patch > * 0003-Add-knob-to-control-tirpc-support.patch > * 0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch > * 0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch > > These patches have been refreshed in order to apply cleanly > and without any fuzz: > * 0004-build-Add-option-to-select-libc-implementation.patch > * 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch > * 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch > * 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch > * 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > > Signed-off-by: Daniel Díaz > --- > v2: Actually change SRCREV, refresh/remove patches as needed. > v3: Patch diff with -M. Sadly this fails to build on musl: https://autobuilder.yocto.io/builders/nightly-musl/builds/1073 Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
On Tue, 2018-06-05 at 10:09 +, Peter Kjellerstedt wrote:
> > -Original Message-
> > From: openembedded-core-boun...@lists.openembedded.org
> > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
> > Of
> > Martin Kelly
> > Sent: den 5 juni 2018 01:06
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
> >
> > Two functions is uses a mix of spaces and tabs. The rest of the
> > file
> > uses tabs, so switch to tabs uniformly.
> >
> > Signed-off-by: Martin Kelly
> > ---
> > meta/classes/toolchain-scripts.bbclass | 20 ++--
> > 1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/meta/classes/toolchain-scripts.bbclass
> > b/meta/classes/toolchain-scripts.bbclass
> > index 71da5e5409..a72436167c 100644
> > --- a/meta/classes/toolchain-scripts.bbclass
> > +++ b/meta/classes/toolchain-scripts.bbclass
> > @@ -122,7 +122,7 @@ toolchain_create_post_relocate_script() {
> > rm -f $script
> > touch $script
> >
> > -cat >> $script < > + cat >> $script < > if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then
> > for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*.sh; do
> > \$s "\$1"
>
> This part should be indented using tabs as well.
>
> > @@ -166,13 +166,13 @@ toolchain_create_sdk_siteconfig () {
> > toolchain_create_sdk_siteconfig[vardepsexclude] =
> > "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
> >
> > python __anonymous () {
> > -import oe.classextend
> > -deps = ""
> > -for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or
> > "").split():
> > -deps += " %s:do_populate_sysroot" % dep
> > -for variant in (d.getVar('MULTILIB_VARIANTS') or
> > "").split():
> > -clsextend = oe.classextend.ClassExtender(variant, d)
> > -newdep = clsextend.extend_name(dep)
> > -deps += " %s:do_populate_sysroot" % newdep
> > -d.appendVarFlag('do_configure', 'depends', deps)
> > + import oe.classextend
> > + deps = ""
> > + for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or
> > "").split():
> > + deps += " %s:do_populate_sysroot" % dep
> > + for variant in (d.getVar('MULTILIB_VARIANTS') or
> > "").split():
> > + clsextend =
> > oe.classextend.ClassExtender(variant, d)
> > + newdep = clsextend.extend_name(dep)
> > + deps += " %s:do_populate_sysroot" % newdep
> > + d.appendVarFlag('do_configure', 'depends', deps)
>
> This is Python code. I believe the OE-Core standard is for Python
> code
> to be indented using four spaces (whereas shell code should be
> indented
> using tabs).
I noticed this last bit and simply dropped that patch hunk.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/6] toolchain-scripts: allow non-sh post-relocate
On Tue, 2018-06-05 at 10:27 +, Peter Kjellerstedt wrote:
> > -Original Message-
> > From: openembedded-core-boun...@lists.openembedded.org
> > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
> > Of
> > Martin Kelly
> > Sent: den 5 juni 2018 01:06
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH v3 2/6] toolchain-scripts: allow non-sh
> > post-
> > relocate
> >
> > Currently, we look only for scripts matching *.sh, which means we
> > can't
> > write post-relocate scripts in other languages.
> >
> > Expand this to allow any type of script.
> >
> > Signed-off-by: Martin Kelly
> > ---
> > v3:
> > - Test for executability prior to running each script.
> >
> > meta/classes/toolchain-scripts.bbclass | 5 -
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/toolchain-scripts.bbclass
> > b/meta/classes/toolchain-scripts.bbclass
> > index a72436167c..da8a57f24b 100644
> > --- a/meta/classes/toolchain-scripts.bbclass
> > +++ b/meta/classes/toolchain-scripts.bbclass
> > @@ -124,7 +124,10 @@ toolchain_create_post_relocate_script() {
> >
> > cat >> $script < > if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then
> > -for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*.sh; do
> > +for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*; do
> > +if [ ! -x \$s ]; then
> > +continue
> > +fi
>
> That can be written as:
>
> [ -x \$s ] || continue
>
> > \$s "\$1"
>
> Or you can replace all of it with:
>
> [ ! -x \$s ] || \$s "\$1"
>
> You should not invert the test and replace the || with && though
> (even if it may seem more logical) due to the return status of
> the [ command in case $s is not executable.
FWIW personally I prefer the original patch version as being more
readable...
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/6] toolchain-scripts: allow non-sh post-relocate
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Martin Kelly
> Sent: den 5 juni 2018 01:06
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v3 2/6] toolchain-scripts: allow non-sh post-
> relocate
>
> Currently, we look only for scripts matching *.sh, which means we can't
> write post-relocate scripts in other languages.
>
> Expand this to allow any type of script.
>
> Signed-off-by: Martin Kelly
> ---
> v3:
> - Test for executability prior to running each script.
>
> meta/classes/toolchain-scripts.bbclass | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass
> b/meta/classes/toolchain-scripts.bbclass
> index a72436167c..da8a57f24b 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -124,7 +124,10 @@ toolchain_create_post_relocate_script() {
>
> cat >> $script < if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then
> -for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*.sh; do
> +for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*; do
> +if [ ! -x \$s ]; then
> +continue
> +fi
That can be written as:
[ -x \$s ] || continue
> \$s "\$1"
Or you can replace all of it with:
[ ! -x \$s ] || \$s "\$1"
You should not invert the test and replace the || with && though
(even if it may seem more logical) due to the return status of
the [ command in case $s is not executable.
> done
> rm -rf "${SDKPATHNATIVE}/post-relocate-setup.d"
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Martin Kelly
> Sent: den 5 juni 2018 01:06
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v3 1/6] toolchain-scripts: retab file
>
> Two functions is uses a mix of spaces and tabs. The rest of the file
> uses tabs, so switch to tabs uniformly.
>
> Signed-off-by: Martin Kelly
> ---
> meta/classes/toolchain-scripts.bbclass | 20 ++--
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass
> b/meta/classes/toolchain-scripts.bbclass
> index 71da5e5409..a72436167c 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -122,7 +122,7 @@ toolchain_create_post_relocate_script() {
> rm -f $script
> touch $script
>
> -cat >> $script < + cat >> $script < if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then
> for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*.sh; do
> \$s "\$1"
This part should be indented using tabs as well.
> @@ -166,13 +166,13 @@ toolchain_create_sdk_siteconfig () {
> toolchain_create_sdk_siteconfig[vardepsexclude] =
> "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
>
> python __anonymous () {
> -import oe.classextend
> -deps = ""
> -for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split():
> -deps += " %s:do_populate_sysroot" % dep
> -for variant in (d.getVar('MULTILIB_VARIANTS') or "").split():
> -clsextend = oe.classextend.ClassExtender(variant, d)
> -newdep = clsextend.extend_name(dep)
> -deps += " %s:do_populate_sysroot" % newdep
> -d.appendVarFlag('do_configure', 'depends', deps)
> + import oe.classextend
> + deps = ""
> + for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split():
> + deps += " %s:do_populate_sysroot" % dep
> + for variant in (d.getVar('MULTILIB_VARIANTS') or "").split():
> + clsextend = oe.classextend.ClassExtender(variant, d)
> + newdep = clsextend.extend_name(dep)
> + deps += " %s:do_populate_sysroot" % newdep
> + d.appendVarFlag('do_configure', 'depends', deps)
This is Python code. I believe the OE-Core standard is for Python code
to be indented using four spaces (whereas shell code should be indented
using tabs).
> }
> --
> 2.11.0
//Peter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gmp: do the multilib_header magic for gmp.h
On Tue, 2018-06-05 at 15:25 +0800, Changqing Li wrote: > Ping Already merged? http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=master=cc8f888018f55e6227b846429186307000d76a2 Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cpan_build.bbclass: adopt to recent EU::MM
On Mon, 2018-05-28 at 20:55 +0200, Jens Rehsack wrote:
> The modern the time, the improvements in ExtUtils::MakeMaker.
>
> Nowadays, .packlist and perllocal.pod aren't touched anymore when appropriate
> flags set during configure stage. Controlling the flags globally avoids
> dual-life recipes need share patching.
>
> Further: remove prepending ${PERL_ARCHLIB} in PERL5LIB - it's wrong (search
> order is site_lib, vendor_lib, core) - and ${PERL_ARCHLIB} contains core
> libpath only ...
>
> Signed-off-by: Jens Rehsack
> ---
> meta/classes/cpan.bbclass | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
I put this in for testing but I see:
$ SDKMACHINE="i686" bitbake nativesdk-libxml-parser-perl
[...]
ERROR: nativesdk-libxml-parser-perl-2.44-r0 do_package:
nativesdk-libxml-parser-perl: chrpath command failed with exit code 7:
b'/media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/package/opt/poky/2.5+snapshot/sysroots/i686-pokysdk-linux/usr/lib/perl/vendor_perl/5.24.1/auto/XML/Parser/Expat/Expat.so:
RPATH=/media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/recipe-sysroot/opt/poky/2.5+snapshot/sysroots/i686-pokysdk-linux/usr/lib\n'b"new
rpath
'$ORIGIN/../../../../../../../../../../../../../../media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/recipe-sysroot/opt/poky/2.5+snapshot/sysroots/i686-pokysdk-linux/usr/lib'
too large; maximum length 176\n"
ERROR: nativesdk-libxml-parser-perl-2.44-r0 do_package: Function failed:
perform_packagecopy
ERROR: Logfile of failure stored in:
/media/build1/poky/build/tmp-222/work/i686-nativesdk-pokysdk-linux/nativesdk-libxml-parser-perl/2.44-r0/temp/log.do_package.23783
ERROR: Task
(virtual:nativesdk:/media/build1/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb:do_package)
failed with exit code '1'
which seems to reproduce fairly readily both locally and on the
autobuilders. Reverting this patch resolves it.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] wpa-supplicant: fix the bug for PATCHTOOL = "patch"
When switch PATCHTOOL to patch, applying 'key-replay-cve-multiple.patch' failed:
checking file src/ap/ieee802_11.c
checking file src/ap/wpa_auth.c
checking file src/ap/wpa_auth.h
checking file src/ap/wpa_auth_ft.c
checking file src/ap/wpa_auth_i.h
checking file src/common/wpa_common.h
checking file src/rsn_supp/wpa.c
checking file src/rsn_supp/wpa_i.h
checking file src/rsn_supp/wpa.c
Hunk #1 FAILED at 709.
Hunk #2 FAILED at 757.
Hunk #3 succeeded at 840 (offset -12 lines).
Hunk #4 FAILED at 868.
Hunk #5 FAILED at 900.
Hunk #6 FAILED at 924.
Hunk #7 succeeded at 1536 (offset -38 lines).
Hunk #8 FAILED at 2386.
Hunk #9 FAILED at 2920.
Hunk #10 succeeded at 2940 (offset -46 lines).
Hunk #11 FAILED at 2998.
8 out of 11 hunks FAILED
checking file src/rsn_supp/wpa_i.h
Hunk #1 FAILED at 32.
1 out of 1 hunk FAILED
checking file src/common/wpa_common.h
Hunk #1 succeeded at 215 with fuzz 1.
checking file src/rsn_supp/wpa.c
checking file src/rsn_supp/wpa_i.h
checking file src/ap/wpa_auth.c
Hunk #1 succeeded at 1898 (offset -3 lines).
Hunk #2 succeeded at 2470 (offset -3 lines).
checking file src/rsn_supp/tdls.c
checking file wpa_supplicant/wnm_sta.c
checking file src/rsn_supp/wpa.c
Hunk #1 succeeded at 2378 (offset -62 lines).
checking file src/rsn_supp/wpa_ft.c
checking file src/rsn_supp/wpa_i.h
Hunk #1 succeeded at 123 (offset -5 lines).
So split the wpa-supplicant/key-replay-cve-multiple to 8 patches.
Signed-off-by: Hong Liu
---
.../wpa-supplicant/key-replay-cve-multiple.patch | 1025
.../wpa-supplicant/key-replay-cve-multiple1.patch | 191
.../wpa-supplicant/key-replay-cve-multiple2.patch | 249 +
.../wpa-supplicant/key-replay-cve-multiple3.patch | 183
.../wpa-supplicant/key-replay-cve-multiple4.patch | 78 ++
.../wpa-supplicant/key-replay-cve-multiple5.patch | 63 ++
.../wpa-supplicant/key-replay-cve-multiple6.patch | 131 +++
.../wpa-supplicant/key-replay-cve-multiple7.patch | 42 +
.../wpa-supplicant/key-replay-cve-multiple8.patch | 81 ++
.../wpa-supplicant/wpa-supplicant_2.6.bb |9 +-
10 files changed, 1026 insertions(+), 1026 deletions(-)
delete mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple1.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple2.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple3.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple4.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple5.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple6.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple7.patch
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple8.patch
diff --git
a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
deleted file mode 100644
index 436520f..000
---
a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
+++ /dev/null
@@ -1,1025 +0,0 @@
-The WPA2 four-way handshake protocol is vulnerable to replay attacks which can
-result in unauthenticated clients gaining access to the network.
-
-Backport a number of patches from upstream to fix this.
-
-CVE: CVE-2017-13077
-CVE: CVE-2017-13078
-CVE: CVE-2017-13079
-CVE: CVE-2017-13080
-CVE: CVE-2017-13081
-CVE: CVE-2017-13082
-CVE: CVE-2017-13086
-CVE: CVE-2017-13087
-CVE: CVE-2017-13088
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
-
-From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during Reassociation Response frame
-processing if the first attempt of setting the TK succeeded. This avoids
-issues related to clearing the TX/RX PN that could result in reusing
-same PN values for transmitted frames (e.g., due to CCM nonce reuse and
-also hitting replay protection on the receiver) and accepting replayed
-frames on RX side.
-
-This issue was introduced by the commit
-0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in
-authenticator') which allowed wpa_ft_install_ptk() to be called multiple
-times with the same PTK. While the second configuration attempt is
-needed with some drivers, it must be done only if the first attempt
-failed.
-
-Signed-off-by: Mathy Vanhoef
- src/ap/ieee802_11.c | 16 +---
- src/ap/wpa_auth.c| 11 +++
-
[OE-core] [PATCH] [PATCH] bc:1.06 -> 1.07.1
1.Upgrade bc from 1.06 to 1.07.1.
2.Update the checksum of LIC_FILES_CHKSUM, since GPLv3 has been added into the
license of bc.
Signed-off-by: Hong Liu
---
meta/recipes-extended/bc/bc_1.06.bb | 26 --
meta/recipes-extended/bc/bc_1.07.1.bb | 25 +
2 files changed, 25 insertions(+), 26 deletions(-)
delete mode 100644 meta/recipes-extended/bc/bc_1.06.bb
create mode 100644 meta/recipes-extended/bc/bc_1.07.1.bb
diff --git a/meta/recipes-extended/bc/bc_1.06.bb
b/meta/recipes-extended/bc/bc_1.06.bb
deleted file mode 100644
index d8c8a86..000
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Arbitrary precision calculator language"
-HOMEPAGE = "http://www.gnu.org/software/bc/bc.html;
-
-LICENSE = "GPLv2+ & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
-
file://bc/bcdefs.h;endline=31;md5=46dffdaf10a99728dd8ce358e45d46d8 \
-
file://dc/dc.h;endline=25;md5=2f9c558cdd80e31b4d904e48c2374328 \
-
file://lib/number.c;endline=31;md5=99434a0898abca7784acfd36b8191199"
-
-SECTION = "base"
-DEPENDS = "flex"
-PR = "r3"
-
-SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
- file://fix-segment-fault.patch "
-
-SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
-SRC_URI[sha256sum] =
"4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
-
-inherit autotools texinfo update-alternatives
-
-ALTERNATIVE_${PN} = "dc"
-ALTERNATIVE_PRIORITY = "100"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb
b/meta/recipes-extended/bc/bc_1.07.1.bb
new file mode 100644
index 000..264d648
--- /dev/null
+++ b/meta/recipes-extended/bc/bc_1.07.1.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Arbitrary precision calculator language"
+HOMEPAGE = "http://www.gnu.org/software/bc/bc.html;
+
+LICENSE = "GPLv3 & LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+
file://bc/bcdefs.h;endline=31;md5=8c8b24c7a8dd453e1e310383190a8285 \
+
file://dc/dc.h;endline=25;md5=636f7358bade791f26a8607a20da0eb7 \
+
file://lib/number.c;endline=31;md5=5c437fc63f83a46d4d769d4dd1e74525"
+
+SECTION = "base"
+DEPENDS = "flex"
+PR = "r3"
+
+SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
+"
+SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc"
+SRC_URI[sha256sum] =
"62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
+
+inherit autotools texinfo update-alternatives
+
+ALTERNATIVE_${PN} = "dc"
+ALTERNATIVE_PRIORITY = "100"
+
+BBCLASSEXTEND = "native"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] [PATCH] bind:9.10.6 -> 9.10.7
1.Upgrade bind from 9.10.6 to 9.10.7.
2.Update the checksum of LIC_FILES_CHKSUM, since bind has been changed. The
lincese has been modified time.
Signed-off-by: Hong Liu
---
.../bind/{bind_9.10.6.bb => bind_9.10.7.bb} | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
rename meta/recipes-connectivity/bind/{bind_9.10.6.bb => bind_9.10.7.bb} (90%)
diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb
b/meta/recipes-connectivity/bind/bind_9.10.7.bb
similarity index 90%
rename from meta/recipes-connectivity/bind/bind_9.10.6.bb
rename to meta/recipes-connectivity/bind/bind_9.10.7.bb
index 20c8d7b..124968b 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.isc.org/sw/bind/;
SECTION = "console/network"
LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=dba46507446198119bcde32a4feaab43"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c767ea4f3cf1017290d5b799fa929f80"
DEPENDS = "openssl libcap"
@@ -15,16 +15,14 @@ SRC_URI =
"https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://named.service \
file://bind9 \
file://init.d-add-support-for-read-only-rootfs.patch \
- file://bind-confgen-build-unix.o-once.patch \
file://0001-build-use-pkg-config-to-find-libxml2.patch \
file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \
file://0001-lib-dns-gen.c-fix-too-long-error.patch \
- file://use-python3-and-fix-install-lib-path.patch \
"
-SRC_URI[md5sum] = "84e663284b17aee0df1ce6f248b137d7"
-SRC_URI[sha256sum] =
"17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d"
+SRC_URI[md5sum] = "320b9ef5bdf19ef2718a823d9b4243ba"
+SRC_URI[sha256sum] =
"e15e70982d966cd4b194ff483f5cc636c0017b054ae2e332ca3f28fe53f11660"
UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/;
UPSTREAM_CHECK_REGEX = "(?P9(\.\d+)+(-P\d+)*)/"
@@ -36,6 +34,7 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool
--enable-threads \
--with-gssapi=no --with-ecdsa=yes \
--sysconfdir=${sysconfdir}/bind \
--with-openssl=${STAGING_DIR_HOST}${prefix} \
+ --with-eddsa=no \
"
inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
@@ -67,6 +66,7 @@ PACKAGE_BEFORE_PN += "${PN}-utils"
FILES_${PN}-utils = "${bindir}/host ${bindir}/dig"
FILES_${PN}-dev += "${bindir}/isc-config.h"
FILES_${PN} += "${sbindir}/generate-rndc-key.sh ${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN} += "/usr/lib/python2.7/site-packages/*"
PACKAGE_BEFORE_PN += "${PN}-libs"
FILES_${PN}-libs = "${libdir}/*.so*"
@@ -88,7 +88,7 @@ do_install_append() {
install -d "${D}${sysconfdir}/init.d"
install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
- sed -i -e '1s,#!.*python3,#! /usr/bin/python3,'
${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+ sed -i -e '1s,#!.*python,#! /usr/bin/python3,'
${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
# Install systemd related files
install -d ${D}${sbindir}
@@ -120,4 +120,3 @@ CONFFILES_${PN} = " \
${sysconfdir}/bind/db.local \
${sysconfdir}/bind/db.root \
"
-
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nettle: do the multilib_header magic for nettle-stdint.h and version.h
add multilib support for this receipe, or it will conflicts in mutlilib setting
Signed-off-by: Changqing Li
---
meta/recipes-support/nettle/nettle_3.4.bb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/nettle/nettle_3.4.bb
b/meta/recipes-support/nettle/nettle_3.4.bb
index 7a3cc65..ca8450e 100644
--- a/meta/recipes-support/nettle/nettle_3.4.bb
+++ b/meta/recipes-support/nettle/nettle_3.4.bb
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] =
"ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a
UPSTREAM_CHECK_REGEX = "nettle-(?P\d+(\.\d+)+)\.tar"
-inherit autotools ptest
+inherit autotools ptest multilib_header
EXTRA_AUTORECONF += "--exclude=aclocal"
@@ -35,6 +35,10 @@ do_compile_ptest() {
oe_runmake buildtest
}
+do_install_append() {
+oe_multilib_header nettle/nettle-stdint.h nettle/version.h
+}
+
do_install_ptest() {
install -d ${D}${PTEST_PATH}/testsuite/
install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gmp: do the multilib_header magic for gmp.h
Ping
On 05/18/2018 04:42 PM, changqing...@windriver.com wrote:
From: Changqing Li
Add multilib support feature for this recipe
Signed-off-by: Changqing Li
---
meta/recipes-support/gmp/gmp.inc | 2 +-
meta/recipes-support/gmp/gmp_6.1.2.bb | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index abac8cf..948b892 100644
--- a/meta/recipes-support/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "GMP is a free library for arbitrary precision
arithmetic, operati
HOMEPAGE = "http://gmplib.org/;
SECTION = "devel"
-inherit autotools texinfo
+inherit autotools texinfo multilib_header
PACKAGECONFIG ??= ""
PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
diff --git a/meta/recipes-support/gmp/gmp_6.1.2.bb
b/meta/recipes-support/gmp/gmp_6.1.2.bb
index b008710..c745dbb 100644
--- a/meta/recipes-support/gmp/gmp_6.1.2.bb
+++ b/meta/recipes-support/gmp/gmp_6.1.2.bb
@@ -25,6 +25,10 @@ EXTRA_OECONF_mipsarchr6_append = " --disable-assembly"
PACKAGES =+ "libgmpxx"
FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
+do_install_append() {
+ oe_multilib_header gmp.h
+}
+
do_install_prepend_class-target() {
sed -i \
-e "s|--sysroot=${STAGING_DIR_HOST}||g" \
--
BRs
Sandy(Li Changqing)
+861084778653
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
