Re: [OE-core] [PATCH] libgpg-error: Fix build with gawk 5.x
On 04/09/2019 01.50, Khem Raj wrote: Can we cherry-pick this patch to warrior and thud, please ? Hi For thud that uses a older version af libgpg-error, and the patch doesn't apply :-) Should I update the patch for thud and resend? /Sean -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] mdadm: skip timeout testcase 11spare-migration
From: Changqing Li
[YOCTO #13368]
Signed-off-by: Changqing Li
---
.../0001-mdadm-skip-test-11spare-migration.patch | 43 ++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 2 +
2 files changed, 45 insertions(+)
create mode 100644
meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
diff --git
a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
new file mode 100644
index 000..3a192cc
--- /dev/null
+++
b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
@@ -0,0 +1,43 @@
+From 1b83afa7c3121f819e72ea74883f8b6d61d6548e Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 6 Sep 2019 10:59:02 +0800
+Subject: [PATCH] mdadm: skip test 11spare-migration
+
+11spare-migration is a test series to check mdadm Monitor migrates spares
+according to rules in /etc/mdadm.conf defined by POLICY lines.
+
+[snip]
+for scan in no yes; do
+ for platform in 1.2 imsm; do
+ try
+ done
+done
+[snip]
+
+"try" includes near 20 sub testcase, so there are nearly 80 subcases need to
run,
+so it will take long time than ptest-runner timeout limit, skip it as
workaround.
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ test | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test b/test
+index 711a3c7..880dd1d 100755
+--- a/test
b/test
+@@ -272,6 +272,9 @@ main() {
+ else
+ for script in $testdir/$prefix $testdir/$prefix*[^~]
+ do
++ if [ $script == "$testdir/11spare-migration" ];then
++ continue
++ fi
+ do_test $script
+ done
+ fi
+--
+2.7.4
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 86c73ab..8b6e227 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -23,7 +23,9 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
file://include_sysmacros.patch \
file://0001-mdadm-support-usrmerge.patch \
+ file://0001-mdadm-skip-test-11spare-migration.patch \
"
+
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] mdadm: fix do_package failed when changed local.conf but not cleaned
From: Changqing Li
reproduce steps:
1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
2. bitbake mdadm --success
3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
4. bitbake mdadm -- failed when do_package
it is not proper to change source Makefile during do_install by sed,
change to add patch for it.
[YOCTO #13493]
Signed-off-by: Changqing Li
---
.../mdadm/files/0001-mdadm-support-usrmerge.patch | 46 ++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 7 ++--
2 files changed, 50 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
diff --git
a/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
b/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
new file mode 100644
index 000..f1aa119
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
@@ -0,0 +1,46 @@
+From 2c7ccea05d7cf9dde48d735faa511d1b06c14878 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 5 Sep 2019 18:03:11 +0800
+Subject: [PATCH] mdadm: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4839001..466e960 100644
+--- a/Makefile
b/Makefile
+@@ -88,7 +88,7 @@ MAP_PATH = $(MAP_DIR)/$(MAP_FILE)
+ MDMON_DIR = $(RUN_DIR)
+ # place for autoreplace cookies
+ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
+-SYSTEMD_DIR=/lib/systemd/system
++SYSTEMD_DIR=${SYSTEMD_UNITDIR}/system
+ LIB_DIR=/usr/libexec/mdadm
+
+ COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo
-DNO_COROSYNC)
+@@ -120,7 +120,7 @@ LDLIBS=-ldl
+
+ INSTALL = /usr/bin/install
+ DESTDIR =
+-BINDIR = /sbin
++BINDIR = ${BASE_SBINDIR}
+ MANDIR = /usr/share/man
+ MAN4DIR = $(MANDIR)/man4
+ MAN5DIR = $(MANDIR)/man5
+@@ -128,7 +128,7 @@ MAN8DIR = $(MANDIR)/man8
+
+ UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ ifndef UDEVDIR
+- UDEVDIR = /lib/udev
++ UDEVDIR = ${NONARCH_BASE_LIBDIR}/udev
+ endif
+
+ ifeq (,$(findstring s,$(MAKEFLAGS)))
+--
+2.7.4
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 74c94f6..86c73ab 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -22,6 +22,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm.init \
file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
file://include_sysmacros.patch \
+ file://0001-mdadm-support-usrmerge.patch \
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
@@ -41,13 +42,13 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
-EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
+EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"
BASE_SBINDIR="${base_sbindir}" \
+NONARCH_BASE_LIBDIR="${nonarch_base_libdir}" \
+SYSTEMD_UNITDIR="${systemd_unitdir}"'
DEBUG_OPTIMIZATION_append = " -Wno-error"
do_compile() {
- # Point to right sbindir
- sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR =
/lib;UDEVDIR = $nonarch_base_libdir;" -e
"s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;"
${S}/Makefile
oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] bootchart2: switch to add patch from change source in do_install
From: Changqing Li
it is not proper change source in do_install, it will make
source not updated even local.conf have change the DISTRO_FEATURES
[YOCTO #13493]
Signed-off-by: Changqing Li
---
.../0001-bootchart2-support-usrmerge.patch | 37 ++
.../bootchart2/bootchart2_0.14.8.bb| 7 ++--
2 files changed, 40 insertions(+), 4 deletions(-)
create mode 100644
meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
diff --git
a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
new file mode 100644
index 000..8ee6723
--- /dev/null
+++
b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
@@ -0,0 +1,37 @@
+From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 5 Sep 2019 18:37:31 +0800
+Subject: [PATCH] bootchart2: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1cc2974..f988904 100644
+--- a/Makefile
b/Makefile
+@@ -36,7 +36,7 @@ endif
+ PY_SITEDIR ?= $(PY_LIBDIR)/site-packages
+ LIBC_A_PATH = /usr$(LIBDIR)
+ # Always lib, even on systems that otherwise use lib64
+-SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system
++SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system
+ COLLECTOR = \
+ collector/collector.o \
+ collector/output.o \
+@@ -99,7 +99,7 @@ install-chroot:
+ install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs
+
+ install-collector: all install-chroot
+- install -m 755 -D bootchartd
$(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
++ install -m 755 -D bootchartd
$(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
+ install -m 644 -D bootchartd.conf
$(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf
+ install -m 755 -D bootchart-collector
$(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector
+
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index 465cdd9..a938b2d 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
@@ -93,6 +93,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)"
SRC_URI = "git://github.com/xrmx/bootchart.git \
file://bootchartd_stop.sh \
file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
+ file://0001-bootchart2-support-usrmerge.patch \
"
S = "${WORKDIR}/git"
@@ -114,6 +115,8 @@ UPDATERCPN = "bootchartd-stop-initscript"
INITSCRIPT_NAME = "bootchartd_stop.sh"
INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
+EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"'
+
do_compile_prepend () {
export PY_LIBDIR="${libdir}/${PYTHON_DIR}"
export BINDIR="${bindir}"
@@ -121,10 +124,6 @@ do_compile_prepend () {
}
do_install () {
-if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
-sed -i -e "s;install -m 755 -D bootchartd
\$(DESTDIR)\$(EARLY_PREFIX)/sbin/;install -m 755 -D bootchartd
\$(DESTDIR)/usr/sbin/;g" ${B}/Makefile
-fi
-sed -i -e "s;SYSTEMD_UNIT_DIR =; SYSTEMD_UNIT_DIR ?=;g" ${B}/Makefile
install -d ${D}${sysconfdir} # needed for -native
export PY_LIBDIR="${libdir}/${PYTHON_DIR}"
export BINDIR="${bindir}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] weston: uprev to 7.0.0
From: Ming Liu
Changes in V2:
1 Fix a musl build issue pointed out by Ross Burton, thanks Ross for the
testing.
Ming Liu (1):
weston: uprev to 7.0.0
.../wayland/weston/0001-make-error-portable.patch | 80 --
...ch-Provide-a-default-version-that-doesn-t.patch | 47 +++--
.../wayland/{weston_6.0.1.bb => weston_7.0.0.bb} | 7 +-
3 files changed, 28 insertions(+), 106 deletions(-)
delete mode 100644
meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
rename meta/recipes-graphics/wayland/{weston_6.0.1.bb => weston_7.0.0.bb} (95%)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] weston: uprev to 7.0.0
From: Ming Liu
- Adjust patches to comply with weston-7.0.0.
- Also drop the obsolete patch 0001-make-error-portable.patch.
Signed-off-by: Ming Liu
---
.../wayland/weston/0001-make-error-portable.patch | 80 --
...ch-Provide-a-default-version-that-doesn-t.patch | 47 +++--
.../wayland/{weston_6.0.1.bb => weston_7.0.0.bb} | 7 +-
3 files changed, 28 insertions(+), 106 deletions(-)
delete mode 100644
meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
rename meta/recipes-graphics/wayland/{weston_6.0.1.bb => weston_7.0.0.bb} (95%)
diff --git
a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
deleted file mode 100644
index acea9db..000
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From c4677e155736062e75687f1a655732c8902e912b Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH] make error() portable
-
-error() is not posix but gnu extension so may not be available on all
-kind of systemsi e.g. musl.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Khem Raj
-Signed-off-by: Ming Liu
- libweston/weston-error.h | 20
- libweston/weston-launch.c | 2 +-
- meson.build | 1 +
- 3 files changed, 22 insertions(+), 1 deletion(-)
- create mode 100644 libweston/weston-error.h
-
-diff --git a/libweston/weston-error.h b/libweston/weston-error.h
-new file mode 100644
-index 000..2089d02
/dev/null
-+++ b/libweston/weston-error.h
-@@ -0,0 +1,20 @@
-+#ifndef _WESTON_ERROR_H
-+#define _WESTON_ERROR_H
-+
-+#if defined(HAVE_ERROR_H)
-+#include
-+#else
-+#include
-+#include
-+#define _weston_error(S, E, F, ...) do { \
-+ if (E) \
-+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
-+ else \
-+ err(S, F, ##__VA_ARGS__); \
-+} while(0)
-+
-+#define error _weston_error
-+#endif
-+
-+#endif
-+
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index bf73e0d..9064439 100644
a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -33,7 +33,6 @@
- #include
- #include
-
--#include
- #include
-
- #include
-@@ -59,6 +58,7 @@
- #endif
-
- #include "weston-launch.h"
-+#include "weston-error.h"
-
- #define DRM_MAJOR 226
-
-diff --git a/meson.build b/meson.build
-index 2155b7b..baa52d9 100644
a/meson.build
-+++ b/meson.build
-@@ -94,6 +94,7 @@ foreach func : optional_libc_funcs
- endforeach
-
- optional_system_headers = [
-+ 'error.h',
- 'linux/sync_file.h'
- ]
- foreach hdr : optional_system_headers
---
-2.7.4
-
diff --git
a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 81cc025..e50845b 100644
---
a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++
b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,4 +1,4 @@
-From 7d2fea61a95e9498b5a19c8cffcb2ab5631d5685 Mon Sep 17 00:00:00 2001
+From 682b7d79a7b81ec8e38760381104b24ad549e8c0 Mon Sep 17 00:00:00 2001
From: Tom Hochstein
Date: Wed, 22 Feb 2017 15:53:30 +0200
Subject: [PATCH] weston-launch: Provide a default version that doesn't require
@@ -18,16 +18,16 @@ Signed-off-by: Denys Dmytriyenko
Signed-off-by: Ming Liu
---
libweston/meson.build | 16
- libweston/weston-launch.c | 20
+ libweston/weston-launch.c | 21 +
meson_options.txt | 7 +++
- 3 files changed, 39 insertions(+), 4 deletions(-)
+ 3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/libweston/meson.build b/libweston/meson.build
-index 33ab970..32f495a 100644
+index d8d3fc0..326683f 100644
--- a/libweston/meson.build
+++ b/libweston/meson.build
-@@ -472,16 +472,24 @@ if get_option('renderer-gl')
- endif
+@@ -199,16 +199,24 @@ dep_vertex_clipping = declare_dependency(
+ )
if get_option('weston-launch')
- dep_pam = cc.find_library('pam')
@@ -56,7 +56,7 @@ index 33ab970..32f495a 100644
install: true
)
diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 9064439..c6abe92 100644
+index 4962bd6..fc531c5 100644
--- a/libweston/weston-launch.c
+++ b/libweston/weston-launch.c
@@ -51,7 +51,9 @@
@@ -69,7 +69,7 @@ index 9064439..c6abe92 100644
#ifdef HAVE_SYSTEMD_LOGIN
#include
-@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
+@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
#endif
struct weston_launch {
@@ -80,7 +80,7 @@ index 9064439..c6abe92 100644
int tty;
int ttynr;
int sock[2];
-@@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl)
+@@ -192,6 +196,7 @@ weston_launch_
Re: [OE-core] [PATCH] kernel-devsrc: copy mmiowb.h and modpost from ${B} of kernel
On 9/4/19 8:34 PM, Bruce Ashfield wrote:
On Wed, Sep 4, 2019 at 6:07 AM Hongzhi, Song wrote:
On 9/4/19 11:55 AM, Bruce Ashfield wrote:
On Tue, Sep 3, 2019 at 9:43 PM Hongzhi.Song wrote:
There are two errors when compile an out of tree kernel module
using sdk:
This is not universally true. Can you expand on what kernel version
and architectures you are building ? I'm able to build kernel modules
across all the arches I'm currently testing, so I'd like to capture
your exact config in the long log. Neither is the autobuilder showing
any errors.
Hi Bruce,
kernel version: 5.0.19
git clone poky
echo TOOLCHAIN_HOST_TASK_append = " nativesdk-openssl-dev
nativesdk-bison nativesdk-flex"
TOOLCHAIN_TARGET_TASK_append = " python-dev kernel-dev
kernel-devsrc")
>> conf/local.conf
Other config is default.
bitbake core-image-minimal && bitbake core-image-minimal -c populate_sdk
./tmp/deploy/sdk/xxx.sh
cd ${Your SDK path}/sysroots/xxx/usr/src/kernel
make scripts
Then you can build yourself module. And you will meet missing some head
files and scripts/mod/modpost.
I test qemux86-64 and qemuarm.
Both of above arch miss different head files, which all of them
generated in ${B}/arch/${ARCH}/include/generated/asm
(qemux86-64 needs asm/early_ioremap.h and asm/mmiowb.h
qemuarm needs asm/bitsperlong.h)
1. "In file included from ./include/linux/seqlock.h:36:0,
from ./include/linux/time.h:6,
from ./include/linux/stat.h:19,
from ./include/linux/module.h:10,
from kernel-module/char.c:1:
./include/linux/spinlock.h:60:10: fatal error: asm/mmiowb.h: No such
file or directory"
mmiowb.h is generated to ${B}/arch/${ARCH}/include/generated/asm/.
And there is only generated/ under ${B}/arch/${ARCH}/include/,
so I copy whole ${B}/arch/${ARCH}/include/ to $kerneldir/build/
in case of other files under generated/ is needed in the future.
2. "/bin/sh: scripts/mod/modpost: No such file or directory"
Copy above files or directory to $kerneldir/build/ fix the errors.
Signed-off-by: Hongzhi.Song
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 3900489..feff9f1 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -80,6 +80,12 @@ do_install() {
cp .config $kerneldir/build
+ if [ -d arch/${ARCH}/include ]; then
+ cp -a --parents arch/${ARCH}/include $kerneldir/build/
+ fi
Just copy the files you need, not the entire directory.
Just as explained above, exactly speaking I think include/generated is
necessary.
It shouldn't be. The point of what we include in devsrc is that it can
regenerate all these files either on target, or the SDK.
ps: only generated/ under include/.
+
+ cp --parents scripts/mod/modpost $kerneldir/build/
We shouldn't be copying binaries or scripts. They are regenerated on target.
Bruce
But scripts/mod/modpost is needed when compile a module by sdk.
yes, that is expected. But 'make scripts prepare' should be recreating
them. Is that not working for you ?
Even without this patch, 'make scripts prepare' works.
So 2.7doc maybe need to be update, because 2.6doc uses 'make scripts'.
https://www.yoctoproject.org/docs/2.6/mega-manual/mega-manual.html#building-out-of-tree-modules-on-the-target
--Hongzhi
We can't copy the binaries, since you'll get QA errors depending on
your host/target arch combination.
Bruce
Otherwise it will show error info:
"
/bin/sh: scripts/mod/modpost: No such file or directory
scripts/Makefile.modpost:92: recipe for target '__modpost' failed
"
--Hongzhi
+
# This scripts copy blow up QA, so for now, we require a more
# complex 'make scripts' to restore these, versus copying them
# here. Left as a reference to indicate that we know the scripts must
--
2.8.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2] meson:upgrade 0.51.1 -> 0.51.2
-meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
Removed since this is included in 0.51.2.
Signed-off-by: Zang Ruochen
---
meta/recipes-devtools/meson/meson.inc | 5 +-
...-return-statements-that-are-seen-with-Wer.patch | 100 -
.../meson/{meson_0.51.1.bb => meson_0.51.2.bb} | 0
...k-meson_0.51.1.bb => nativesdk-meson_0.51.2.bb} | 0
4 files changed, 2 insertions(+), 103 deletions(-)
delete mode 100644
meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
rename meta/recipes-devtools/meson/{meson_0.51.1.bb => meson_0.51.2.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.1.bb =>
nativesdk-meson_0.51.2.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc
b/meta/recipes-devtools/meson/meson.inc
index 14e5f8a..6de109d 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,10 +16,9 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
file://vala-cross-compile.patch \
-
file://0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch \
"
-SRC_URI[sha256sum] =
"f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82"
-SRC_URI[md5sum] = "48787e391ec5c052799a3dd491f73909"
+SRC_URI[sha256sum] =
"23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
+SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git
a/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
b/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
deleted file mode 100644
index 16c6d90..000
---
a/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 15f44be1c7f71cb0a8c6863917acbbc301c621fe Mon Sep 17 00:00:00 2001
-From: Martin Liska
-Date: Mon, 15 Jul 2019 10:06:17 +0200
-Subject: [PATCH] Fix missing return statements that are seen with
- -Werror=return-type.
-
-Error example:
-
-Code:
-
-#include
-int main () {
-/* If it's not defined as a macro, try to use as a symbol */
-#ifndef LC_MESSAGES
-LC_MESSAGES;
-#endif
-}
-Compiler stdout:
-
-Compiler stderr:
- In file included from /usr/include/locale.h:25,
- from /tmp/tmpep_i4iwg/testfile.c:2:
-/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE
-requires compiling with optimization (-O) [-Wcpp]
- 382 | # warning _FORTIFY_SOURCE requires compiling with optimization
-(-O)
- |^~~
-/tmp/tmpep_i4iwg/testfile.c: In function 'main':
-/tmp/tmpep_i4iwg/testfile.c:8:9: error: control reaches end of non-void
-function [-Werror=return-type]
-8 | }
- | ^
-cc1: some warnings being treated as errors
-
-Upstream-Status: Backport
-Signed-off-by: Martin Jansa
- mesonbuild/compilers/c.py | 1 +
- mesonbuild/compilers/clike.py | 5 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
-index 3b58a076..9ef92077 100644
a/mesonbuild/compilers/c.py
-+++ b/mesonbuild/compilers/c.py
-@@ -70,6 +70,7 @@ class CCompiler(CLikeCompiler, Compiler):
- #ifndef {symbol}
- {symbol};
- #endif
-+return 0;
- }}'''
- return self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)
-diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/clike.py
-index 83f67591..f9cbeabd 100644
a/mesonbuild/compilers/clike.py
-+++ b/mesonbuild/compilers/clike.py
-@@ -375,6 +375,7 @@ class CLikeCompiler:
- #ifndef {symbol}
- {symbol};
- #endif
-+return 0;
- }}'''
- return self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)
-@@ -554,6 +555,7 @@ class CLikeCompiler:
- {prefix}
- int main(int argc, char **argv) {{
- {type} something;
-+return 0;
- }}'''
- if not self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)[0]:
-@@ -589,6 +591,7 @@ class CLikeCompiler:
- {prefix}
- int main(int argc, char **argv) {{
- {type} something;
-+return 0;
- }}'''
- if not self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)
Re: [OE-core] [PATCH] mdadm: fix do_package failed when changed local.conf but not cleaned
On 9/5/19 9:53 PM, Peter Kjellerstedt wrote:
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org On Behalf Of
changqing...@windriver.com
Sent: den 5 september 2019 13:19
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH] mdadm: fix do_package failed when changed
local.conf but not cleaned
From: Changqing Li
reproduce steps:
1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
2. bitbake mdadm --success
3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
4. bitbake mdadm -- failed when do_package
it is not proper to change source Makefile during do_compile by sed,
change to add patch for it.
[YOCTO: #13493]
Signed-off-by: Changqing Li
---
.../mdadm/files/0001-mdadm-support-usrmerge.patch | 46
++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 7 ++--
2 files changed, 50 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-
support-usrmerge.patch
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-support-
usrmerge.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-support-
usrmerge.patch
new file mode 100644
index 000..f1aa119
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-support-
usrmerge.patch
@@ -0,0 +1,46 @@
+From 2c7ccea05d7cf9dde48d735faa511d1b06c14878 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 5 Sep 2019 18:03:11 +0800
+Subject: [PATCH] mdadm: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4839001..466e960 100644
+--- a/Makefile
b/Makefile
+@@ -88,7 +88,7 @@ MAP_PATH = $(MAP_DIR)/$(MAP_FILE)
+ MDMON_DIR = $(RUN_DIR)
+ # place for autoreplace cookies
+ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
+-SYSTEMD_DIR=/lib/systemd/system
++SYSTEMD_DIR=${SYSTEMD_UNITDIR}/system
+ LIB_DIR=/usr/libexec/mdadm
+
+ COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] ||
echo -DNO_COROSYNC)
+@@ -120,7 +120,7 @@ LDLIBS=-ldl
+
+ INSTALL = /usr/bin/install
+ DESTDIR =
+-BINDIR = /sbin
++BINDIR = ${BASE_SBINDIR}
+ MANDIR = /usr/share/man
+ MAN4DIR = $(MANDIR)/man4
+ MAN5DIR = $(MANDIR)/man5
+@@ -128,7 +128,7 @@ MAN8DIR = $(MANDIR)/man8
+
+ UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ ifndef UDEVDIR
+- UDEVDIR = /lib/udev
++ UDEVDIR = ${NONARCH_BASE_LIBDIR}/udev
+ endif
+
+ ifeq (,$(findstring s,$(MAKEFLAGS)))
+--
+2.7.4
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-
extended/mdadm/mdadm_4.1.bb
index 74c94f6..efeb09d 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -22,6 +22,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm.init \
file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
file://include_sysmacros.patch \
+
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-mdadm-support-usrmerge.patch','',d)}
\
Since the patch will work regardless of whether usrmerge is enabled
or not, I think it is better to always apply it. The same goes for
the corresponding path for bootchart2.
yes, I will send V2 as recommanded.
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
@@ -41,13 +42,13 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
-EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
+EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"
BASE_SBINDIR="${base_sbindir}" \
+NONARCH_BASE_LIBDIR="${nonarch_base_libdir}" \
+SYSTEMD_UNITDIR="${systemd_unitdir}"'
DEBUG_OPTIMIZATION_append = " -Wno-error"
do_compile() {
- # Point to right sbindir
- sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR =
$nonarch_base_libdir;" -e
"s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;" ${S}/Makefile
oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
}
--
2.7.4
//Peter
--
BRs
Sandy(Li Changqing)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][V2] sdkext: use simpler kernel module for devtool test
On 9/5/19 2:27 PM, richard.pur...@linuxfoundation.org wrote: > On Thu, 2019-09-05 at 13:54 -0400, Mark Asselstine wrote: >> On Thursday, August 22, 2019 11:56:16 A.M. EDT Mark Asselstine wrote: >>> The current devtool test for the building of an out-of-tree kernel >>> module uses something which requires several "high order" kconfigs >>> to >>> be set. This results in the test failing, not for expected reasons, >>> but rather because it depends on specific kernel configuration. >>> >>> You will get error messages such as >>> >>> ERROR: "video_ioctl2" >>> >>> [.../1.0-r5/testsdkext/workspace/sources/v4l2loopback- >>> driver/v4l2loopback.k >>> o] undefined! >>> ERROR: "video_unregister_device" >>> >>> [.../1.0-r5/testsdkext/workspace/sources/v4l2loopback- >>> driver/v4l2loopback.k >>> o] undefined! >>> >>> Using a simpler hello-world kernel module example will only require >>> that CONFIG_MODULE is enabled, thus avoiding a false positive. >>> >>> Signed-off-by: Mark Asselstine >>> --- >>> >>> **V2** >>> - also updated the CROPS manual test json file >>>(I have no idea how to run this so untested but this is a >>> straight >>> substition) >>> - continue to use github until we can move the sample to somewhere >>>like git.yoctoproject.org >> Richard, are you thinking we need to figure out the >> git.yoctoproject.org repo >> before we can move ahead with merging this? > I would like to fix that, yes. I could ask Michael for help but I do > have access to sort it myself too. > > I'm also trying to sort out a few other issues before -next can merge. > > Since I'm failing to get to it, > > Michael, > > Could you clone: > > https://github.com/masselstine/kernel-module-hello-world.git > > onto git.yp.org as a new repo and give write access to it for Mark, > myself, Bruce and Ross please? This repo is ready at g...@push.yoctoproject.org:kernel-module-hello-world for the four of you. It is available read-only for anyone at, git://git.yoctoproject.org/kernel-module-hello-world and https://git.yoctoproject.org/git/pokykernel-module-hello-world > > Cheers, > > Richard > > > -- Michael Halstead Linux Foundation / SysAdmin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: ensure reproducible builds by clearly exposing the time epoch support
systemd has the ability to check the time on boot and if it's earlier than an
epoch determined at build time, set the time to that epoch. This is useful for
systems where the system time is January 1st 1970 (because the unix timestamp
was 0 at boot) as then at least the time is reset to something approximating the
right year at least.
By default systemd uses the mtime of the NEWS file, which is static for tarballs
and corresponds to the time the release was made, but for git checkouts this is
simply the time do_unpack() was executed. Thus, rebuilding systemd will cause
this embedded timestamp to change.
Remove the PACKAGECONFIG time-epoch which has the logic reversed: enabling
time-epoch will set the epoch to the unix timestamp 0). Replace with
set-time-epoch with the following semantics:
- When disabled, the time epoch is set to 0 (1st January 1970), so there is no
time manipulation on boot.
- When enabled, if reproducible builds are configured by setting
SOURCE_DATE_EPOCH then that timestamp is used for the time epoch. If
reproducible builds are not configured then the timestamp of NEWS (thus the
build time) is used.
The set-time-epoch flag is enabled by default.
[ YOCTO #13473 ]
Signed-off-by: Ross Burton
---
meta/recipes-core/systemd/systemd_242.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_242.bb
b/meta/recipes-core/systemd/systemd_242.bb
index 6bbe388b1f9..2c101cbbb4a 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -83,6 +83,7 @@ PACKAGECONFIG ??= " \
quotacheck \
randomseed \
resolved \
+set-time-epoch \
smack \
sysusers \
timedated \
@@ -166,7 +167,12 @@ PACKAGECONFIG[seccomp] =
"-Dseccomp=true,-Dseccomp=false,libseccomp"
PACKAGECONFIG[selinux] =
"-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell"
PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false"
PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false"
-PACKAGECONFIG[time-epoch] = "-Dtime-epoch=0,,"
+# When enabled use reproducble build timestamp if set as time epoch,
+# or build time if not. When disabled, time epoch is unset.
+def build_epoch(d):
+epoch = d.getVar('SOURCE_DATE_EPOCH') or "-1"
+return '-Dtime-epoch=%d' % int(epoch)
+PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston: uprev to 7.0.0
On 05/09/2019 23:14, Ross Burton wrote: On 26/08/2019 02:14, liu.min...@gmail.com wrote: From: Ming Liu - Adjust patches to comply with weston-7.0.0. - Also drop the obsolete patch 0001-make-error-portable.patch. Signed-off-by: Ming Liu Fails with musl: ../weston-7.0.0/libweston/weston-launch.c:790:4: warning: implicit declaration of function 'error'; did you mean 'perror'? [-Wimplicit-function-declaration] 790 | error(1, 0, "-u is unsupported in this weston-launch build"); | ^ | perror This is from 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston: uprev to 7.0.0
On 05/09/2019 23:14, Ross Burton wrote: On 26/08/2019 02:14, liu.min...@gmail.com wrote: From: Ming Liu - Adjust patches to comply with weston-7.0.0. - Also drop the obsolete patch 0001-make-error-portable.patch. Signed-off-by: Ming Liu Fails with musl: ../weston-7.0.0/libweston/weston-launch.c:790:4: warning: implicit declaration of function 'error'; did you mean 'perror'? [-Wimplicit-function-declaration] 790 | error(1, 0, "-u is unsupported in this weston-launch build"); | ^ | perror https://gitlab.freedesktop.org/wayland/weston/commit/a1450a8a71ef1adb921421f48bbea552a8e738e3 Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston: uprev to 7.0.0
On 05/09/2019 23:16, Ross Burton wrote: On 05/09/2019 23:14, Ross Burton wrote: On 26/08/2019 02:14, liu.min...@gmail.com wrote: From: Ming Liu - Adjust patches to comply with weston-7.0.0. - Also drop the obsolete patch 0001-make-error-portable.patch. Signed-off-by: Ming Liu Fails with musl: ../weston-7.0.0/libweston/weston-launch.c:790:4: warning: implicit declaration of function 'error'; did you mean 'perror'? [-Wimplicit-function-declaration] 790 | error(1, 0, "-u is unsupported in this weston-launch build"); | ^ | perror https://gitlab.freedesktop.org/wayland/weston/commit/a1450a8a71ef1adb921421f48bbea552a8e738e3 Hm, no, that's in the 7.0.0 release already. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston: uprev to 7.0.0
On 26/08/2019 02:14, liu.min...@gmail.com wrote: From: Ming Liu - Adjust patches to comply with weston-7.0.0. - Also drop the obsolete patch 0001-make-error-portable.patch. Signed-off-by: Ming Liu Fails with musl: ../weston-7.0.0/libweston/weston-launch.c:790:4: warning: implicit declaration of function 'error'; did you mean 'perror'? [-Wimplicit-function-declaration] 790 |error(1, 0, "-u is unsupported in this weston-launch build"); |^ |perror Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-9.2: Fix risc-v dynamic linker relocation
On Wed, Sep 4, 2019 at 6:30 PM Khem Raj wrote:
>
> Accidentally dropped in 9.2 update
>
> Reported-by: Ricardo Salveti
> Signed-off-by: Khem Raj
This fixes the RV64 build for me.
Reviewed-by: Alistair Francis
Alistair
> ---
> ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 23 ++-
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git
> a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
>
> b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> index 21908bce9b..66fb24d4cd 100644
> ---
> a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> +++
> b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> @@ -1,7 +1,7 @@
> -From a93743732b2125aebd9a6d65e999d7506b01d6b3 Mon Sep 17 00:00:00 2001
> +From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001
> From: Khem Raj
> Date: Fri, 29 Mar 2013 09:24:50 +0400
> -Subject: [PATCH 11/36] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
> +Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
> relative to SYSTEMLIBS_DIR
>
> This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
> @@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration]
> gcc/config/i386/linux64.h| 6 +++---
> gcc/config/linux.h | 8
> gcc/config/mips/linux.h | 12 ++--
> + gcc/config/riscv/linux.h | 2 +-
> gcc/config/rs6000/linux64.h | 15 +--
> gcc/config/sh/linux.h| 2 +-
> gcc/config/sparc/linux.h | 2 +-
> gcc/config/sparc/linux64.h | 4 ++--
> - 11 files changed, 28 insertions(+), 33 deletions(-)
> + 12 files changed, 29 insertions(+), 34 deletions(-)
>
> diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
> index 824861befec..6afacce3292 100644
> @@ -152,6 +153,19 @@ index 6f79ac9c01a..25de96f9561 100644
>
> #undef MUSL_DYNAMIC_LINKER32
> #define MUSL_DYNAMIC_LINKER32 \
> +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
> +index 58dd18b89f3..112ba9cd764 100644
> +--- a/gcc/config/riscv/linux.h
> b/gcc/config/riscv/linux.h
> +@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
> + GNU_USER_TARGET_OS_CPP_BUILTINS();\
> + } while (0)
> +
> +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC
> ".so.1"
> ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-"
> ABI_SPEC ".so.1"
> +
> + #define MUSL_ABI_SUFFIX \
> + "%{mabi=ilp32:-sf}" \
> diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
> index 9946d3fed94..45a9a7cae59 100644
> --- a/gcc/config/rs6000/linux64.h
> @@ -227,6 +241,3 @@ index 789d1df4bd5..b920c680fb1 100644
>
> #ifdef SPARC_BI_ARCH
>
> ---
> -2.22.1
> -
> --
> 2.23.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] OEDEM 2019
On 9/3/19 11:19 PM, akuster808 wrote: > > > On 9/3/19 8:37 AM, Ruslan Bilovol wrote: >> Hi Philip, >> >> I can see now this event in the list of ELCE co-located events. >> Is day 2 track track 2 (Yocto Project and OE maintainers meeting) >> restricted to attend to mainatainers only, or regular OE developers >> can also join? > Anyone can signup. This is related to the Yocto summit email that got > sent out a few weeks ago. Just to confirm, on day 2 of the Yocto Project Summit, we split the space into two rooms. One (60 person) is used for workshop/hacking and the other (40 persons) will be used for something like the normal OpenEmbedded Developer meetings we are used. We need to people to move between this and the workshiop, so we will want to try and stick to a schedule to make sure people know when we talk about certain issues. I've started on the wiki page: https://www.openembedded.org/wiki/OEDEM_2019 Philip > > - armin > >> >> Thanks, >> Ruslan >> >> On Tue, Jul 30, 2019 at 8:33 PM Philip Balister wrote: >>> We are working with the Yocto Project on a two day Summit event. This >>> should implement part of the ideas from the the last couple of developer >>> meetings. >>> >>> Philip >>> >>> On 07/30/2019 12:58 PM, Ruslan Bilovol wrote: Hi all, Is there any plan to hold an OpenEmbedded developer meting in Lyon, France around this year's ELCE 2019 (October 28-30)? I see that OEDEM 2019 page isn't created yet and I didn't find any news in mailing lists yet: https://www.openembedded.org/wiki/OEDEM_2019 Thanks, Ruslan > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meson:upgrade 0.51.1 -> 0.51.2
On 05/09/2019 08:12, Zang Ruochen wrote: -meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch Removed since this is included in 0.51.2. This doesn't touch nativesdk-meson, so the build fails with checksum failures. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][V2] sdkext: use simpler kernel module for devtool test
On Thu, 2019-09-05 at 13:54 -0400, Mark Asselstine wrote: > On Thursday, August 22, 2019 11:56:16 A.M. EDT Mark Asselstine wrote: > > The current devtool test for the building of an out-of-tree kernel > > module uses something which requires several "high order" kconfigs > > to > > be set. This results in the test failing, not for expected reasons, > > but rather because it depends on specific kernel configuration. > > > > You will get error messages such as > > > > ERROR: "video_ioctl2" > > > > [.../1.0-r5/testsdkext/workspace/sources/v4l2loopback- > > driver/v4l2loopback.k > > o] undefined! > > ERROR: "video_unregister_device" > > > > [.../1.0-r5/testsdkext/workspace/sources/v4l2loopback- > > driver/v4l2loopback.k > > o] undefined! > > > > Using a simpler hello-world kernel module example will only require > > that CONFIG_MODULE is enabled, thus avoiding a false positive. > > > > Signed-off-by: Mark Asselstine > > --- > > > > **V2** > > - also updated the CROPS manual test json file > >(I have no idea how to run this so untested but this is a > > straight > > substition) > > - continue to use github until we can move the sample to somewhere > >like git.yoctoproject.org > > Richard, are you thinking we need to figure out the > git.yoctoproject.org repo > before we can move ahead with merging this? I would like to fix that, yes. I could ask Michael for help but I do have access to sort it myself too. I'm also trying to sort out a few other issues before -next can merge. Since I'm failing to get to it, Michael, Could you clone: https://github.com/masselstine/kernel-module-hello-world.git onto git.yp.org as a new repo and give write access to it for Mark, myself, Bruce and Ross please? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] dnf.py: installroot support usrmerge
On 9/4/19 4:36 AM, Changqing Li wrote: On 9/4/19 4:15 PM, Richard Purdie wrote: On Wed, 2019-09-04 at 16:04 +0800, Changqing Li wrote: Ping Test with/without usrmege feature passed. With usrmerge: NOTE: test_dnf_installroot (dnf.DnfRepoTest) DEBUG: Checking if 'DISTRO_FEATURES' value contains 'usrmerge' to skip the test NOTE: ... skipped 'Test run when not enable usrmerge' Test run when not enable usrmerge NOTE: test_dnf_installroot_usrmerge (dnf.DnfRepoTest) DEBUG: Checking if 'DISTRO_FEATURES' value contains 'usrmerge' to run the test DEBUG: [Running]$ ssh -l root -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR 192.168.7.16 export PATH=/usr/sbin:/sbin:/usr/bin:/bin; mkdir -p /home/root/chroot/test/etc Without usrmerge: NOTE: test_dnf_installroot (dnf.DnfRepoTest) DEBUG: Checking if 'DISTRO_FEATURES' value contains 'usrmerge' to skip the test DEBUG: [Running]$ ssh -l root -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR 192.168.7.10 export PATH=/usr/sbin:/sbin:/usr/bin:/bin; mkdir -p /home/root/chroot/test/etc DEBUG: time: 1567404974.8490767, endtime: 1567406474.8424258 DEBUG: [Command returned '0' after 0.13 seconds] DEBUG: Command: mkdir -p /home/root/chroot/test/etc Output: ... NOTE: ... ok NOTE: test_dnf_installroot_usrmerge (dnf.DnfRepoTest) DEBUG: Checking if 'DISTRO_FEATURES' value contains 'usrmerge' to run the test NOTE: ... skipped 'Test run when enable usrmege' Test run when enable usrmege In a previous version of this patch, it introduced a failure in the parselogs test as an error was generated into the logs. I haven't tested the new version of the patch, was that issue addressed? Cheers, Richard I didn't met failure in test_parselog during test, the whole testimage is passed. Could you help to send me the link of the failure test if the new version still met test_parselog failure? Thanks. Sandy, Richard shouldn't have to do that since many people have such requests and if he helped everyone he would (and has in the past) spend/t too much time helping people. We should be able to setup the autobuilder locally to reproduce the problem. Also during the YP bug review call, someone suggested that you check if the dnf install tests are running in a deterministic order. If they are not, then that might explain why the AB sees the problem but you do not. ../Randy -- # Randy MacLeod # Wind River Linux -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH] diffutils: Add valgrind to support ptest
On 9/5/19 12:57 PM, Richard Purdie wrote:
On Thu, 2019-09-05 at 11:38 -0400, Peiran Hong wrote:
From: Peiran Hong
The test "strip-trailing-cr" for diffutils package is skipped since
it requires
valgrind to run. This commit adds valgrind to the run-time dependency
of
the recipe for diffutils.
Signed-off-by: Peiran Hong
---
meta/recipes-extended/diffutils/diffutils_3.7.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb
b/meta/recipes-extended/diffutils/diffutils_3.7.bb
index 7daeee3513..2d763633b6 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.7.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.7.bb
@@ -17,7 +17,9 @@ acpaths = "-I ./m4"
inherit ptest
-RDEPENDS_${PN}-ptest += "make"
+# Include valgrind since the test "strip-trailing-cr" requires it to
run, although
+# valgrind is a heavy package for diffutils
+RDEPENDS_${PN}-ptest += "make valgrind"
This effectively means "bitbake diffutils" now requires valgrind to
build before it. I'm not sure its worth doing that for a single test?
I was on the fence as well but I thought we'd ask devs on the list by
sending the patch.
Peiran,
Please send a v2 that SKIPs the test.
../Randy
Cheers,
Richard
--
# Randy MacLeod
# Wind River Linux
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][V2] sdkext: use simpler kernel module for devtool test
On Thursday, August 22, 2019 11:56:16 A.M. EDT Mark Asselstine wrote:
> The current devtool test for the building of an out-of-tree kernel
> module uses something which requires several "high order" kconfigs to
> be set. This results in the test failing, not for expected reasons,
> but rather because it depends on specific kernel configuration.
>
> You will get error messages such as
>
> ERROR: "video_ioctl2"
>
> [.../1.0-r5/testsdkext/workspace/sources/v4l2loopback-driver/v4l2loopback.k
> o] undefined!
> ERROR: "video_unregister_device"
>
> [.../1.0-r5/testsdkext/workspace/sources/v4l2loopback-driver/v4l2loopback.k
> o] undefined!
>
> Using a simpler hello-world kernel module example will only require
> that CONFIG_MODULE is enabled, thus avoiding a false positive.
>
> Signed-off-by: Mark Asselstine
> ---
>
> **V2**
> - also updated the CROPS manual test json file
>(I have no idea how to run this so untested but this is a straight
> substition)
> - continue to use github until we can move the sample to somewhere
>like git.yoctoproject.org
Richard, are you thinking we need to figure out the git.yoctoproject.org repo
before we can move ahead with merging this?
MarkA
>
> meta/lib/oeqa/manual/crops.json | 12 ++--
> meta/lib/oeqa/sdkext/cases/devtool.py | 4 ++--
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/meta/lib/oeqa/manual/crops.json
> b/meta/lib/oeqa/manual/crops.json index 1cf3c8f30c..071d35b661 100644
> --- a/meta/lib/oeqa/manual/crops.json
> +++ b/meta/lib/oeqa/manual/crops.json
> @@ -234,16 +234,16 @@
> "expected_results": "this should output the directory
> of the devtool script and it should be within the sdk workdir you are
> working in. \n\n" },
> "5": {
> -"action": "devtool add v4l2loopback-driver
> https://github.com/umlaeute/v4l2loopback.git \n\n", -
> "expected_results": "This should automatically create the recipe
> v4l2loopback-driver.bb under
> /recipes/v4l2loopback-driver/v4l2loopback-dri
> ver.bb " +"action": "devtool add
> kernel-module-hello-world
> https://github.com/masselstine/kernel-module-hello-world.git \n\n", +
>"expected_results": "This should automatically create the
> recipe kernel-module-hello-world.bb under
> /recipes/kernel-module-hello-world/kernel-mod
> ule-hello-world.bb " },
> "6": {
> -"action": "devtool build v4l2loopback-driver \n\n",
> +"action": "devtool build kernel-module-hello-world
> \n\n", "expected_results": "This should compile an image \n\n" },
> "7": {
> -"action": "devtool reset v4l2loopback-driver ",
> -"expected_results": "This cleans sysroot of the
> v4l2loopback-driver recipe, but it leaves the source tree intact. meaning
> it does not erase." +"action": "devtool reset
> kernel-module-hello-world ", +"expected_results":
> "This cleans sysroot of the kernel-module-hello-world recipe, but it leaves
> the source tree intact. meaning it does not erase." }
> },
> "summary": "sdkext_devtool_kernelmodule"
> @@ -291,4 +291,4 @@
> "summary": "sdkext_recipes_for_nodejs"
> }
> }
> -]
> \ No newline at end of file
> +]
> diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py
> b/meta/lib/oeqa/sdkext/cases/devtool.py index 5a02add764..fad98fbb36 100644
> --- a/meta/lib/oeqa/sdkext/cases/devtool.py
> +++ b/meta/lib/oeqa/sdkext/cases/devtool.py
> @@ -73,8 +73,8 @@ class DevtoolTest(OESDKExtTestCase):
> self._run('devtool reset %s' % recipe)
>
> def test_devtool_kernelmodule(self):
> -docfile = 'https://github.com/umlaeute/v4l2loopback.git'
> -recipe = 'v4l2loopback-driver'
> +docfile =
> 'https://github.com/masselstine/kernel-module-hello-world.git' +
> recipe = 'kernel-module-hello-world'
> self._run('devtool add %s %s' % (recipe, docfile) )
> try:
> self._run('devtool build %s' % recipe)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for Remove leftovers from the eglinfo removal
== Series Details == Series: Remove leftovers from the eglinfo removal Revision: 1 URL : https://patchwork.openembedded.org/series/19735/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * PatchRemove leftovers from the eglinfo removal Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Remove leftovers from the eglinfo removal
Signed-off-by: Adrian Bunk --- meta/conf/distro/include/distro_alias.inc | 2 -- meta/conf/distro/include/maintainers.inc | 3 --- 2 files changed, 5 deletions(-) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 7ab3b12cd5..e314642b9c 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -77,8 +77,6 @@ DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = "Ubuntu=docbook-xml Fedora=docbook- DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" -DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" -DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 566641a895..5f21f98b2b 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -165,9 +165,6 @@ RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang " RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin " RECIPE_MAINTAINER_pn-efivar = "Ross Burton " RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton " -RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-eglinfo-wayland = "Alexander Kanavin " RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia " RECIPE_MAINTAINER_pn-ell = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-enchant = "Anuj Mittal " -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH] diffutils: Add valgrind to support ptest
On Thu, 2019-09-05 at 11:38 -0400, Peiran Hong wrote:
> From: Peiran Hong
>
> The test "strip-trailing-cr" for diffutils package is skipped since
> it requires
> valgrind to run. This commit adds valgrind to the run-time dependency
> of
> the recipe for diffutils.
>
> Signed-off-by: Peiran Hong
> ---
> meta/recipes-extended/diffutils/diffutils_3.7.bb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb
> b/meta/recipes-extended/diffutils/diffutils_3.7.bb
> index 7daeee3513..2d763633b6 100644
> --- a/meta/recipes-extended/diffutils/diffutils_3.7.bb
> +++ b/meta/recipes-extended/diffutils/diffutils_3.7.bb
> @@ -17,7 +17,9 @@ acpaths = "-I ./m4"
>
> inherit ptest
>
> -RDEPENDS_${PN}-ptest += "make"
> +# Include valgrind since the test "strip-trailing-cr" requires it to
> run, although
> +# valgrind is a heavy package for diffutils
> +RDEPENDS_${PN}-ptest += "make valgrind"
This effectively means "bitbake diffutils" now requires valgrind to
build before it. I'm not sure its worth doing that for a single test?
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH] diffutils: Add valgrind to support ptest
On 9/5/19 11:38 AM, Peiran Hong wrote:
From: Peiran Hong
Drop this line please.
Was there some documentation that suggested it was required?
Otherwise looks fine so please send a v2.
../Randy
The test "strip-trailing-cr" for diffutils package is skipped since it requires
valgrind to run. This commit adds valgrind to the run-time dependency of
the recipe for diffutils.
Signed-off-by: Peiran Hong
---
meta/recipes-extended/diffutils/diffutils_3.7.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb
b/meta/recipes-extended/diffutils/diffutils_3.7.bb
index 7daeee3513..2d763633b6 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.7.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.7.bb
@@ -17,7 +17,9 @@ acpaths = "-I ./m4"
inherit ptest
-RDEPENDS_${PN}-ptest += "make"
+# Include valgrind since the test "strip-trailing-cr" requires it to run,
although
+# valgrind is a heavy package for diffutils
+RDEPENDS_${PN}-ptest += "make valgrind"
do_install_ptest() {
t=${D}${PTEST_PATH}
--
# Randy MacLeod
# Wind River Linux
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] core-image-sato: don't use 512MB in qemumips
qemumips doesn't appear to work well with 512MB of RAM and randomly hangs. As
the bump to 512MB was primarily motivated by the memory needs of virtualised GL
which doesn't work in qemumips currently, drop the memory back to 256MB for
qemumips.
Signed-off-by: Ross Burton
---
meta/recipes-sato/images/core-image-sato.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-sato/images/core-image-sato.bb
b/meta/recipes-sato/images/core-image-sato.bb
index 878e0eaa8d2..673106eb6d3 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -12,3 +12,4 @@ TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool
nativesdk-glib-2.0"
TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool
nativesdk-glib-2.0"
QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m
256", d)}'
+QB_MEM_qemumips = "-m 256"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] python3-git: update to 3.0.2
Signed-off-by: Oleksandr Kravchuk
---
.../python/{python3-git_3.0.0.bb => python3-git_3.0.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-git_3.0.0.bb =>
python3-git_3.0.2.bb} (88%)
diff --git a/meta/recipes-devtools/python/python3-git_3.0.0.bb
b/meta/recipes-devtools/python/python3-git_3.0.2.bb
similarity index 88%
rename from meta/recipes-devtools/python/python3-git_3.0.0.bb
rename to meta/recipes-devtools/python/python3-git_3.0.2.bb
index b6c837cdf3..9dd753db4f 100644
--- a/meta/recipes-devtools/python/python3-git_3.0.0.bb
+++ b/meta/recipes-devtools/python/python3-git_3.0.2.bb
@@ -12,8 +12,8 @@ PYPI_PACKAGE = "GitPython"
inherit pypi setuptools3
-SRC_URI[md5sum] = "9412ae9665fd29328f2afc6df887ae81"
-SRC_URI[sha256sum] =
"629867ebf609cef21bb9d849039e281e25963fb7d714a2f6bacc1ecce4800293"
+SRC_URI[md5sum] = "ccec14a5c9f18702406122983d80032c"
+SRC_URI[sha256sum] =
"d2f4945f8260f6981d724f5957bc076398ada55cb5d25aaee10108bcdc894100"
DEPENDS += " ${PYTHON_PN}-gitdb"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] python3-dbus: update to 1.2.10
Signed-off-by: Oleksandr Kravchuk
---
.../{python3-dbus_1.2.8.bb => python3-dbus_1.2.10.bb} | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/python/{python3-dbus_1.2.8.bb =>
python3-dbus_1.2.10.bb} (82%)
diff --git a/meta/recipes-devtools/python/python3-dbus_1.2.8.bb
b/meta/recipes-devtools/python/python3-dbus_1.2.10.bb
similarity index 82%
rename from meta/recipes-devtools/python/python3-dbus_1.2.8.bb
rename to meta/recipes-devtools/python/python3-dbus_1.2.10.bb
index 2fb1eae96c..71d24ee1a0 100644
--- a/meta/recipes-devtools/python/python3-dbus_1.2.8.bb
+++ b/meta/recipes-devtools/python/python3-dbus_1.2.10.bb
@@ -5,11 +5,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4"
DEPENDS = "expat dbus glib-2.0 virtual/libintl"
-SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
-"
+SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz";
+SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac"
+SRC_URI[sha256sum] =
"d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886"
-SRC_URI[md5sum] = "7379db774c10904f27e7e2743d90fb43"
-SRC_URI[sha256sum] =
"abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f"
S = "${WORKDIR}/dbus-python-${PV}"
inherit distutils3-base autotools pkgconfig
@@ -18,7 +17,6 @@ inherit distutils3-base autotools pkgconfig
# change to use PACKAGECONFIG when python3-sphinx is added to oe-core
EXTRA_OECONF += "--disable-documentation"
-
RDEPENDS_${PN} = "python3-io python3-logging python3-stringold
python3-threading python3-xml"
FILES_${PN}-dev += "${libdir}/pkgconfig"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] python3-pbr: update to 5.4.3
Signed-off-by: Oleksandr Kravchuk --- meta/recipes-devtools/python/python3-pbr_5.4.2.bb | 5 - meta/recipes-devtools/python/python3-pbr_5.4.3.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pbr_5.4.2.bb create mode 100644 meta/recipes-devtools/python/python3-pbr_5.4.3.bb diff --git a/meta/recipes-devtools/python/python3-pbr_5.4.2.bb b/meta/recipes-devtools/python/python3-pbr_5.4.2.bb deleted file mode 100644 index d59e744e61..00 --- a/meta/recipes-devtools/python/python3-pbr_5.4.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-pbr.inc - -SRC_URI[md5sum] = "ea90e1118a0132da752d45e68d10b2b8" -SRC_URI[sha256sum] = "9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" diff --git a/meta/recipes-devtools/python/python3-pbr_5.4.3.bb b/meta/recipes-devtools/python/python3-pbr_5.4.3.bb new file mode 100644 index 00..e7835e7a97 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pbr_5.4.3.bb @@ -0,0 +1,5 @@ +inherit setuptools3 +require python-pbr.inc + +SRC_URI[md5sum] = "477d2aa285ad97250a172b199f4060b7" +SRC_URI[sha256sum] = "2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] make-mod-scripts question
On Thu, Sep 5, 2019 at 10:43 AM Nicolas Dechesne wrote: > > hi, > > I was looking into a build issue today, related to signing an external > kernel module. My build failed when calling the kernel utility > sign-file, the error was that libcrypto.so was not found. > > Looking a bit more into that, I realized that make-mod-scripts will > built some kernel utilities, including scripts/sign-file which link > against libcrypto, however we 'copy' sign-file into > STAGING_KERNEL_BUILDDIR. Indeed, the build and redirected output dir will get the binaries, but not the libraries. Either static linking of a smarter install of the binaries would be a good idea. > > Later on, when my own recipe uses sign-file from > STAGING_KERNEL_BUILDDIR, it still requires the libcrypto.so file which > is in the make-mod-scripts per recipe sysroot. So basically my recipe > needs a binary from STAGING_KERNEL_BUILDDIR and a shared library from > another recipe sysroot. That looks wrong to me. > > My problem is fixed by adding a dependency on make-mod-scripts, it > still feels wrong to reply on another recipe sysroot , doesn't it go > against the whole idea of per recipe sysroot? Agreed. I'm wondering make-mod-scripts should both create a package and install into the staged kernel build dir. That way if you had a dependency on make-mod-scripts, you'd use both the binary and the library from the recipe sysroot, but we'd also get that shared copy for the needs in the shared kernel build directory. Obviously the shared kernel build artifacts are a special case, and I'm not even sure if what I'm thinking is even possible .. or is worse than the symptom you are describing. Just thinking out loud. Hopefully someone with more knowledge on the packaging/internal/sstate internals will see this and have more details. Bruce > > Here is the sign-file in the kernel shared workdir: > > $ find tmp-glibc -name sign-file > tmp-glibc/work-shared/open-q-212a-homehub/kernel-build-artifacts/scripts/sign-file > > And here we can see the dependency against make-mod-scripts sysroot: > $ ldd > tmp-glibc/work-shared/open-q-212a-homehub/kernel-build-artifacts/scripts/sign-file > linux-vdso.so.1 => (0x7fff8299d000) > libcrypto.so.1.1 => > /local/mnt2/workspace2/ndec/le.um.3.4.1/build-wlan/tmp-glibc/work/open_q_212a_homehub-oe-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/usr/lib/libcrypto.so.1.1 > (0x7fcb2247d000) > libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x7fcb220b3000) > libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x7fcb21eaf000) > libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 > (0x7fcb21c92000) > /lib64/ld-linux-x86-64.so.2 (0x7fcb2293c000) > > or like that: > $ strings > tmp-glibc/work-shared/open-q-212a-homehub/kernel-build-artifacts/scripts/sign-file > | grep tmp-glib > /local/mnt2/workspace2/ndec/le.um.3.4.1/build-wlan/tmp-glibc/work/open_q_212a_homehub-oe-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/usr/lib:/local/mnt2/workspace2/ndec/le.um.3.4.1/build-wlan/tmp-glibc/work/open_q_212a_homehub-oe-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/lib > > cheers > nico -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][PATCH] diffutils: Add valgrind to support ptest
From: Peiran Hong
The test "strip-trailing-cr" for diffutils package is skipped since it requires
valgrind to run. This commit adds valgrind to the run-time dependency of
the recipe for diffutils.
Signed-off-by: Peiran Hong
---
meta/recipes-extended/diffutils/diffutils_3.7.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb
b/meta/recipes-extended/diffutils/diffutils_3.7.bb
index 7daeee3513..2d763633b6 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.7.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.7.bb
@@ -17,7 +17,9 @@ acpaths = "-I ./m4"
inherit ptest
-RDEPENDS_${PN}-ptest += "make"
+# Include valgrind since the test "strip-trailing-cr" requires it to run,
although
+# valgrind is a heavy package for diffutils
+RDEPENDS_${PN}-ptest += "make valgrind"
do_install_ptest() {
t=${D}${PTEST_PATH}
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxcrypt: update to 4.4.8
LICENSE file checksum changed because few contributors were mentioned
(see @edbdbbc50beced9c723e7405334583c60a702796).
Signed-off-by: Oleksandr Kravchuk
---
...{libxcrypt-compat_4.4.6.bb => libxcrypt-compat_4.4.8.bb} | 0
.../libxcrypt/{libxcrypt_4.4.6.bb => libxcrypt_4.4.8.bb}| 6 ++
2 files changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.6.bb =>
libxcrypt-compat_4.4.8.bb} (100%)
rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.6.bb => libxcrypt_4.4.8.bb}
(86%)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb
b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb
rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb
b/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb
similarity index 86%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb
index 5270e58c2b..1787f6921e 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb
@@ -3,16 +3,14 @@ DESCRIPTION = "Forked code from glibc libary to extract only
crypto part."
HOMEPAGE = "https://github.com/besser82/libxcrypt";
SECTION = "libs"
LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM ?= "file://LICENSING;md5=be275bc7f91642efe7709a8ae7a1433b \
+LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
inherit autotools pkgconfig
-PV = "4.4.6"
-
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
-SRCREV = "398943774c5ff38baf1bc5ee088855fd8983bb05"
+SRCREV = "acd84997a5a8b2badd28b70a642abee11272fad2"
SRCBRANCH ?= "develop"
PROVIDES = "virtual/crypt"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libsecret: 0.19.0
Signed-off-by: Oleksandr Kravchuk
---
.../libsecret/{libsecret_0.18.8.bb => libsecret_0.19.0.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libsecret/{libsecret_0.18.8.bb =>
libsecret_0.19.0.bb} (81%)
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.8.bb
b/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.18.8.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
index 4af47fedeb..7da8e90084 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.8.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
@@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages,
libxslt-native xmlto-native"
-SRC_URI[archive.md5sum] = "fee403988442f497f3c1dfe7b128869c"
-SRC_URI[archive.sha256sum] =
"3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15"
+SRC_URI[archive.md5sum] = "483d293e73e7257c6d9fc18579b0e1ea"
+SRC_URI[archive.sha256sum] =
"8049b09a4e737911aa647e50aee3d06b5db7aa902608ca43a0dd10d83e1d67f9"
# http://errors.yoctoproject.org/Errors/Details/20228/
ARM_INSTRUCTION_SET_armv4 = "arm"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libogg: udpate to 1.3.4
Signed-off-by: Oleksandr Kravchuk
---
.../libogg/{libogg_1.3.3.bb => libogg_1.3.4.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-multimedia/libogg/{libogg_1.3.3.bb => libogg_1.3.4.bb}
(80%)
diff --git a/meta/recipes-multimedia/libogg/libogg_1.3.3.bb
b/meta/recipes-multimedia/libogg/libogg_1.3.4.bb
similarity index 80%
rename from meta/recipes-multimedia/libogg/libogg_1.3.3.bb
rename to meta/recipes-multimedia/libogg/libogg_1.3.4.bb
index 8d88f1f9f4..67521d8215 100644
--- a/meta/recipes-multimedia/libogg/libogg_1.3.3.bb
+++ b/meta/recipes-multimedia/libogg/libogg_1.3.4.bb
@@ -10,8 +10,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \
file://include/ogg/ogg.h;beginline=1;endline=11;md5=eda812856f13a3b1326eb8f020cc3b0b"
SRC_URI = "http://downloads.xiph.org/releases/ogg/${BP}.tar.xz";
-
-SRC_URI[md5sum] = "87ed742047f065046eb6c36745d871b8"
-SRC_URI[sha256sum] =
"4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08"
+SRC_URI[md5sum] = "eadef24aad6e3e8379ba0d14971fd64a"
+SRC_URI[sha256sum] =
"c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe"
inherit autotools pkgconfig
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libjpeg-turbo: update to 2.0.3
Signed-off-by: Oleksandr Kravchuk
---
.../jpeg/{libjpeg-turbo_2.0.2.bb => libjpeg-turbo_2.0.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.0.2.bb =>
libjpeg-turbo_2.0.3.bb} (95%)
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb
similarity index 95%
rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb
index e1df754b76..15bfa340b2 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb
@@ -13,9 +13,9 @@ DEPENDS_append_x86_class-target= " nasm-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://0001-libjpeg-turbo-fix-package_qa-error.patch \
"
+SRC_URI[md5sum] = "bd07fddf26f9def7bab02739eb655116"
+SRC_URI[sha256sum] =
"4246de500544d4ee408ee57048aa4aadc6f165fc17f141da87669f20ed3241b7"
-SRC_URI[md5sum] = "79f76fbfb0c6109631332762d10e16d2"
-SRC_URI[sha256sum] =
"acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/";
UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH 3/3] go: update to 1.11.13, minor updates
From: Armin Kuster
Source: golang.org
MR: 99376
Type: Security Fix
Disposition: Backport from golang.org
ChangeID: 41576ab4a0abdebbc44f1a35a83bf04e5f2fde06
Description:
https://golang.org/doc/devel/release.html
go1.11.11 (released 2019/06/11) includes a fix to the crypto/x509 package. See
the Go 1.11.11 milestone on our issue tracker for details.
go1.11.12 (released 2019/07/08) includes fixes to the compiler and the linker.
See the Go 1.11.12 milestone on our issue tracker for details.
go1.11.13 (released 2019/08/13) includes security fixes to the net/http and
net/url packages. See the Go 1.11.13 milestone on our issue tracker for details.
Includes CVE: CVE-2019-14809
Signed-off-by: Armin Kuster
---
meta/recipes-devtools/go/go-1.11.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/go/go-1.11.inc
b/meta/recipes-devtools/go/go-1.11.inc
index 401e71f..90d4037 100644
--- a/meta/recipes-devtools/go/go-1.11.inc
+++ b/meta/recipes-devtools/go/go-1.11.inc
@@ -1,7 +1,7 @@
require go-common.inc
GO_BASEVERSION = "1.11"
-GO_MINOR = ".10"
+GO_MINOR = ".13"
PV .= "${GO_MINOR}"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
@@ -19,5 +19,5 @@ SRC_URI += "\
"
SRC_URI_append_libc-musl = "
file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
-SRC_URI[main.md5sum] = "f2d2e44b9954b827daa8ad4d936a7a82"
-SRC_URI[main.sha256sum] =
"df27e96a9d1d362c46ecd975f1faa56b8c300f5c529074e9ea79bdd885493c1b"
+SRC_URI[main.md5sum] = "32e71746981695517387a2149eb541ef"
+SRC_URI[main.sha256sum] =
"5032095fd3f641cafcce164f551e5ae873785ce7b07ca7c143aecd18f7ba4076"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH 2/3] bind: upgrade 9.11.5 -> 9.11.5-P4
From: Adrian Bunk
Source: OE.org
MR: 99751, 99752, 99753
Type: Security Fix
Disposition: Backport from
https://git.openembedded.org/openembedded-core/commit/meta/recipes-connectivity/bind?h=warrior&id=5d286da0fbe1a7ded2f84eec990e49d221bdeab4
ChangeID: ce3719ea11bd03af3baeca51a22115badf84be01
Description:
Bugfix-only compared to 9.11.5, mostly CVE fixes.
COPYRIGHT checksum changed due to 2018 -> 2019.
Signed-off-by: Adrian Bunk
Signed-off-by: Richard Purdie
[Included cves:
CVE-2018-5744
CVE-2018-5745
CVE-2019-6465
]
Signed-off-by: Armin Kuster
---
.../recipes-connectivity/bind/{bind_9.11.5.bb => bind_9.11.5-P4.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-connectivity/bind/{bind_9.11.5.bb => bind_9.11.5-P4.bb}
(96%)
diff --git a/meta/recipes-connectivity/bind/bind_9.11.5.bb
b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
similarity index 96%
rename from meta/recipes-connectivity/bind/bind_9.11.5.bb
rename to meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
index 21e979f..432bad0 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.isc.org/sw/bind/";
SECTION = "console/network"
LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=6ba7c9fe0c888a943c79c93e6de744fb"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8f17f64e47e83b60cd920a1e4b54419e"
DEPENDS = "openssl libcap zlib"
@@ -22,8 +22,8 @@ SRC_URI =
"https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://0001-avoid-start-failure-with-bind-user.patch \
"
-SRC_URI[md5sum] = "17a0d02102117c9a221e857cf2cc8157"
-SRC_URI[sha256sum] =
"a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322"
+SRC_URI[md5sum] = "8ddab4b61fa4516fe404679c74e37960"
+SRC_URI[sha256sum] =
"7e8c08192bcbaeb6e9f2391a70e67583b027b90e8c4bc1605da6eb126edde434"
UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/";
UPSTREAM_CHECK_REGEX = "(?P9(\.\d+)+(-P\d+)*)/"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH 1/3] bind: update to latest LTS 9.11.5
From: Armin Kuster
Source: bind.org
MR: 99750
Type: Security Fix
Disposition: Backport from bind.org
ChangeID: bca5c436229f1b8c7e8eb3e45fc6188ffdb5e224
Description:
includes:
CVE-2018-5738
drop patch for CVE-2018-5740 now included in update
see: https://ftp.isc.org/isc/bind9/9.11.5/RELEASE-NOTES-bind-9.11.5.html
Add RECIPE_NO_UPDATE_REASON for lts
Signed-off-by: Armin Kuster
Signed-off-by: Richard Purdie
[Also includes CVE-2018-5740]
Signed-off-by: Armin Kuster
---
.../bind/bind/CVE-2018-5740.patch | 72 --
.../bind/{bind_9.11.4.bb => bind_9.11.5.bb}| 6 +-
2 files changed, 3 insertions(+), 75 deletions(-)
delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch
rename meta/recipes-connectivity/bind/{bind_9.11.4.bb => bind_9.11.5.bb} (96%)
diff --git a/meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch
b/meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch
deleted file mode 100644
index 7a2ba7e..000
--- a/meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Upstream-Status: Backport
[https://ftp.isc.org/isc/bind9/9.11.4-P1/patches/CVE-2018-5740]
-
-CVE: CVE-2018-5740
-
-Signed-off-by: Changqing Li
-
-diff --git a/CHANGES b/CHANGES
-index 750b600..3d8d655 100644
a/CHANGES
-+++ b/CHANGES
-@@ -1,3 +1,9 @@
-+ --- 9.11.4-P1 released ---
-+
-+4997. [security] named could crash during recursive processing
-+ of DNAME records when "deny-answer-aliases" was
-+ in use. (CVE-2018-5740) [GL #387]
-+
- --- 9.11.4 released ---
-
- --- 9.11.4rc2 released ---
-diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index 8f674a2..41d1385 100644
a/lib/dns/resolver.c
-+++ b/lib/dns/resolver.c
-@@ -6318,6 +6318,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t
*qname, dns_name_t *rname,
- unsigned int nlabels;
- dns_fixedname_t fixed;
- dns_name_t prefix;
-+ int order;
-
- REQUIRE(rdataset != NULL);
- REQUIRE(rdataset->type == dns_rdatatype_cname ||
-@@ -6340,17 +6341,25 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t
*qname, dns_name_t *rname,
- tname = &cname.cname;
- break;
- case dns_rdatatype_dname:
-+ if (dns_name_fullcompare(qname, rname, &order, &nlabels) !=
-+ dns_namereln_subdomain)
-+ {
-+ return (ISC_TRUE);
-+ }
- result = dns_rdata_tostruct(&rdata, &dname, NULL);
- RUNTIME_CHECK(result == ISC_R_SUCCESS);
- dns_name_init(&prefix, NULL);
- tname = dns_fixedname_initname(&fixed);
-- nlabels = dns_name_countlabels(qname) -
--dns_name_countlabels(rname);
-+ nlabels = dns_name_countlabels(rname);
- dns_name_split(qname, nlabels, &prefix, NULL);
- result = dns_name_concatenate(&prefix, &dname.dname, tname,
- NULL);
-- if (result == DNS_R_NAMETOOLONG)
-+ if (result == DNS_R_NAMETOOLONG) {
-+ if (chainingp != NULL) {
-+ *chainingp = ISC_TRUE;
-+ }
- return (ISC_TRUE);
-+ }
- RUNTIME_CHECK(result == ISC_R_SUCCESS);
- break;
- default:
-@@ -7071,7 +7080,9 @@ answer_response(fetchctx_t *fctx) {
- }
- if ((ardataset->type == dns_rdatatype_cname ||
-ardataset->type == dns_rdatatype_dname) &&
-- !is_answertarget_allowed(fctx, qname, aname, ardataset,
-+ type != ardataset->type &&
-+ type != dns_rdatatype_any &&
-+ !is_answertarget_allowed(fctx, qname, aname, ardataset,
- NULL))
- {
- return (DNS_R_SERVFAIL);
diff --git a/meta/recipes-connectivity/bind/bind_9.11.4.bb
b/meta/recipes-connectivity/bind/bind_9.11.5.bb
similarity index 96%
rename from meta/recipes-connectivity/bind/bind_9.11.4.bb
rename to meta/recipes-connectivity/bind/bind_9.11.5.bb
index cb4a21a..21e979f 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.5.bb
@@ -20,14 +20,14 @@ SRC_URI =
"https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \
file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
file://0001-avoid-start-failure-with-bind-user.patch \
- file://CVE-2018-5740.patch \
"
-SRC_URI[md5sum] = "9b4834d78f30cdb796ce437262272a36"
-SRC_URI[sha256sum] =
"595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617"
+SRC_URI[md5sum] = "17a0d02102117c9a221e857cf2cc8157"
+SRC_URI[sh
[OE-core] make-mod-scripts question
hi, I was looking into a build issue today, related to signing an external kernel module. My build failed when calling the kernel utility sign-file, the error was that libcrypto.so was not found. Looking a bit more into that, I realized that make-mod-scripts will built some kernel utilities, including scripts/sign-file which link against libcrypto, however we 'copy' sign-file into STAGING_KERNEL_BUILDDIR. Later on, when my own recipe uses sign-file from STAGING_KERNEL_BUILDDIR, it still requires the libcrypto.so file which is in the make-mod-scripts per recipe sysroot. So basically my recipe needs a binary from STAGING_KERNEL_BUILDDIR and a shared library from another recipe sysroot. That looks wrong to me. My problem is fixed by adding a dependency on make-mod-scripts, it still feels wrong to reply on another recipe sysroot , doesn't it go against the whole idea of per recipe sysroot? Here is the sign-file in the kernel shared workdir: $ find tmp-glibc -name sign-file tmp-glibc/work-shared/open-q-212a-homehub/kernel-build-artifacts/scripts/sign-file And here we can see the dependency against make-mod-scripts sysroot: $ ldd tmp-glibc/work-shared/open-q-212a-homehub/kernel-build-artifacts/scripts/sign-file linux-vdso.so.1 => (0x7fff8299d000) libcrypto.so.1.1 => /local/mnt2/workspace2/ndec/le.um.3.4.1/build-wlan/tmp-glibc/work/open_q_212a_homehub-oe-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/usr/lib/libcrypto.so.1.1 (0x7fcb2247d000) libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x7fcb220b3000) libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x7fcb21eaf000) libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x7fcb21c92000) /lib64/ld-linux-x86-64.so.2 (0x7fcb2293c000) or like that: $ strings tmp-glibc/work-shared/open-q-212a-homehub/kernel-build-artifacts/scripts/sign-file | grep tmp-glib /local/mnt2/workspace2/ndec/le.um.3.4.1/build-wlan/tmp-glibc/work/open_q_212a_homehub-oe-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/usr/lib:/local/mnt2/workspace2/ndec/le.um.3.4.1/build-wlan/tmp-glibc/work/open_q_212a_homehub-oe-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/lib cheers nico -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] archiver.bbclass: Do not archive srpm's if there are no package tasks
Do not attempt to archive recipes which have no packaging tasks (e.g.
inherits nopackages).
Signed-off-by: Nathan Rossi
---
meta/classes/archiver.bbclass | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index af9f010dfc..13b05bb5f2 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -78,6 +78,9 @@ python () {
bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn)
return
+def hasTask(task):
+return bool(d.getVarFlag(task, "task", False)) and not
bool(d.getVarFlag(task, "noexec", False))
+
ar_src = d.getVarFlag('ARCHIVER_MODE', 'src')
ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata')
ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe')
@@ -98,9 +101,6 @@ python () {
# There is a corner case with "gcc-source-${PV}" recipes, they don't
have
# the "do_configure" task, so we need to use "do_preconfigure"
-def hasTask(task):
-return bool(d.getVarFlag(task, "task", False)) and not
bool(d.getVarFlag(task, "noexec", False))
-
if hasTask("do_preconfigure"):
d.appendVarFlag('do_ar_configured', 'depends', '
%s:do_preconfigure' % pn)
elif hasTask("do_configure"):
@@ -118,7 +118,11 @@ python () {
# Output the SRPM package
if d.getVarFlag('ARCHIVER_MODE', 'srpm') == "1" and d.getVar('PACKAGES'):
-if "package_rpm" in d.getVar('PACKAGE_CLASSES'):
+if "package_rpm" not in d.getVar('PACKAGE_CLASSES'):
+bb.fatal("ARCHIVER_MODE[srpm] needs package_rpm in
PACKAGE_CLASSES")
+
+# Some recipes do not have any packaging tasks
+if hasTask("do_package_write_rpm"):
d.appendVarFlag('do_deploy_archives', 'depends', '
%s:do_package_write_rpm' % pn)
d.appendVarFlag('do_package_write_rpm', 'dirs', '
${ARCHIVER_RPMTOPDIR}')
d.appendVarFlag('do_package_write_rpm', 'sstate-inputdirs', '
${ARCHIVER_RPMTOPDIR}')
@@ -133,8 +137,6 @@ python () {
d.appendVarFlag('do_package_write_rpm', 'depends', '
%s:do_ar_patched' % pn)
elif ar_src == "configured":
d.appendVarFlag('do_package_write_rpm', 'depends', '
%s:do_ar_configured' % pn)
-else:
-bb.fatal("ARCHIVER_MODE[srpm] needs package_rpm in
PACKAGE_CLASSES")
}
# Take all the sources for a recipe and puts them in WORKDIR/archiver-work/.
---
2.23.0.rc1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for "Clean up remnants of glibc-ini..." and 2 more
== Series Details == Series: "Clean up remnants of glibc-ini..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/19723/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[1/3] Clean up remnants of glibc-initial Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] resulttool: Add reproducible log extraction
Adds an argument to the log subcommand to extract the raw logs from the
reproducible selftest.
To prevent ambiguity, the "--raw" argument has been renamed
"--raw-ptest", although the old "--raw" argument is kept around for
compatibility.
[YOCTO #13324]
Signed-off-by: Joshua Watt
---
scripts/lib/resulttool/log.py | 33 ++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/resulttool/log.py b/scripts/lib/resulttool/log.py
index 25c3396717e..2352c767d91 100644
--- a/scripts/lib/resulttool/log.py
+++ b/scripts/lib/resulttool/log.py
@@ -16,6 +16,16 @@ def show_ptest(result, ptest, logger):
print("ptest '%s' not found" % ptest)
return 1
+def show_reproducible(result, reproducible, logger):
+try:
+print(result['reproducible'][reproducible]['diffoscope.text'])
+return 0
+
+except KeyError:
+print("reproducible '%s' not found" % reproducible)
+return 1
+
+
def log(args, logger):
results = resultutils.load_resultsdata(args.source)
@@ -40,17 +50,28 @@ def log(args, logger):
with open(dest, 'w') as f:
f.write(ptest['log'])
-if args.raw:
+if args.raw_ptest:
if 'ptestresult.rawlogs' in r:
print(r['ptestresult.rawlogs']['log'])
else:
-print('Raw logs not found')
+print('Raw ptest logs not found')
+return 1
+
+if args.raw_reproducible:
+if 'reproducible.rawlogs' in r:
+print(r['reproducible.rawlogs']['log'])
+else:
+print('Raw reproducible logs not found')
return 1
for ptest in args.ptest:
if not show_ptest(r, ptest, logger):
return 1
+for reproducible in args.reproducible:
+if not show_reproducible(r, reproducible, logger):
+return 1
+
def register_commands(subparsers):
"""Register subcommands from this plugin"""
parser = subparsers.add_parser('log', help='show logs',
@@ -63,9 +84,15 @@ def register_commands(subparsers):
help='show logs for a ptest')
parser.add_argument('--dump-ptest', metavar='DIR',
help='Dump all ptest log files to the specified directory.')
+parser.add_argument('--reproducible', action='append', default=[],
+help='show logs for a reproducible test')
parser.add_argument('--prepend-run', action='store_true',
help='''Dump ptest results to a subdirectory named after the test
run when using --dump-ptest.
Required if more than one test run is present in the
result file''')
parser.add_argument('--raw', action='store_true',
-help='show raw logs')
+help='show raw (ptest) logs. Deprecated. Alias for "--raw-ptest"',
dest='raw_ptest')
+parser.add_argument('--raw-ptest', action='store_true',
+help='show raw ptest log')
+parser.add_argument('--raw-reproducible', action='store_true',
+help='show raw reproducible build logs')
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mdadm: fix do_package failed when changed local.conf but not cleaned
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org core-boun...@lists.openembedded.org> On Behalf Of
> changqing...@windriver.com
> Sent: den 5 september 2019 13:19
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] mdadm: fix do_package failed when changed
> local.conf but not cleaned
>
> From: Changqing Li
>
> reproduce steps:
> 1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
> 2. bitbake mdadm --success
> 3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
> 4. bitbake mdadm -- failed when do_package
>
> it is not proper to change source Makefile during do_compile by sed,
> change to add patch for it.
>
> [YOCTO: #13493]
>
> Signed-off-by: Changqing Li
> ---
> .../mdadm/files/0001-mdadm-support-usrmerge.patch | 46
> ++
> meta/recipes-extended/mdadm/mdadm_4.1.bb | 7 ++--
> 2 files changed, 50 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-
> support-usrmerge.patch
>
> diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-support-
> usrmerge.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-support-
> usrmerge.patch
> new file mode 100644
> index 000..f1aa119
> --- /dev/null
> +++ b/meta/recipes-extended/mdadm/files/0001-mdadm-support-
> usrmerge.patch
> @@ -0,0 +1,46 @@
> +From 2c7ccea05d7cf9dde48d735faa511d1b06c14878 Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Thu, 5 Sep 2019 18:03:11 +0800
> +Subject: [PATCH] mdadm: support usrmerge
> +
> +Upstream-Status: Inappropriate[oe-specific]
> +
> +Signed-off-by: Changqing Li
> +---
> + Makefile | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 4839001..466e960 100644
> +--- a/Makefile
> b/Makefile
> +@@ -88,7 +88,7 @@ MAP_PATH = $(MAP_DIR)/$(MAP_FILE)
> + MDMON_DIR = $(RUN_DIR)
> + # place for autoreplace cookies
> + FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
> +-SYSTEMD_DIR=/lib/systemd/system
> ++SYSTEMD_DIR=${SYSTEMD_UNITDIR}/system
> + LIB_DIR=/usr/libexec/mdadm
> +
> + COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] ||
> echo -DNO_COROSYNC)
> +@@ -120,7 +120,7 @@ LDLIBS=-ldl
> +
> + INSTALL = /usr/bin/install
> + DESTDIR =
> +-BINDIR = /sbin
> ++BINDIR = ${BASE_SBINDIR}
> + MANDIR = /usr/share/man
> + MAN4DIR = $(MANDIR)/man4
> + MAN5DIR = $(MANDIR)/man5
> +@@ -128,7 +128,7 @@ MAN8DIR = $(MANDIR)/man8
> +
> + UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
> + ifndef UDEVDIR
> +- UDEVDIR = /lib/udev
> ++ UDEVDIR = ${NONARCH_BASE_LIBDIR}/udev
> + endif
> +
> + ifeq (,$(findstring s,$(MAKEFLAGS)))
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-
> extended/mdadm/mdadm_4.1.bb
> index 74c94f6..efeb09d 100644
> --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
> +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
> @@ -22,6 +22,7 @@ SRC_URI =
> "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
> file://mdadm.init \
>
> file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
> file://include_sysmacros.patch \
> +
> ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-mdadm-support-usrmerge.patch','',d)}
> \
Since the patch will work regardless of whether usrmerge is enabled
or not, I think it is better to always apply it. The same goes for
the corresponding path for bootchart2.
> "
> SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
> SRC_URI[sha256sum] =
> "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
> @@ -41,13 +42,13 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
> CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
> CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
>
> -EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
> +EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"
> BASE_SBINDIR="${base_sbindir}" \
> +NONARCH_BASE_LIBDIR="${nonarch_base_libdir}" \
> +SYSTEMD_UNITDIR="${systemd_unitdir}"'
>
> DEBUG_OPTIMIZATION_append = " -Wno-error"
>
> do_compile() {
> - # Point to right sbindir
> - sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR =
> /lib;UDEVDIR = $nonarch_base_libdir;" -e
> "s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;"
> ${S}/Makefile
> oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
> }
>
> --
> 2.7.4
//Peter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] security_flags.inc: Add overrides for glibc-testsuite to match glibc
Ensure glibc-testsuite has the same flags as glibc.
Signed-off-by: Nathan Rossi
---
meta/conf/distro/include/security_flags.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/distro/include/security_flags.inc
b/meta/conf/distro/include/security_flags.inc
index 758bd89c3e..aaf04e9e59 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -36,6 +36,7 @@ SECURITY_CFLAGS_remove_powerpc = "${SECURITY_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-libgcc_powerpc = ""
SECURITY_CFLAGS_pn-glibc = ""
+SECURITY_CFLAGS_pn-glibc-testsuite = ""
SECURITY_CFLAGS_pn-gcc-runtime = ""
SECURITY_CFLAGS_pn-grub = ""
SECURITY_CFLAGS_pn-grub-efi = ""
@@ -59,6 +60,7 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
SECURITY_STACK_PROTECTOR_pn-gcc-runtime = ""
SECURITY_STACK_PROTECTOR_pn-glibc = ""
+SECURITY_STACK_PROTECTOR_pn-glibc-testsuite = ""
# All xorg module drivers need to be linked this way as well and are
# handled in recipes-graphics/xorg-driver/xorg-driver-common.inc
SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}"
---
2.23.0.rc1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] Clean up remnants of glibc-initial
Remove remnants of the glibc-initial recipe.
Signed-off-by: Nathan Rossi
---
meta/classes/staging.bbclass| 2 +-
meta/conf/distro/include/maintainers.inc| 1 -
meta/conf/distro/include/security_flags.inc | 2 --
meta/conf/distro/include/tcmode-default.inc | 4
meta/recipes-core/glibc/glibc-package.inc | 9 +
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index cdc342dbb9..55a9b52ed2 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -197,7 +197,7 @@ def staging_populate_sysroot_dir(targetsysroot,
nativesysroot, native, d):
for pkgarch in pkgarchs:
for manifest in
glob.glob(d.expand("${SSTATE_MANIFESTS}/manifest-%s-*.populate_sysroot" %
pkgarch)):
if manifest.endswith("-initial.populate_sysroot"):
-# skip glibc-initial and libgcc-initial due to file overlap
+# skip libgcc-initial due to file overlap
continue
if not native and (manifest.endswith("-native.populate_sysroot")
or "nativesdk-" in manifest):
continue
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index aaae55ac86..566641a895 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -217,7 +217,6 @@ RECIPE_MAINTAINER_pn-glew = "Anuj Mittal
"
RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal "
RECIPE_MAINTAINER_pn-glib-networking = "Anuj Mittal "
RECIPE_MAINTAINER_pn-glibc = "Khem Raj "
-RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj "
RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj "
RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj "
RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj "
diff --git a/meta/conf/distro/include/security_flags.inc
b/meta/conf/distro/include/security_flags.inc
index 620978a8ed..758bd89c3e 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -36,7 +36,6 @@ SECURITY_CFLAGS_remove_powerpc = "${SECURITY_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-libgcc_powerpc = ""
SECURITY_CFLAGS_pn-glibc = ""
-SECURITY_CFLAGS_pn-glibc-initial = ""
SECURITY_CFLAGS_pn-gcc-runtime = ""
SECURITY_CFLAGS_pn-grub = ""
SECURITY_CFLAGS_pn-grub-efi = ""
@@ -60,7 +59,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
SECURITY_STACK_PROTECTOR_pn-gcc-runtime = ""
SECURITY_STACK_PROTECTOR_pn-glibc = ""
-SECURITY_STACK_PROTECTOR_pn-glibc-initial = ""
# All xorg module drivers need to be linked this way as well and are
# handled in recipes-graphics/xorg-driver/xorg-driver-common.inc
SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}"
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 5c28386c4f..d8f434609b 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -14,8 +14,6 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ =
"gcc-crosssdk-${SDK_SYS}"
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
# Default libc config
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?=
"nativesdk-glibc-initial"
PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
GCCVERSION ?= "9.%"
@@ -62,8 +60,6 @@ PREFERRED_VERSION_glibc-locale ?=
"${GLIBCVERSION}"
PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}"
PREFERRED_VERSION_glibc-scripts?= "${GLIBCVERSION}"
PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-initial?= "${GLIBCVERSION}"
-PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}"
PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}"
PREFERRED_VERSION_qemu ?= "${QEMUVERSION}"
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index f796876a87..9b1e7b7903 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -88,14 +88,7 @@ do_install_append () {
rm -f ${D}${sysconfdir}/ld.so.conf
rm -f ${D}${base_sbindir}/ldconfig
# This directory will be empty now so remove it too.
- # But check whether it exists first, since it won't for
glibc-initial.
- if [ -d ${D}${sysconfdir} ]; then
- rmdir ${D}${sysconfdir}
- fi
- fi
-
- if echo ${PN}|grep -q "glibc-initial"; then
- return
+ rmdir ${D}${sysconfdir}
fi
install -d ${D}${sysconfdir}/init.d
---
2.23.0.rc1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] oe-selftest: Implement console 'keepalive' output
Similar to bitbake, implement a 'keepalive' output to the console to
ensure CI systems do not kill the process. The default timeout for
bitbake is 5000s.
Signed-off-by: Nathan Rossi
---
scripts/lib/scriptutils.py | 43 +--
scripts/oe-selftest| 2 +-
2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index e7e7021c24..c573dc7f67 100644
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -16,12 +16,51 @@ import string
import subprocess
import sys
import tempfile
+import threading
import importlib
from importlib import machinery
-def logger_create(name, stream=None):
+class KeepAliveStreamHandler(logging.StreamHandler):
+def __init__(self, keepalive=True, **kwargs):
+super().__init__(**kwargs)
+if keepalive is True:
+keepalive = 5000 # default timeout
+self._timeout = threading.Condition()
+self._stop = False
+
+# background thread waits on condition, if the condition does not
+# happen emit a keep alive message
+def thread():
+while not self._stop:
+with self._timeout:
+if not self._timeout.wait(keepalive):
+self.emit(logging.LogRecord("keepalive", logging.INFO,
+None, None, "Keepalive message", None, None))
+
+self._thread = threading.Thread(target = thread, daemon = True)
+self._thread.start()
+
+def close(self):
+# mark the thread to stop and notify it
+self._stop = True
+with self._timeout:
+self._timeout.notify()
+# wait for it to join
+self._thread.join()
+super().close()
+
+def emit(self, record):
+super().emit(record)
+# trigger timer reset
+with self._timeout:
+self._timeout.notify()
+
+def logger_create(name, stream=None, keepalive=None):
logger = logging.getLogger(name)
-loggerhandler = logging.StreamHandler(stream=stream)
+if keepalive is not None:
+loggerhandler = KeepAliveStreamHandler(stream=stream,
keepalive=keepalive)
+else:
+loggerhandler = logging.StreamHandler(stream=stream)
loggerhandler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
logger.addHandler(loggerhandler)
logger.setLevel(logging.INFO)
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 57662b2f75..18ac0f5869 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -33,7 +33,7 @@ scriptpath.add_bitbake_lib_path()
from oeqa.utils import load_test_components
from oeqa.core.exception import OEQAPreRun
-logger = scriptutils.logger_create('oe-selftest', stream=sys.stdout)
+logger = scriptutils.logger_create('oe-selftest', stream=sys.stdout,
keepalive=True)
def main():
description = "Script that runs unit tests against bitbake and other Yocto
related tools. The goal is to validate tools functionality and metadata
integrity. Refer to https://wiki.yoctoproject.org/wiki/Oe-selftest for more
information."
---
2.23.0.rc1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for mdadm: fix do_package failed when changed local.conf but not cleaned
== Series Details == Series: mdadm: fix do_package failed when changed local.conf but not cleaned Revision: 1 URL : https://patchwork.openembedded.org/series/19720/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patchmdadm: fix do_package failed when changed local.conf but not cleaned Issue Yocto Project bugzilla tag is not correctly formatted [test_bugzilla_entry_format] Suggested fixSpecify bugzilla ID in commit description with format: "[YOCTO #]" If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for bootchart2: switch to add patch from change source in do_install
== Series Details == Series: bootchart2: switch to add patch from change source in do_install Revision: 1 URL : https://patchwork.openembedded.org/series/19721/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patchbootchart2: switch to add patch from change source in do_install Issue Yocto Project bugzilla tag is not correctly formatted [test_bugzilla_entry_format] Suggested fixSpecify bugzilla ID in commit description with format: "[YOCTO #]" If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bootchart2: switch to add patch from change source in do_install
From: Changqing Li
it is not proper change source in do_install, it will make
source not updated even local.conf have change the DISTRO_FEATURES
[YOCTO: #13493]
Signed-off-by: Changqing Li
---
.../0001-bootchart2-support-usrmerge.patch | 37 ++
.../bootchart2/bootchart2_0.14.8.bb| 7 ++--
2 files changed, 40 insertions(+), 4 deletions(-)
create mode 100644
meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
diff --git
a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
new file mode 100644
index 000..8ee6723
--- /dev/null
+++
b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
@@ -0,0 +1,37 @@
+From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 5 Sep 2019 18:37:31 +0800
+Subject: [PATCH] bootchart2: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1cc2974..f988904 100644
+--- a/Makefile
b/Makefile
+@@ -36,7 +36,7 @@ endif
+ PY_SITEDIR ?= $(PY_LIBDIR)/site-packages
+ LIBC_A_PATH = /usr$(LIBDIR)
+ # Always lib, even on systems that otherwise use lib64
+-SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system
++SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system
+ COLLECTOR = \
+ collector/collector.o \
+ collector/output.o \
+@@ -99,7 +99,7 @@ install-chroot:
+ install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs
+
+ install-collector: all install-chroot
+- install -m 755 -D bootchartd
$(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
++ install -m 755 -D bootchartd
$(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
+ install -m 644 -D bootchartd.conf
$(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf
+ install -m 755 -D bootchart-collector
$(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector
+
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index 465cdd9..60682eb 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
@@ -93,6 +93,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)"
SRC_URI = "git://github.com/xrmx/bootchart.git \
file://bootchartd_stop.sh \
file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
+
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-bootchart2-support-usrmerge.patch','',d)}
\
"
S = "${WORKDIR}/git"
@@ -114,6 +115,8 @@ UPDATERCPN = "bootchartd-stop-initscript"
INITSCRIPT_NAME = "bootchartd_stop.sh"
INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
+EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"'
+
do_compile_prepend () {
export PY_LIBDIR="${libdir}/${PYTHON_DIR}"
export BINDIR="${bindir}"
@@ -121,10 +124,6 @@ do_compile_prepend () {
}
do_install () {
-if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
-sed -i -e "s;install -m 755 -D bootchartd
\$(DESTDIR)\$(EARLY_PREFIX)/sbin/;install -m 755 -D bootchartd
\$(DESTDIR)/usr/sbin/;g" ${B}/Makefile
-fi
-sed -i -e "s;SYSTEMD_UNIT_DIR =; SYSTEMD_UNIT_DIR ?=;g" ${B}/Makefile
install -d ${D}${sysconfdir} # needed for -native
export PY_LIBDIR="${libdir}/${PYTHON_DIR}"
export BINDIR="${bindir}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mdadm: fix do_package failed when changed local.conf but not cleaned
From: Changqing Li
reproduce steps:
1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
2. bitbake mdadm --success
3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
4. bitbake mdadm -- failed when do_package
it is not proper to change source Makefile during do_compile by sed,
change to add patch for it.
[YOCTO: #13493]
Signed-off-by: Changqing Li
---
.../mdadm/files/0001-mdadm-support-usrmerge.patch | 46 ++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 7 ++--
2 files changed, 50 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
diff --git
a/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
b/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
new file mode 100644
index 000..f1aa119
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
@@ -0,0 +1,46 @@
+From 2c7ccea05d7cf9dde48d735faa511d1b06c14878 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 5 Sep 2019 18:03:11 +0800
+Subject: [PATCH] mdadm: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4839001..466e960 100644
+--- a/Makefile
b/Makefile
+@@ -88,7 +88,7 @@ MAP_PATH = $(MAP_DIR)/$(MAP_FILE)
+ MDMON_DIR = $(RUN_DIR)
+ # place for autoreplace cookies
+ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
+-SYSTEMD_DIR=/lib/systemd/system
++SYSTEMD_DIR=${SYSTEMD_UNITDIR}/system
+ LIB_DIR=/usr/libexec/mdadm
+
+ COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo
-DNO_COROSYNC)
+@@ -120,7 +120,7 @@ LDLIBS=-ldl
+
+ INSTALL = /usr/bin/install
+ DESTDIR =
+-BINDIR = /sbin
++BINDIR = ${BASE_SBINDIR}
+ MANDIR = /usr/share/man
+ MAN4DIR = $(MANDIR)/man4
+ MAN5DIR = $(MANDIR)/man5
+@@ -128,7 +128,7 @@ MAN8DIR = $(MANDIR)/man8
+
+ UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ ifndef UDEVDIR
+- UDEVDIR = /lib/udev
++ UDEVDIR = ${NONARCH_BASE_LIBDIR}/udev
+ endif
+
+ ifeq (,$(findstring s,$(MAKEFLAGS)))
+--
+2.7.4
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 74c94f6..efeb09d 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -22,6 +22,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm.init \
file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
file://include_sysmacros.patch \
+
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-mdadm-support-usrmerge.patch','',d)}
\
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
@@ -41,13 +42,13 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
-EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
+EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"
BASE_SBINDIR="${base_sbindir}" \
+NONARCH_BASE_LIBDIR="${nonarch_base_libdir}" \
+SYSTEMD_UNITDIR="${systemd_unitdir}"'
DEBUG_OPTIMIZATION_append = " -Wno-error"
do_compile() {
- # Point to right sbindir
- sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR =
/lib;UDEVDIR = $nonarch_base_libdir;" -e
"s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;"
${S}/Makefile
oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] iptables: add systemd helper unit to load/restore rules
From: Jack Mitchell
There is currently no way to automatically load iptables rules in OE.
Add a systemd unit file to automatically load rules on network
connection. This is cribbed from the way ArchLinux handles iptables with
some minor modifications for OE.
New rules can be generated directly on the target using:
# iptables-save -f /etc/iptables/iptables.rules
Good documentation for writing rules offline is lacking, but the basics
are explained here:
https://unix.stackexchange.com/q/400163/49405
Signed-off-by: Jack Mitchell
Signed-off-by: Diego Rondini
---
Changes in v2: fixed missing line about rules generation on target.
Original patch has been posted 3 years ago, but never got approved. I'm posting
a rebased patch, including the changes requested in the comments.
https://patchwork.openembedded.org/patch/131285/
meta/recipes-extended/iptables/iptables/iptables.rules | 0
.../recipes-extended/iptables/iptables/iptables.service | 13 +
meta/recipes-extended/iptables/iptables_1.8.3.bb| 17 -
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/iptables/iptables/iptables.rules
create mode 100644 meta/recipes-extended/iptables/iptables/iptables.service
diff --git a/meta/recipes-extended/iptables/iptables/iptables.rules
b/meta/recipes-extended/iptables/iptables/iptables.rules
new file mode 100644
index 000..e69de29
diff --git a/meta/recipes-extended/iptables/iptables/iptables.service
b/meta/recipes-extended/iptables/iptables/iptables.service
new file mode 100644
index 000..041316e
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/iptables.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Packet Filtering Framework
+Before=network-pre.target
+Wants=network-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules
+ExecReload=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb
b/meta/recipes-extended/iptables/iptables_1.8.3.bb
index 6ac3fc6..ff9fcb1 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.3.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.3.bb
@@ -10,12 +10,14 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2
\
file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \
+ file://iptables.service \
+ file://iptables.rules \
"
SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513"
SRC_URI[sha256sum] =
"a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80"
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR}"
@@ -56,6 +58,19 @@ INSANE_SKIP_${PN}-module-xt-ct = "dev-so"
ALLOW_EMPTY_${PN}-modules = "1"
+do_install_append() {
+
+install -d ${D}${sysconfdir}/iptables
+install -m 0644 ${WORKDIR}/iptables.rules ${D}${sysconfdir}/iptables
+
+install -d ${D}${systemd_system_unitdir}
+install -m 0644 ${WORKDIR}/iptables.service
${D}${systemd_system_unitdir}
+
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}${systemd_system_unitdir}/iptables.service
+}
+
+SYSTEMD_SERVICE_${PN} = "iptables.service"
+
RDEPENDS_${PN} = "${PN}-module-xt-standard"
RRECOMMENDS_${PN} = " \
${PN}-modules \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/6] xz: Remove GPLv3 license checksum
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org core-boun...@lists.openembedded.org> On Behalf Of Adrian Bunk
> Sent: den 4 september 2019 21:54
> To: Richard Purdie
> Cc: Patches and discussions about the oe-core layer c...@lists.openembedded.org>
> Subject: Re: [OE-core] [PATCH 6/6] xz: Remove GPLv3 license checksum
>
> On Wed, Sep 04, 2019 at 07:50:35PM +0100, Richard Purdie wrote:
> > On Wed, 2019-09-04 at 08:07 -0400, Mark Hatle wrote:
> > > On 9/3/19 1:59 PM, Wes Lindauer wrote:
> > > > Mark,
> > > >
> > > > In reference to "It typically does NOT include the license of
> > > > things used to
> > > > build the software (such as makefiles, autoconf fragments, etc)".
> > > > Since the only file that is licensed under GPLv3 is a M4 macro,
> > > > does that mean
> > > > the current patch is still valid? Shouldn't the GPLv3 license be
> > > > removed from
> > > > this recipe?
> > >
> > > Unless the M4 file is generating/injecting code into the build(very
> > > few I've
> > > seen do this), then I would say it's not under GPLv3 at all. (And
> I
> > > wouldn't
> > > have included GPLv3 in the LICENSE statement.)
> > >
> > > But we need more consensus then just me saying so.
> > >
> > > This may be a good question for the OE-TSC to ensure that we have
> > > clarification
> > > on this issue, and it's not just me saying I think one way or
> > > another.
> >
> > Not sure it needs to go to the TSC, we just need a patch which
> clearly
> > says why the LICENSE statement is incorrect. I don't think the
> original
> > patch in the series was clear about why GPLv3 didn't apply but if the
> > commit message is improved, its probably fine.
>
> I am getting more and more confused about both the patch and the
> semantics of LICENSE.
>
> The status quo in the recipe is:
>
> <-- snip ->
>
> # The source includes bits of PD, GPLv2, GPLv3, LGPLv2.1+, but the only
> file
> # which is GPLv3 is an m4 macro which isn't shipped in any of our
> packages,
> # and the LGPL bits are under lib/, which appears to be used for
> libgnu, which
> # appears to be used for DOS builds. So we're left with GPLv2+ and PD.
> LICENSE = "GPLv2+ & GPL-3.0-with-autoconf-exception & LGPLv2.1+ & PD"
> LICENSE_${PN} = "GPLv2+"
> LICENSE_${PN}-dev = "GPLv2+"
> LICENSE_${PN}-staticdev = "GPLv2+"
> LICENSE_${PN}-doc = "GPLv2+"
> LICENSE_${PN}-dbg = "GPLv2+"
> LICENSE_${PN}-locale = "GPLv2+"
> LICENSE_liblzma = "PD"
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \
>
> file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>
> file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
>
> file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
>
> file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \
> "
>
> <-- snip -->
>
> My confusion about the patch is that it removes COPYING.GPLv3 from
> LIC_FILES_CHKSUM but keeps GPL-3.0-with-autoconf-exception in LICENSE.
>
> My confusion about the semantics of LICENSE is that I fail to find a
> clear statement in the documentation that the legal meaning of LICENSE
> in OE is what Mark claims it would be. Is this just Marks personal
> opinion on what should be done, or is this undocumented tribal
> knowledge, or is the exact semantics of LICENSE documented
> somewhere in a language that lawyers understand?
>
> My guess for the latter would be "undocumented tribal knowledge",
> and clarification is required what is actually correct or incorrect
> here. And I think this is also what Mark was asking for.
>
> > Cheers,
> >
> > Richard
>
> cu
> Adrian
Another thing that complicates this further is related to gathering and
distributing the license information. E.g., if one uses COPY_LIC_DIR = "1"
to automatically include all the license information for all packages
installed in the image, this will include everything listed in
LIC_FILES_CHKSUM regardless of which packages were installed. I.e., even
if only liblzma (which is PD) is installed from xz, all of the GPL
license texts will be installed in /usr/share/common-licenses/xz...
//Peter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] iptables: add systemd helper unit to load/restore rules
From: Jack Mitchell
There is currently no way to automatically load iptables rules in OE.
Add a systemd unit file to automatically load rules on network
connection. This is cribbed from the way ArchLinux handles iptables with
some minor modifications for OE.
New rules can be generated directly on the target using:
Good documentation for writing rules offline is lacking, but the basics
are explained here:
https://unix.stackexchange.com/q/400163/49405
Signed-off-by: Jack Mitchell
Signed-off-by: Diego Rondini
---
Original patch has been posted 3 years ago, but never got approved. I'm posting
a rebased patch, including the changes requested in the comments.
https://patchwork.openembedded.org/patch/131285/
meta/recipes-extended/iptables/iptables/iptables.rules | 0
.../recipes-extended/iptables/iptables/iptables.service | 13 +
meta/recipes-extended/iptables/iptables_1.8.3.bb| 17 -
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/iptables/iptables/iptables.rules
create mode 100644 meta/recipes-extended/iptables/iptables/iptables.service
diff --git a/meta/recipes-extended/iptables/iptables/iptables.rules
b/meta/recipes-extended/iptables/iptables/iptables.rules
new file mode 100644
index 000..e69de29
diff --git a/meta/recipes-extended/iptables/iptables/iptables.service
b/meta/recipes-extended/iptables/iptables/iptables.service
new file mode 100644
index 000..041316e
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/iptables.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Packet Filtering Framework
+Before=network-pre.target
+Wants=network-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules
+ExecReload=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb
b/meta/recipes-extended/iptables/iptables_1.8.3.bb
index 6ac3fc6..ff9fcb1 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.3.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.3.bb
@@ -10,12 +10,14 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2
\
file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \
+ file://iptables.service \
+ file://iptables.rules \
"
SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513"
SRC_URI[sha256sum] =
"a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80"
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR}"
@@ -56,6 +58,19 @@ INSANE_SKIP_${PN}-module-xt-ct = "dev-so"
ALLOW_EMPTY_${PN}-modules = "1"
+do_install_append() {
+
+install -d ${D}${sysconfdir}/iptables
+install -m 0644 ${WORKDIR}/iptables.rules ${D}${sysconfdir}/iptables
+
+install -d ${D}${systemd_system_unitdir}
+install -m 0644 ${WORKDIR}/iptables.service
${D}${systemd_system_unitdir}
+
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}${systemd_system_unitdir}/iptables.service
+}
+
+SYSTEMD_SERVICE_${PN} = "iptables.service"
+
RDEPENDS_${PN} = "${PN}-module-xt-standard"
RRECOMMENDS_${PN} = " \
${PN}-modules \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libjpeg-turbo: upgrade 2.0.2 -> 2.0.3
Bug fix release. Release notes:
https://github.com/libjpeg-turbo/libjpeg-turbo/releases
Signed-off-by: Anuj Mittal
---
.../jpeg/{libjpeg-turbo_2.0.2.bb => libjpeg-turbo_2.0.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.0.2.bb =>
libjpeg-turbo_2.0.3.bb} (95%)
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb
similarity index 95%
rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb
index e1df754b76..1cf854de62 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb
@@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://0001-libjpeg-turbo-fix-package_qa-error.patch \
"
-SRC_URI[md5sum] = "79f76fbfb0c6109631332762d10e16d2"
-SRC_URI[sha256sum] =
"acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed"
+SRC_URI[md5sum] = "bd07fddf26f9def7bab02739eb655116"
+SRC_URI[sha256sum] =
"4246de500544d4ee408ee57048aa4aadc6f165fc17f141da87669f20ed3241b7"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/";
UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/"
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-dbus:upgrade 1.2.8 -> 1.2.10
Signed-off-by: Zang Ruochen
---
.../python/{python3-dbus_1.2.8.bb => python3-dbus_1.2.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-dbus_1.2.8.bb =>
python3-dbus_1.2.10.bb} (85%)
diff --git a/meta/recipes-devtools/python/python3-dbus_1.2.8.bb
b/meta/recipes-devtools/python/python3-dbus_1.2.10.bb
similarity index 85%
rename from meta/recipes-devtools/python/python3-dbus_1.2.8.bb
rename to meta/recipes-devtools/python/python3-dbus_1.2.10.bb
index 2fb1eae..8892d0f 100644
--- a/meta/recipes-devtools/python/python3-dbus_1.2.8.bb
+++ b/meta/recipes-devtools/python/python3-dbus_1.2.10.bb
@@ -8,8 +8,8 @@ DEPENDS = "expat dbus glib-2.0 virtual/libintl"
SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
"
-SRC_URI[md5sum] = "7379db774c10904f27e7e2743d90fb43"
-SRC_URI[sha256sum] =
"abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f"
+SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac"
+SRC_URI[sha256sum] =
"d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886"
S = "${WORKDIR}/dbus-python-${PV}"
inherit distutils3-base autotools pkgconfig
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meson:upgrade 0.51.1 -> 0.51.2
-meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
Removed since this is included in 0.51.2.
Signed-off-by: Zang Ruochen
---
meta/recipes-devtools/meson/meson.inc | 5 +-
...-return-statements-that-are-seen-with-Wer.patch | 100 -
.../meson/{meson_0.51.1.bb => meson_0.51.2.bb} | 0
3 files changed, 2 insertions(+), 103 deletions(-)
delete mode 100644
meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
rename meta/recipes-devtools/meson/{meson_0.51.1.bb => meson_0.51.2.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc
b/meta/recipes-devtools/meson/meson.inc
index 14e5f8a..6de109d 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,10 +16,9 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
file://vala-cross-compile.patch \
-
file://0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch \
"
-SRC_URI[sha256sum] =
"f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82"
-SRC_URI[md5sum] = "48787e391ec5c052799a3dd491f73909"
+SRC_URI[sha256sum] =
"23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
+SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git
a/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
b/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
deleted file mode 100644
index 16c6d90..000
---
a/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 15f44be1c7f71cb0a8c6863917acbbc301c621fe Mon Sep 17 00:00:00 2001
-From: Martin Liska
-Date: Mon, 15 Jul 2019 10:06:17 +0200
-Subject: [PATCH] Fix missing return statements that are seen with
- -Werror=return-type.
-
-Error example:
-
-Code:
-
-#include
-int main () {
-/* If it's not defined as a macro, try to use as a symbol */
-#ifndef LC_MESSAGES
-LC_MESSAGES;
-#endif
-}
-Compiler stdout:
-
-Compiler stderr:
- In file included from /usr/include/locale.h:25,
- from /tmp/tmpep_i4iwg/testfile.c:2:
-/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE
-requires compiling with optimization (-O) [-Wcpp]
- 382 | # warning _FORTIFY_SOURCE requires compiling with optimization
-(-O)
- |^~~
-/tmp/tmpep_i4iwg/testfile.c: In function 'main':
-/tmp/tmpep_i4iwg/testfile.c:8:9: error: control reaches end of non-void
-function [-Werror=return-type]
-8 | }
- | ^
-cc1: some warnings being treated as errors
-
-Upstream-Status: Backport
-Signed-off-by: Martin Jansa
- mesonbuild/compilers/c.py | 1 +
- mesonbuild/compilers/clike.py | 5 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
-index 3b58a076..9ef92077 100644
a/mesonbuild/compilers/c.py
-+++ b/mesonbuild/compilers/c.py
-@@ -70,6 +70,7 @@ class CCompiler(CLikeCompiler, Compiler):
- #ifndef {symbol}
- {symbol};
- #endif
-+return 0;
- }}'''
- return self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)
-diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/clike.py
-index 83f67591..f9cbeabd 100644
a/mesonbuild/compilers/clike.py
-+++ b/mesonbuild/compilers/clike.py
-@@ -375,6 +375,7 @@ class CLikeCompiler:
- #ifndef {symbol}
- {symbol};
- #endif
-+return 0;
- }}'''
- return self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)
-@@ -554,6 +555,7 @@ class CLikeCompiler:
- {prefix}
- int main(int argc, char **argv) {{
- {type} something;
-+return 0;
- }}'''
- if not self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)[0]:
-@@ -589,6 +591,7 @@ class CLikeCompiler:
- {prefix}
- int main(int argc, char **argv) {{
- {type} something;
-+return 0;
- }}'''
- if not self.compiles(t.format(**fargs), env, extra_args=extra_args,
- dependencies=dependencies)[0]:
-@@ -667,6 +670,7 @@ class CLikeCompiler:
- #include
- int main(int argc, char *argv[]) {{
- printf ("{fmt}", {cast} {f}());
