Re: [OE-core] [PATCH 1/1] oeqa/runtime/cases/systemd.py: avoid timeout problem
ping
Is there some problem with this patch?
Recently when I'm doing testimage test for systemd upgrade, the
'systemctl list-unit-files' command in this test case revealed a
'segment fault' error on musl qemuarm.
So I'd suggest to keep 'systemctl list-unit-files' command and use
'busctl' as a fallback in case of timeout.
Best Regards,
Chen Qi
On 07/04/2018 06:05 PM, ChenQi wrote:
ping
On 06/26/2018 09:48 AM, ChenQi wrote:
On 06/25/2018 09:40 PM, Burton, Ross wrote:
The busctl invocation will only rarely be called so is very prone to
bitrot, maybe it should just always use busctl?
Personally I think that there should be a way for VM time to be
independent of host time to avoid this sort of problem...
Ross
Hi Ross,
I now realize that I didn't include enough information in the commit
message.
In fact, for qemuarm, this problem always appeared.
Compared to other qemu bsps (e.g. qemux86-64), qemuarm is running
much slower.
I've now updated the commit the message to include this qemuarm info,
and also updated the remote branch.
git://git.pokylinux.org/poky-contrib ChenQi/systemd-bus-timeout
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-bus-timeout
If you think we should still use `busctl' directly, I can send out a
new patch. Either way is OK to me.
Best Regards,
Chen Qi
On 25 June 2018 at 10:33, Chen Qi wrote:
I've encountered the following error when doing testimage.
RESULTS - systemd.SystemdBasicTests.test_systemd_list - Testcase
551: FAILED
After investigation, I found that it's not functionality issue. It's
just that the qemu was not running fast enough. And it resulted
'time out'
problem when using `systemctl list-unit-files'.
The correctness could be verified by using 'busctl' directly.
e.g.
busctl --timeout=240 call org.freedesktop.systemd1 \
/org/freedesktop/systemd1 org.freedesktop.systemd1.Manager \
ListUnitFilesByPatterns asas 0 0
Checking the source codes, I can see that the timeout is 25s. I don't
think we should patch systemd's source codes just for such a simple
runtime test case.
So instead, I change the test case to use 'busctl' directly if
'systemctl list-unit-files' gets a timeout error.
Signed-off-by: Chen Qi
---
meta/lib/oeqa/runtime/cases/systemd.py | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/runtime/cases/systemd.py
b/meta/lib/oeqa/runtime/cases/systemd.py
index db69384..b4f1025 100644
--- a/meta/lib/oeqa/runtime/cases/systemd.py
+++ b/meta/lib/oeqa/runtime/cases/systemd.py
@@ -81,7 +81,19 @@ class SystemdBasicTests(SystemdTest):
@OETestID(551)
@OETestDepends(['systemd.SystemdBasicTests.test_systemd_basic'])
def test_systemd_list(self):
-self.systemctl('list-unit-files')
+command = 'systemctl list-unit-files'
+status, output = self.target.run(command)
+message = '\n'.join([command, output])
+match = re.search('Connection timed out', output)
+if match:
+# it's possible that qemu is running slow
+# use busctl to check the results with timeout set to
240s
+command = 'busctl --timeout=240 call
org.freedesktop.systemd1 /org/freedesktop/systemd1
org.freedesktop.systemd1.Manager ListUnitFilesByPatterns asas 0 0'
+status, output = self.target.run(command)
+message = '\n'.join([command, output])
+self.assertEqual(status, 0, message)
+else:
+self.assertEqual(status, 0, message)
@OETestID(550)
@OETestDepends(['systemd.SystemdBasicTests.test_systemd_basic'])
--
1.9.1
--
___
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
[OE-core] [PATCH] oeqa/parselogs: remove references to BSPs that no longer exist
These platform specifc BSPs were removed from meta-intel and superseded by
intel-core* BSPs.
Signed-off-by: Anuj Mittal
---
meta/lib/oeqa/runtime/cases/parselogs.py | 14 --
1 file changed, 14 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py
b/meta/lib/oeqa/runtime/cases/parselogs.py
index ba1bb71f22..f0bcd168c6 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -123,15 +123,6 @@ ignore_errors = {
'dmi: Firmware registration failed.',
'irq: type mismatch, failed to map hwirq-27 for /intc',
] + common_errors,
-'emenlow' : [
-'[Firmware Bug]: ACPI: No _BQC method, cannot determine initial
brightness',
-'(EE) Failed to load module "psb"',
-'(EE) Failed to load module psb',
-'(EE) Failed to load module "psbdrv"',
-'(EE) Failed to load module psbdrv',
-'(EE) open /dev/fb0: No such file or directory',
-'(EE) AIGLX: reverting to software rendering',
-] + x86_common,
'intel-core2-32' : [
'ACPI: No _BQC method, cannot determine initial brightness',
'[Firmware Bug]: ACPI: No _BQC method, cannot determine initial
brightness',
@@ -159,7 +150,6 @@ ignore_errors = {
'Bluetooth: hci0: Failed to send firmware data (-38)',
'atkbd serio0: Failed to enable keyboard on isa0060/serio0',
] + x86_common,
-'crownbay' : x86_common,
'genericx86' : x86_common,
'genericx86-64' : [
'Direct firmware load for i915',
@@ -172,10 +162,6 @@ ignore_errors = {
'edgerouter' : [
'Fatal server error:',
] + common_errors,
-'jasperforest' : [
-'Activated service \'org.bluez\' failed:',
-'Unable to find NFC netlink family',
-] + common_errors,
}
log_locations = ["/var/log/","/var/log/dmesg", "/tmp/dmesg_output.log"]
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] file: Security fix CVE-2018-10360
CVE-2018-10360: The do_core_note function in readelf.c in libmagic.a in file 5.33 allows remote attackers to cause a denial of service (out-of-bounds read and application crash) via a crafted ELF file. References: https://nvd.nist.gov/vuln/detail/CVE-2018-10360 Patch from: https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22 Signed-off-by: Yi Zhao --- .../file/file/CVE-2018-10360.patch | 32 ++ meta/recipes-devtools/file/file_5.33.bb| 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/file/file/CVE-2018-10360.patch diff --git a/meta/recipes-devtools/file/file/CVE-2018-10360.patch b/meta/recipes-devtools/file/file/CVE-2018-10360.patch new file mode 100644 index 000..7f5671b --- /dev/null +++ b/meta/recipes-devtools/file/file/CVE-2018-10360.patch @@ -0,0 +1,32 @@ +From df494f4ca494b5e1044052d96a6092a16ef1f6b3 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sat, 9 Jun 2018 16:00:06 + +Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis) + +Upstream-Status: Backport +[https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22] + +CVE: CVE-2018-10360 + +Signed-off-by: Yi Zhao +--- + src/readelf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/readelf.c b/src/readelf.c +index 3df0836..d96a538 100644 +--- a/src/readelf.c b/src/readelf.c +@@ -825,7 +825,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + + cname = (unsigned char *) + [doff + prpsoffsets(i)]; +- for (cp = cname; *cp && isprint(*cp); cp++) ++ for (cp = cname; cp < nbuf + size && *cp ++ && isprint(*cp); cp++) + continue; + /* +* Linux apparently appends a space at the end +-- +2.7.4 + diff --git a/meta/recipes-devtools/file/file_5.33.bb b/meta/recipes-devtools/file/file_5.33.bb index 4126422..745ef10 100644 --- a/meta/recipes-devtools/file/file_5.33.bb +++ b/meta/recipes-devtools/file/file_5.33.bb @@ -16,6 +16,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" SRC_URI = "git://github.com/file/file.git \ file://debian-742262.patch \ +file://CVE-2018-10360.patch \ " SRCREV = "219846094c7593e27453e62855e61181089c48cf" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] kernel-devsrc: restructure for out of tree (and on target) module builds
On 2018-07-10 5:41 PM, Richard Purdie wrote: On Tue, 2018-07-10 at 12:38 -0400, Bruce Ashfield wrote: On 07/10/2018 06:21 AM, Richard Purdie wrote: On Mon, 2018-07-09 at 11:53 -0400, Bruce Ashfield wrote: I'll try the other configs, but clearly I have something different in my x86-64 build. I can't run the self tests directly, but am copying the files onto my qemu session and running things myself: root@qemux86-64:/lib/modules/4.14.48-yocto-standard/build# make ARCH=x86 scripts prepare Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" CHK scripts/mod/devicetable-offsets.h SYSTBL arch/x86/include/generated/asm/syscalls_32.h SYSHDR arch/x86/include/generated/asm/unistd_32_ia32.h SYSHDR arch/x86/include/generated/asm/unistd_64_x32.h SYSTBL arch/x86/include/generated/asm/syscalls_64.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_32.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_64.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_x32.h HOSTCC arch/x86/tools/relocs_32.o HOSTCC arch/x86/tools/relocs_64.o HOSTCC arch/x86/tools/relocs_common.o HOSTLD arch/x86/tools/relocs CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" root@qemux86-64:/tmp# make make -C /usr/src/kernel M=/tmp modules make[1]: Entering directory '/lib/modules/4.14.48-yocto- standard/build' Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" Building modules, stage 2. MODPOST 1 modules make[1]: Leaving directory '/lib/modules/4.14.48-yocto- standard/build' root@qemux86-64:/tmp# insmod hellomod.ko [ 419.211616] hellomod: loading out-of-tree module taints kernel. [ 419.212586] Hello world! This is on the core-image-kernel-dev image, which is the one that I created to test all this. What image is that using ? some sato sdk one ? We really need to find you a way to run these. The problem is the qemu graphics piece? You can't have a dummy vncserver or something to direct them at? My config never seems to build and run the tests that I need, I had it work once, and then never again. So I prefer to just build, boot and run tests manually. Regardless of the automation, I can easily do "make scripts prepare" on the kernel-devsrc package, so that is extremely odd that it doesn't work with that image. I'll try and add devsrc to a sato build and see of objtool goes nuts. I'm also unable to build lttng-modules for mips at the moment, so at least mips is untestable for me. Bruce The image is a core-image-sato-sdk... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wayland-protocols: upgrade 1.14 -> 1.15
From: Denys Dmytriyenko
Signed-off-by: Denys Dmytriyenko
---
.../wayland/{wayland-protocols_1.14.bb => wayland-protocols_1.15.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{wayland-protocols_1.14.bb =>
wayland-protocols_1.15.bb} (86%)
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.14.bb
b/meta/recipes-graphics/wayland/wayland-protocols_1.15.bb
similarity index 86%
rename from meta/recipes-graphics/wayland/wayland-protocols_1.14.bb
rename to meta/recipes-graphics/wayland/wayland-protocols_1.15.bb
index 873fcf1..85e35f5 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.14.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.15.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "5d32eaf0f5d6b7da7f5ad0959e2551e6"
-SRC_URI[sha256sum] =
"9648896b2462b49b15a69b60f44656593c170c0e73121c890eb16d0c1d9376f6"
+SRC_URI[md5sum] = "d75ec11e8443946b4795e4be1cf22db8"
+SRC_URI[sha256sum] =
"dabb727a4b64e87bfa8c025c1d63919ce12100b49fdeded31857644a59729ee2"
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html;
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] mesa: Fix bild with waylang and egl
Small typo - the subject says waylang, not wayland.
On Tue, Jul 10, 2018 at 04:36:13PM -0600, Khem Raj wrote:
> ping
> On Wed, Jul 4, 2018 at 10:31 AM Khem Raj wrote:
> >
> >
> >
> > On 7/4/18 9:28 AM, Burton, Ross wrote:
> > > FWIW historically we just prepended PKG_CONFIG_SYSROOT or whatever the
> > > spelling was to the result of the pkg-config calls. I didn't know
> > > about PKG_CHECK_VAR before, that's really useful!
> > >
> >
> > indeed it is.
> >
> > > Have you tried pushing this upstream?
> >
> > No, not yet, PKG_CHECK_VAR would need pkgconfig 0.28+, for upstreaming
> > we would need to account for that as well and also upstreaming has to
> > agree to bumping minimum pkgconfig version to 0.28
> >
> > Also note that I've a branch
> > > moving Mesa to Meson so we'll need to fix this again...
> > >
> > > Ross
> > >
> > > On 4 July 2018 at 01:11, Khem Raj wrote:
> > >> When we have wayland enabled with egl then it enables the wayland
> > >> plugin which actually fails to build because its not finding
> > >> wayland-protocol
> > >> xml templates in proper location which is recipe sysroot since
> > >> we are cross compiling
> > >>
> > >> Fixes build errors e.g.
> > >> make[4]: *** No rule to make target
> > >> `//usr/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
> > >> needed by `drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h'.
> > >> Stop.
> > >> make[4]: *** Waiting for unfinished jobs
> > >>
> > >> Signed-off-by: Khem Raj
> > >> ---
> > >> V2: Rebase on master
> > >>
> > >> ...ss-compile-WAYLAND_PROTOCOLS_DATADIR.patch | 24 +++
> > >> meta/recipes-graphics/mesa/mesa.inc | 2 ++
> > >> meta/recipes-graphics/mesa/mesa_18.1.3.bb | 1 +
> > >> 3 files changed, 27 insertions(+)
> > >> create mode 100644
> > >> meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> > >>
> > >> diff --git
> > >> a/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> > >>
> > >> b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> > >> new file mode 100644
> > >> index 00..b4e3c4995f
> > >> --- /dev/null
> > >> +++
> > >> b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> > >> @@ -0,0 +1,24 @@
> > >> +use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
> > >> +
> > >> +This allows to override the wayland-protocols pkgdatadir with the
> > >> +WAYLAND_PROTOCOLS_DATADIR from environment.
> > >> +
> > >> +pkgconfig would return an absolute path in /usr/share/wayland-protocols
> > >> +for the pkgdatadir value, which is not suitable for cross-compiling.
> > >> +
> > >> +Signed-off-by: Khem Raj
> > >> +Upstream-Status: Pending
> > >> +
> > >> +Index: mesa-18.1.2/configure.ac
> > >> +===
> > >> +--- mesa-18.1.2.orig/configure.ac
> > >> mesa-18.1.2/configure.ac
> > >> +@@ -1808,7 +1808,7 @@ for plat in $platforms; do
> > >> + PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >=
> > >> $WAYLAND_REQUIRED])
> > >> + PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >=
> > >> $WAYLAND_REQUIRED])
> > >> + PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
> > >> $WAYLAND_PROTOCOLS_REQUIRED])
> > >> +-WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
> > >> wayland-protocols`
> > >> ++PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols
> > >> >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
> > >> +
> > >> + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
> > >> +
> > >> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> > >> b/meta/recipes-graphics/mesa/mesa.inc
> > >> index d1723e3506..fed2900577 100644
> > >> --- a/meta/recipes-graphics/mesa/mesa.inc
> > >> +++ b/meta/recipes-graphics/mesa/mesa.inc
> > >> @@ -109,6 +109,8 @@ FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
> > >>
> > >> CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
> > >>
> > >> +EXTRA_OEMAKE +=
> > >> "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
> > >> +
> > >> # Remove the mesa dependency on mesa-dev, as mesa is empty
> > >> RDEPENDS_${PN}-dev = ""
> > >>
> > >> diff --git a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> > >> b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> > >> index c47c57e9d8..6af1216b79 100644
> > >> --- a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> > >> +++ b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> > >> @@ -9,6 +9,7 @@ SRC_URI =
> > >> "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
> > >> file://0006-Use-Python-3-to-execute-the-scripts.patch \
> > >> file://0007-dri-i965-Add-missing-time.h-include.patch \
> > >> file://0008-egl-fix-build-race-in-automake.patch \
> > >> + file://cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch \
> > >> "
> > >>
> > >> SRC_URI[md5sum]
Re: [OE-core] [oe-core][PATCH 1/1] tiff: security fix CVE-2018-10963
Yes, it is not clear. What it means is that the patch was applied to 4.0.8
code, but not, I think, 4.0.8 code as seen on openembedded-core before 4.0.8
was obsolete. It still applies for 4.0.9.
Joe
-Original Message-
From: akuster808 [mailto:akuster...@gmail.com]
Sent: Tuesday, July 10, 2018 4:48 PM
To: Slater, Joseph; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [oe-core][PATCH 1/1] tiff: security fix CVE-2018-10963
On 07/10/2018 04:03 PM, Joe Slater wrote:
> Denial of service described at
> https://nvd.nist.gov/vuln/detail/CVE-2018-10963.
>
> Signed-off-by: Joe Slater
> ---
> .../libtiff/files/CVE-2018-10963.patch | 41
> ++
> meta/recipes-multimedia/libtiff/tiff_4.0.9.bb | 1 +
> 2 files changed, 42 insertions(+)
> create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
>
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
> b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
> new file mode 100644
> index 000..13a1eb5
> --- /dev/null
> +++ b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
> @@ -0,0 +1,41 @@
> +From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001
> +From: Even Rouault
> +Date: Sat, 12 May 2018 14:24:15 +0200
> +Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes
> + http://bugzilla.maptools.org/show_bug.cgi?id=2795.
> + CVE-2018-10963
> +
> +---
> +CVE: CVE-2018-10963
> +
> +Same patch as applied to 4.0.8.
I don't know what that means. The fix is in 4.0.8 or this patch applies
cleanly to 4.0.8 or affects < 4.0.8.
- armin
> +
> +Upstream-Status: Backport [gitlab.com/libtiff/libtiff/commit/de144f...]
> +
> +Signed-off-by: Joe Slater
> +
> +---
> + libtiff/tif_dirwrite.c |7 +--
> + 1 file changed, 5 insertions(+), 2 deletions(-)
> +
> +diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
> +index 2430de6..c15a28d 100644
> +--- a/libtiff/tif_dirwrite.c
> b/libtiff/tif_dirwrite.c
> +@@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int
> imagedone, uint64* pdiroff)
> + }
> + break;
> + default:
> +-assert(0); /*
> we should never get here */
> +-break;
> ++
> TIFFErrorExt(tif->tif_clientdata,module,
> ++
> "Cannot write tag %d (%s)",
> ++
> TIFFFieldTag(o),
> ++
> o->field_name ? o->field_name : "unknown");
> ++goto bad;
> + }
> + }
> + }
> +--
> +1.7.9.5
> +
> diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> index 8c3bba5..e8e2a11 100644
> --- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> @@ -9,6 +9,7 @@ SRC_URI =
> "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
> file://CVE-2017-9935.patch \
> file://CVE-2017-18013.patch \
> file://CVE-2018-5784.patch \
> + file://CVE-2018-10963.patch \
>"
>
> SRC_URI[md5sum] = "54bad211279cc93eb4fca31ba9bfdc79"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 1/1] tiff: security fix CVE-2018-10963
On 07/10/2018 04:03 PM, Joe Slater wrote:
> Denial of service described at
> https://nvd.nist.gov/vuln/detail/CVE-2018-10963.
>
> Signed-off-by: Joe Slater
> ---
> .../libtiff/files/CVE-2018-10963.patch | 41
> ++
> meta/recipes-multimedia/libtiff/tiff_4.0.9.bb | 1 +
> 2 files changed, 42 insertions(+)
> create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
>
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
> b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
> new file mode 100644
> index 000..13a1eb5
> --- /dev/null
> +++ b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
> @@ -0,0 +1,41 @@
> +From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001
> +From: Even Rouault
> +Date: Sat, 12 May 2018 14:24:15 +0200
> +Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes
> + http://bugzilla.maptools.org/show_bug.cgi?id=2795.
> + CVE-2018-10963
> +
> +---
> +CVE: CVE-2018-10963
> +
> +Same patch as applied to 4.0.8.
I don't know what that means. The fix is in 4.0.8 or this patch applies
cleanly to 4.0.8 or affects < 4.0.8.
- armin
> +
> +Upstream-Status: Backport [gitlab.com/libtiff/libtiff/commit/de144f...]
> +
> +Signed-off-by: Joe Slater
> +
> +---
> + libtiff/tif_dirwrite.c |7 +--
> + 1 file changed, 5 insertions(+), 2 deletions(-)
> +
> +diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
> +index 2430de6..c15a28d 100644
> +--- a/libtiff/tif_dirwrite.c
> b/libtiff/tif_dirwrite.c
> +@@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int
> imagedone, uint64* pdiroff)
> + }
> + break;
> + default:
> +-assert(0); /*
> we should never get here */
> +-break;
> ++
> TIFFErrorExt(tif->tif_clientdata,module,
> ++
> "Cannot write tag %d (%s)",
> ++
> TIFFFieldTag(o),
> ++
> o->field_name ? o->field_name : "unknown");
> ++goto bad;
> + }
> + }
> + }
> +--
> +1.7.9.5
> +
> diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> index 8c3bba5..e8e2a11 100644
> --- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
> @@ -9,6 +9,7 @@ SRC_URI =
> "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
> file://CVE-2017-9935.patch \
> file://CVE-2017-18013.patch \
> file://CVE-2018-5784.patch \
> + file://CVE-2018-10963.patch \
>"
>
> SRC_URI[md5sum] = "54bad211279cc93eb4fca31ba9bfdc79"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/1] tiff: security fix CVE-2018-10963
Denial of service described at https://nvd.nist.gov/vuln/detail/CVE-2018-10963.
Signed-off-by: Joe Slater
---
.../libtiff/files/CVE-2018-10963.patch | 41 ++
meta/recipes-multimedia/libtiff/tiff_4.0.9.bb | 1 +
2 files changed, 42 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
new file mode 100644
index 000..13a1eb5
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
@@ -0,0 +1,41 @@
+From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001
+From: Even Rouault
+Date: Sat, 12 May 2018 14:24:15 +0200
+Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes
+ http://bugzilla.maptools.org/show_bug.cgi?id=2795.
+ CVE-2018-10963
+
+---
+CVE: CVE-2018-10963
+
+Same patch as applied to 4.0.8.
+
+Upstream-Status: Backport [gitlab.com/libtiff/libtiff/commit/de144f...]
+
+Signed-off-by: Joe Slater
+
+---
+ libtiff/tif_dirwrite.c |7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
+index 2430de6..c15a28d 100644
+--- a/libtiff/tif_dirwrite.c
b/libtiff/tif_dirwrite.c
+@@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int
imagedone, uint64* pdiroff)
+ }
+ break;
+ default:
+- assert(0); /*
we should never get here */
+- break;
++
TIFFErrorExt(tif->tif_clientdata,module,
++
"Cannot write tag %d (%s)",
++
TIFFFieldTag(o),
++
o->field_name ? o->field_name : "unknown");
++ goto bad;
+ }
+ }
+ }
+--
+1.7.9.5
+
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
index 8c3bba5..e8e2a11 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2017-9935.patch \
file://CVE-2017-18013.patch \
file://CVE-2018-5784.patch \
+ file://CVE-2018-10963.patch \
"
SRC_URI[md5sum] = "54bad211279cc93eb4fca31ba9bfdc79"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] mesa: Fix bild with waylang and egl
ping
On Wed, Jul 4, 2018 at 10:31 AM Khem Raj wrote:
>
>
>
> On 7/4/18 9:28 AM, Burton, Ross wrote:
> > FWIW historically we just prepended PKG_CONFIG_SYSROOT or whatever the
> > spelling was to the result of the pkg-config calls. I didn't know
> > about PKG_CHECK_VAR before, that's really useful!
> >
>
> indeed it is.
>
> > Have you tried pushing this upstream?
>
> No, not yet, PKG_CHECK_VAR would need pkgconfig 0.28+, for upstreaming
> we would need to account for that as well and also upstreaming has to
> agree to bumping minimum pkgconfig version to 0.28
>
> Also note that I've a branch
> > moving Mesa to Meson so we'll need to fix this again...
> >
> > Ross
> >
> > On 4 July 2018 at 01:11, Khem Raj wrote:
> >> When we have wayland enabled with egl then it enables the wayland
> >> plugin which actually fails to build because its not finding
> >> wayland-protocol
> >> xml templates in proper location which is recipe sysroot since
> >> we are cross compiling
> >>
> >> Fixes build errors e.g.
> >> make[4]: *** No rule to make target
> >> `//usr/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
> >> needed by `drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h'.
> >> Stop.
> >> make[4]: *** Waiting for unfinished jobs
> >>
> >> Signed-off-by: Khem Raj
> >> ---
> >> V2: Rebase on master
> >>
> >> ...ss-compile-WAYLAND_PROTOCOLS_DATADIR.patch | 24 +++
> >> meta/recipes-graphics/mesa/mesa.inc | 2 ++
> >> meta/recipes-graphics/mesa/mesa_18.1.3.bb | 1 +
> >> 3 files changed, 27 insertions(+)
> >> create mode 100644
> >> meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> >>
> >> diff --git
> >> a/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> >>
> >> b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> >> new file mode 100644
> >> index 00..b4e3c4995f
> >> --- /dev/null
> >> +++
> >> b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
> >> @@ -0,0 +1,24 @@
> >> +use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
> >> +
> >> +This allows to override the wayland-protocols pkgdatadir with the
> >> +WAYLAND_PROTOCOLS_DATADIR from environment.
> >> +
> >> +pkgconfig would return an absolute path in /usr/share/wayland-protocols
> >> +for the pkgdatadir value, which is not suitable for cross-compiling.
> >> +
> >> +Signed-off-by: Khem Raj
> >> +Upstream-Status: Pending
> >> +
> >> +Index: mesa-18.1.2/configure.ac
> >> +===
> >> +--- mesa-18.1.2.orig/configure.ac
> >> mesa-18.1.2/configure.ac
> >> +@@ -1808,7 +1808,7 @@ for plat in $platforms; do
> >> + PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >=
> >> $WAYLAND_REQUIRED])
> >> + PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >=
> >> $WAYLAND_REQUIRED])
> >> + PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
> >> $WAYLAND_PROTOCOLS_REQUIRED])
> >> +-WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
> >> wayland-protocols`
> >> ++PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >=
> >> $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
> >> +
> >> + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
> >> +
> >> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> >> b/meta/recipes-graphics/mesa/mesa.inc
> >> index d1723e3506..fed2900577 100644
> >> --- a/meta/recipes-graphics/mesa/mesa.inc
> >> +++ b/meta/recipes-graphics/mesa/mesa.inc
> >> @@ -109,6 +109,8 @@ FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
> >>
> >> CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
> >>
> >> +EXTRA_OEMAKE +=
> >> "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
> >> +
> >> # Remove the mesa dependency on mesa-dev, as mesa is empty
> >> RDEPENDS_${PN}-dev = ""
> >>
> >> diff --git a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> >> b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> >> index c47c57e9d8..6af1216b79 100644
> >> --- a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> >> +++ b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
> >> @@ -9,6 +9,7 @@ SRC_URI =
> >> "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
> >> file://0006-Use-Python-3-to-execute-the-scripts.patch \
> >> file://0007-dri-i965-Add-missing-time.h-include.patch \
> >> file://0008-egl-fix-build-race-in-automake.patch \
> >> + file://cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch \
> >> "
> >>
> >> SRC_URI[md5sum] = "b34273403a605f6f98ead00f0bdf8e0b"
> >> --
> >> 2.18.0
> >>
> >> --
> >> ___
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core
Re: [OE-core] [PATCH v2] kernel-devsrc: restructure for out of tree (and on target) module builds
On Tue, 2018-07-10 at 12:38 -0400, Bruce Ashfield wrote: > On 07/10/2018 06:21 AM, Richard Purdie wrote: > > On Mon, 2018-07-09 at 11:53 -0400, Bruce Ashfield wrote: > I'll try the other configs, but clearly I have something different in > my x86-64 build. > > I can't run the self tests directly, but am copying the files onto my > qemu session and running things myself: > > root@qemux86-64:/lib/modules/4.14.48-yocto-standard/build# make > ARCH=x86 > scripts prepare > Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install > libelf-dev, libelf-devel or elfutils-libelf-devel" >CHK scripts/mod/devicetable-offsets.h >SYSTBL arch/x86/include/generated/asm/syscalls_32.h >SYSHDR arch/x86/include/generated/asm/unistd_32_ia32.h >SYSHDR arch/x86/include/generated/asm/unistd_64_x32.h >SYSTBL arch/x86/include/generated/asm/syscalls_64.h >SYSHDR arch/x86/include/generated/uapi/asm/unistd_32.h >SYSHDR arch/x86/include/generated/uapi/asm/unistd_64.h >SYSHDR arch/x86/include/generated/uapi/asm/unistd_x32.h >HOSTCC arch/x86/tools/relocs_32.o >HOSTCC arch/x86/tools/relocs_64.o >HOSTCC arch/x86/tools/relocs_common.o >HOSTLD arch/x86/tools/relocs >CHK include/config/kernel.release >CHK include/generated/uapi/linux/version.h >CHK include/generated/utsrelease.h > Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install > libelf-dev, libelf-devel or elfutils-libelf-devel" > > root@qemux86-64:/tmp# make > make -C /usr/src/kernel M=/tmp modules > make[1]: Entering directory '/lib/modules/4.14.48-yocto- > standard/build' > Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install > libelf-dev, libelf-devel or elfutils-libelf-devel" >Building modules, stage 2. >MODPOST 1 modules > make[1]: Leaving directory '/lib/modules/4.14.48-yocto- > standard/build' > root@qemux86-64:/tmp# insmod hellomod.ko > [ 419.211616] hellomod: loading out-of-tree module taints kernel. > [ 419.212586] Hello world! > > This is on the core-image-kernel-dev image, which is the one that > I created to test all this. > > What image is that using ? some sato sdk one ? We really need to find you a way to run these. The problem is the qemu graphics piece? You can't have a dummy vncserver or something to direct them at? The image is a core-image-sato-sdk... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-pycairo: update to 1.17.1
Update the python3-pycairo package to the latest stable version and
move the .h and .pc files to the standard location
Tested on the qemu with core-image-minimal
Signed-off-by: Derek Straka
---
...{python3-pycairo_1.15.6.bb => python3-pycairo_1.17.1.bb} | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/python/{python3-pycairo_1.15.6.bb =>
python3-pycairo_1.17.1.bb} (57%)
diff --git a/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
b/meta/recipes-devtools/python/python3-pycairo_1.17.1.bb
similarity index 57%
rename from meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
rename to meta/recipes-devtools/python/python3-pycairo_1.17.1.bb
index 5c3e1e6..54e7dcd 100644
--- a/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
+++ b/meta/recipes-devtools/python/python3-pycairo_1.17.1.bb
@@ -13,8 +13,8 @@ DEPENDS = "cairo"
SRC_URI =
"https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz;
UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/;
-SRC_URI[md5sum] = "3ff210c34e7b052590e15fd0fb147766"
-SRC_URI[sha256sum] =
"ad150ea637860836b66705e0513b8e59494538f0b80497ad3462051368755016"
+SRC_URI[md5sum] = "34c1ee106655b450c4bd57e29371a4a7"
+SRC_URI[sha256sum] =
"0f0a35ec923d87bc495f6753b1e540fd046d95db56a35250c44089fbce03b698"
S = "${WORKDIR}/pycairo-${PV}"
@@ -25,7 +25,10 @@ CFLAGS += "-fPIC"
BBCLASSEXTEND = "native"
do_install_append() {
-install -d ${D}${includedir}/pycairo/
-install -m 0644 ${D}${datadir}/include/pycairo/py3cairo.h
${D}${includedir}/pycairo/
+install -d ${D}${includedir}/pycairo/ ${D}${libdir}/pkgconfig
+# setup.py uses --install-data which points to a non-standard datadir to
install the header and .pc files
+# Fix the paths here to install in the standard locations instead
+mv ${D}${datadir}/include/pycairo/py3cairo.h ${D}${includedir}/pycairo/
+mv ${D}${datadir}/lib/pkgconfig/py3cairo.pc ${D}${libdir}/pkgconfig/
+rm -rf ${D}${datadir}
}
-FILES_${PN} += "${datadir}/include/pycairo/py3cairo.h"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-pygobject: update to 3.28.3
Update the python3-pygobject package to the latest stable version
Tested on the qemu with core-image-minimal
Signed-off-by: Derek Straka
---
.../{python3-pygobject_3.28.1.bb => python3-pygobject_3.28.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pygobject_3.28.1.bb =>
python3-pygobject_3.28.3.bb} (85%)
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.28.1.bb
b/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb
similarity index 85%
rename from meta/recipes-devtools/python/python3-pygobject_3.28.1.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.28.3.bb
index 97286f4..313af22 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.28.1.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb
@@ -12,8 +12,8 @@ SRC_URI = " \
http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz
\
"
-SRC_URI[md5sum] = "612e9e2863d117d810e78672f7bc3ad6"
-SRC_URI[sha256sum] =
"42312b4a5015571fa0a4f2d201005da46b71c251ea2625bc95702d071c4ff895"
+SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90"
+SRC_URI[sha256sum] =
"3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0"
S = "${WORKDIR}/${SRCNAME}-${PV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-setuptools: update to 40.0.0
Update the python{3}-setuptools to the latest stable version
Tested on the qemu with core-image-minimal
Signed-off-by: Derek Straka
---
meta/recipes-devtools/python/python-setuptools.inc| 4 ++--
.../{python-setuptools_39.2.0.bb => python-setuptools_40.0.0.bb} | 0
.../{python3-setuptools_39.2.0.bb => python3-setuptools_40.0.0.bb}| 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-setuptools_39.2.0.bb =>
python-setuptools_40.0.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-setuptools_39.2.0.bb =>
python3-setuptools_40.0.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index bf654be..25be446 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -9,8 +9,8 @@ PYPI_PACKAGE_EXT = "zip"
inherit pypi
-SRC_URI[md5sum] = "dd4e3fa83a21bf7bf9c51026dc8a4e59"
-SRC_URI[sha256sum] =
"f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2"
+SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829"
+SRC_URI[sha256sum] =
"012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f"
DEPENDS += "${PYTHON_PN}"
DEPENDS_class-native += "${PYTHON_PN}-native"
diff --git a/meta/recipes-devtools/python/python-setuptools_39.2.0.bb
b/meta/recipes-devtools/python/python-setuptools_40.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_39.2.0.bb
rename to meta/recipes-devtools/python/python-setuptools_40.0.0.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_39.2.0.bb
b/meta/recipes-devtools/python/python3-setuptools_40.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_39.2.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_40.0.0.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] xorg-xserver: Enable systemd-logind if using systemd
Enable the systemd-logind on xserver if the user set systemd as a
DISTRO_CONFIG. If a user is buildling Xorg with systemd then they most
likley want the systemd-logind PACKAGECONFIG set.
Signed-off-by: Alistair Francis
---
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 882897bd25..89318e53c5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,7 +123,7 @@ OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'${OPENGL_PKGCONFIGS}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland',
'xwayland', '', d)} \
- ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd
systemd-logind', '', d)} \
"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] populate_sdk_base/check_sdk_sysroots(): Normalize os.path.commonprefix()
Normalize path (norm_path()) returned by os.path.commonprefix()
to strip trailing slash and prevent false negatives.
Add bb.note() on error to indicate which paths failed.
Signed-off-by: Haris Okanovic
---
meta/classes/populate_sdk_base.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index aae6786e58..7bfaa33ac5 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -195,7 +195,9 @@ python check_sdk_sysroots() {
targetPath = os.path.join(linkDirPath, targetPath)
targetPath = norm_path(targetPath)
-if SCAN_ROOT != os.path.commonprefix( [SCAN_ROOT, targetPath] ):
+targetCommonPrefix = norm_path(os.path.commonprefix( [SCAN_ROOT,
targetPath] ))
+if SCAN_ROOT != targetCommonPrefix:
+bb.note("'{0!s}' != '{1!s}'".format(SCAN_ROOT, targetCommonPrefix))
bb.error("Escaping symlink {0!s} --> {1!s}".format(linkPath,
targetPath))
return
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] kernel-devsrc: restructure for out of tree (and on target) module builds
On 07/10/2018 06:21 AM, Richard Purdie wrote: On Mon, 2018-07-09 at 11:53 -0400, Bruce Ashfield wrote: The existing kernel-devsrc package starts with a full copy of the kernel source and then starts to strip out elements that are not required. This results in extra time (I/O) and extra space being taken up in the final package. The main purpose of the kernel-devsrc package has been to build modules against the running kernel, not to include a full copy of the source code for re-building the kernel. The end result was a 600M kernel-devsrc package. This restructuring of the package uses an approach similar to other distros, where the kernel-devsrc package is for building against the running kernel and uses a curated set of copied infrastructure, versus a mass copy of the entire kernel. The differences in this approach versus other is largely due to the architecture support and the split build/source directory of the kernel. The result is a kernel-devsrc package of about 10M, which is capable of running "make scripts" and compiling kernel modules against the running kernel. Along with the changes to the copying of the infrascture, we also have the following changes: - a better/more explicit listing of dependencies for on-target builds of "make scripts" or "make modules_prepare" - The kernel source is installed into /lib/modules//build and a symlink created from /usr/src/kernel to the new location. This aligns with the standard location for module support code - There is also a symlink from /lib/modules//source -> build to reserve a spot for a new package that is simply the kernel source. That package is not part of this update. Signed-off-by: Bruce Ashfield --- v2: drop DEPENDS on perf. We no longer need to depend on perf since the source is copied before modification. It probably won't surprise you to know there were some issues with this patch, sadly. The main recurring issue (on all arches and poky+poky-lsb) is failure of the kernelmodule.KernelModuleTest.test_kernel_module test. The exact failure varies by arch, for x86-64: https://autobuilder.yocto.io/builders/nightly-x86-64/builds/1154/steps/Running%20Sanity%20Tests/logs/stdio | CHK include/generated/utsrelease.h | DESCEND objtool | /lib/modules/4.14.48-yocto-standard/build/tools/build/Makefile.build:37: /lib/modules/4.14.48-yocto-standard/build/tools/build/Build.include: No such file or directory | make[4]: *** No rule to make target '/lib/modules/4.14.48-yocto-standard/build/tools/build/Build.include'. Stop. | make[3]: *** [Makefile:43: /lib/modules/4.14.48-yocto-standard/build/tools/objtool/fixdep-in.o] Error 2 | make[2]: *** [/lib/modules/4.14.48-yocto-standard/build/tools/build/Makefile.include:4: fixdep] Error 2 | make[1]: *** [Makefile:62: objtool] Error 2 | make: *** [Makefile:1647: tools/objtool] Error 2 I'll try the other configs, but clearly I have something different in my x86-64 build. I can't run the self tests directly, but am copying the files onto my qemu session and running things myself: root@qemux86-64:/lib/modules/4.14.48-yocto-standard/build# make ARCH=x86 scripts prepare Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" CHK scripts/mod/devicetable-offsets.h SYSTBL arch/x86/include/generated/asm/syscalls_32.h SYSHDR arch/x86/include/generated/asm/unistd_32_ia32.h SYSHDR arch/x86/include/generated/asm/unistd_64_x32.h SYSTBL arch/x86/include/generated/asm/syscalls_64.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_32.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_64.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_x32.h HOSTCC arch/x86/tools/relocs_32.o HOSTCC arch/x86/tools/relocs_64.o HOSTCC arch/x86/tools/relocs_common.o HOSTLD arch/x86/tools/relocs CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" root@qemux86-64:/tmp# make make -C /usr/src/kernel M=/tmp modules make[1]: Entering directory '/lib/modules/4.14.48-yocto-standard/build' Makefile:950: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" Building modules, stage 2. MODPOST 1 modules make[1]: Leaving directory '/lib/modules/4.14.48-yocto-standard/build' root@qemux86-64:/tmp# insmod hellomod.ko [ 419.211616] hellomod: loading out-of-tree module taints kernel. [ 419.212586] Hello world! This is on the core-image-kernel-dev image, which is the one that I created to test all this. What image is that using ? some sato sdk one ? Bruce For mips: https://autobuilder.yocto.io/builders/nightly-mips/builds/1115 | HOSTCC scripts/sortextable | make[1]: *** No rule to make target 'arch/mips/boot/tools/relocs_32.c', needed
[OE-core] [PATCH 1/1] grub-efi: Provide target architecture for 32-bit ARM.
Signed-off-by: Kristian Amlie
---
meta/recipes-bsp/grub/grub-efi_2.02.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb
b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index 7bfc8ee..14fce97 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -25,6 +25,9 @@ python __anonymous () {
elif re.match('aarch64', target):
grubtarget = 'arm64'
grubimage = prefix + "bootaa64.efi"
+elif re.match('arm', target):
+grubtarget = 'arm'
+grubimage = prefix + "bootarm.efi"
else:
raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" %
target)
d.setVar("GRUB_TARGET", grubtarget)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [] default-providers: introduce VIRTUAL-RUNTIME_initscripts
Commits 1202307b24 ("lsbinitscripts: don't use update-alternatives")
cdcebd81c87 ("initscripts: don't use update-alternatives") and
061fa614cec ("update-alternatives.bbclass: refuse to manage SysV init
scripts") make sure that the lsbinitscripts and initscripts packages
conflict with eachother and can't be alternatives.
lsb has a hardcoded dependency on lsbinitscripts which makes it
impossible to install on systems using initscripts (acl depends on
initscripts) and lsbinitscripts also has a runtime dependency on the
full util-linux package making it an unwanted dependency on busybox
systems.
Therefore introduce VIRTUAL-RUNTIME_initscripts to choose between the
versions of /etc/init.d/functions and allow installing lsb alongside
initscripts avoiding the full util-linux dependency.
Default it to lsbinitscripts so we don't have a change in the existing
behavior; distros/users can override it in their conf when needed.
Signed-off-by: Ioan-Adrian Ratiu
---
meta/conf/distro/include/default-providers.inc | 1 +
meta/recipes-extended/lsb/lsb_5.0.bb | 3 +--
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc
b/meta/conf/distro/include/default-providers.inc
index e65c1ed323..37e7478ea0 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -23,6 +23,7 @@ VIRTUAL-RUNTIME_update-alternatives ?=
"update-alternatives-opkg"
VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
+VIRTUAL-RUNTIME_initscripts ?= "lsbinitscripts"
VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools"
VIRTUAL-RUNTIME_base-utils ?= "busybox"
VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock"
diff --git a/meta/recipes-extended/lsb/lsb_5.0.bb
b/meta/recipes-extended/lsb/lsb_5.0.bb
index df4812e4bc..6cb1751664 100644
--- a/meta/recipes-extended/lsb/lsb_5.0.bb
+++ b/meta/recipes-extended/lsb/lsb_5.0.bb
@@ -8,8 +8,7 @@ LSB_CORE_x86 = "lsb-core-ia32"
LSB_CORE_x86-64 = "lsb-core-amd64"
RPROVIDES_${PN} += "${LSB_CORE}"
-# lsb_release needs getopt, lsbinitscripts
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt} lsbinitscripts"
+RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt} ${VIRTUAL-RUNTIME_initscripts}"
LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 53d100ce74..74547b0773 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -118,7 +118,7 @@ RDEPENDS_packagegroup-core-lsb-misc = "\
gettext \
gettext-runtime \
groff \
-lsbinitscripts \
+${VIRTUAL_RUNTIME-initscripts} \
lsbtest \
lsof \
strace \
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] kernel-devsrc: restructure for out of tree (and on target) module builds
On 07/10/2018 06:21 AM, Richard Purdie wrote: On Mon, 2018-07-09 at 11:53 -0400, Bruce Ashfield wrote: The existing kernel-devsrc package starts with a full copy of the kernel source and then starts to strip out elements that are not required. This results in extra time (I/O) and extra space being taken up in the final package. The main purpose of the kernel-devsrc package has been to build modules against the running kernel, not to include a full copy of the source code for re-building the kernel. The end result was a 600M kernel-devsrc package. This restructuring of the package uses an approach similar to other distros, where the kernel-devsrc package is for building against the running kernel and uses a curated set of copied infrastructure, versus a mass copy of the entire kernel. The differences in this approach versus other is largely due to the architecture support and the split build/source directory of the kernel. The result is a kernel-devsrc package of about 10M, which is capable of running "make scripts" and compiling kernel modules against the running kernel. Along with the changes to the copying of the infrascture, we also have the following changes: - a better/more explicit listing of dependencies for on-target builds of "make scripts" or "make modules_prepare" - The kernel source is installed into /lib/modules//build and a symlink created from /usr/src/kernel to the new location. This aligns with the standard location for module support code - There is also a symlink from /lib/modules//source -> build to reserve a spot for a new package that is simply the kernel source. That package is not part of this update. Signed-off-by: Bruce Ashfield --- v2: drop DEPENDS on perf. We no longer need to depend on perf since the source is copied before modification. It probably won't surprise you to know there were some issues with this patch, sadly. heh. No problem. These are just things I didn't have the configs to test. Outside of the multilib issue, I can fix things up. For the multlib, I have no idea .. since this: file /usr/bin/libtool from install of libtool-2.4.6-r0.0.i586 conflicts with file from package lib64-libtool-2.4.6-r0.0.x86_64 is greek to me :D I'll look at these one by one, and see if anyone with more bitbake knowledge wants to help out with that last one. Bruce The main recurring issue (on all arches and poky+poky-lsb) is failure of the kernelmodule.KernelModuleTest.test_kernel_module test. The exact failure varies by arch, for x86-64: https://autobuilder.yocto.io/builders/nightly-x86-64/builds/1154/steps/Running%20Sanity%20Tests/logs/stdio | CHK include/generated/utsrelease.h | DESCEND objtool | /lib/modules/4.14.48-yocto-standard/build/tools/build/Makefile.build:37: /lib/modules/4.14.48-yocto-standard/build/tools/build/Build.include: No such file or directory | make[4]: *** No rule to make target '/lib/modules/4.14.48-yocto-standard/build/tools/build/Build.include'. Stop. | make[3]: *** [Makefile:43: /lib/modules/4.14.48-yocto-standard/build/tools/objtool/fixdep-in.o] Error 2 | make[2]: *** [/lib/modules/4.14.48-yocto-standard/build/tools/build/Makefile.include:4: fixdep] Error 2 | make[1]: *** [Makefile:62: objtool] Error 2 | make: *** [Makefile:1647: tools/objtool] Error 2 For mips: https://autobuilder.yocto.io/builders/nightly-mips/builds/1115 | HOSTCC scripts/sortextable | make[1]: *** No rule to make target 'arch/mips/boot/tools/relocs_32.c', needed by 'arch/mips/boot/tools/relocs_32.o'. Stop. | make: *** [arch/mips/Makefile:16: archscripts] Error 2 (same for mips64) For arm: https://autobuilder.yocto.io/builders/nightly-arm/builds/1187/ | HOSTCC scripts/sortextable | make[1]: *** No rule to make target 'arch/arm/tools/syscall.tbl', needed by 'arch/arm/include/generated/uapi/asm/unistd-common.h'. Stop. | make: *** [arch/arm/Makefile:319: archheaders] Error 2 For arm64: https://autobuilder.yocto.io/builders/nightly-arm64/builds/1101/steps/Running%20Sanity%20Tests/logs/stdio | CHK include/generated/uapi/linux/version.h | CHK include/generated/utsrelease.h | make[1]: *** No rule to make target 'arch/arm64/kernel/vdso/vdso.lds', needed by 'arch/arm64/kernel/vdso/vdso.so.dbg'. Stop. | make: *** [arch/arm64/Makefile:160: vdso_prepare] Error 2 There was also a failure in building the build-appliance image: https://autobuilder.yocto.io/builders/build-appliance/builds/1110 and also a failure in one of the multilib builds, probably from different dependencies pulled in by kernel-devsrc: https://autobuilder.yocto.io/builders/nightly-multilib/builds/1139/steps/BuildImages_4/logs/stdio Error: Transaction check error: file /usr/bin/libtool from install of libtool-2.4.6-r0.0.i586 conflicts with file from package lib64-libtool-2.4.6-r0.0.x86_64 file /usr/bin/libtoolize from install of libtool-2.4.6-r0.0.i586 conflicts with file from package
[OE-core] [PATCH] nfs-utils: remove libnfsidmap
As of nfs-utils 2.2.1 libnfsidmap has been integrated and isn't an external
requirement anymore.
Also consolidate nfs-utils patches into a single directory.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/maintainers.inc | 1 -
...clude-sys-types.h-for-getting-u_-typedefs.patch | 27 --
.../libnfsidmap/Set_nobody_user_group.patch| 18 ---
.../nfs-utils/libnfsidmap/fix-ac-prereq.patch | 13 ---
.../nfs-utils/libnfsidmap_0.25.bb | 27 --
.../bugfix-adjust-statd-service-name.patch | 0
.../nfs-utils-debianize-start-statd.patch | 0
.../nfs-utils/nfs-utils_2.3.1.bb | 2 +-
8 files changed, 1 insertion(+), 87 deletions(-)
delete mode 100644
meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
delete mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
rename meta/recipes-connectivity/nfs-utils/{files =>
nfs-utils}/bugfix-adjust-statd-service-name.patch (100%)
rename meta/recipes-connectivity/nfs-utils/{files =>
nfs-utils}/nfs-utils-debianize-start-statd.patch (100%)
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index c44f2b804aa..4d58766451e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -326,7 +326,6 @@ RECIPE_MAINTAINER_pn-libmnl = "Khem Raj
"
RECIPE_MAINTAINER_pn-libmpc = "Khem Raj "
RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia "
RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia "
-RECIPE_MAINTAINER_pn-libnfsidmap = "Maxin B. John "
RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-libnotify = "Maxin B. John "
RECIPE_MAINTAINER_pn-libnsl2 = "Khem Raj "
diff --git
a/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
b/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
deleted file mode 100644
index 4ac52904401..000
---
a/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a5e95a42e7bceddc9ecad06694c1a0588f4bafc8 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Tue, 14 Apr 2015 07:22:47 -0700
-Subject: [PATCH] include sys/types.h for getting u_* typedefs
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- cfg.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cfg.h b/cfg.h
-index d4d4cab..fe49e8f 100644
a/cfg.h
-+++ b/cfg.h
-@@ -33,6 +33,7 @@
- #ifndef _CONF_H_
- #define _CONF_H_
-
-+#include
- #include "queue.h"
-
- struct conf_list_node {
---
-2.1.4
-
diff --git
a/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
b/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
deleted file mode 100644
index 4633da919e7..000
---
a/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Set nobody user and group
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Roy.Li
a/idmapd.conf
-+++ b/idmapd.conf
-@@ -17,8 +17,8 @@
-
- [Mapping]
-
--#Nobody-User = nobody
--#Nobody-Group = nobody
-+Nobody-User = nobody
-+Nobody-Group = nogroup
-
- [Translation]
-
diff --git
a/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
b/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
deleted file mode 100644
index d81c7c5f326..000
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
a/configure.in
-+++ b/configure.in
-@@ -1,7 +1,7 @@
- # -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
-
--AC_PREREQ([2.68])
-+AC_PREREQ([2.65])
- AC_INIT([libnfsidmap],[0.25],[linux-...@vger.kernel.org])
- AC_CONFIG_SRCDIR([nfsidmap.h])
- AC_CONFIG_MACRO_DIR([m4])
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
deleted file mode 100644
index 2565771006a..000
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "NFS id mapping library"
-HOMEPAGE = "http://www.citi.umich.edu/projects/nfsv4/linux/;
-SECTION = "libs"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d9c6a2a0ca6017fda7cd905ed2739b37"
-
-SRC_URI =
"http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${BPN}-${PV}.tar.gz
\
- file://fix-ac-prereq.patch \
- file://Set_nobody_user_group.patch \
-
Re: [OE-core] [PATCH] [PATCH] ethtool:4.16 -> 4.17
(the refresh was trivial so I've done this)
On 10 July 2018 at 11:38, Burton, Ross wrote:
> WARNING: ethtool-4.17-r0 do_patch:
> Some of the context lines in patches were ignored. This can lead to
> incorrectly applied patches.
> The context lines in the patches can be updated with devtool:
>
> devtool modify
> devtool finish --force-patch-refresh
>
> Then the updated patches and the source tree (in devtool's workspace)
> should be reviewed to make sure the patches apply in the correct place
> and don't introduce duplicate lines (which can, and does happen
> when some of the context is ignored). Further information:
> http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
> Details:
> Applying patch avoid_parallel_tests.patch
> patching file configure.ac
> Hunk #1 succeeded at 2 with fuzz 1.
>
> Now at patch avoid_parallel_tests.patch
>
> On 10 July 2018 at 03:42, Hong Liu wrote:
>> Upgrade ethtool from 4.16 to 4.17
>>
>> Signed-off-by: Hong Liu
>> ---
>> meta/recipes-extended/ethtool/{ethtool_4.16.bb => ethtool_4.17.bb} | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> rename meta/recipes-extended/ethtool/{ethtool_4.16.bb => ethtool_4.17.bb}
>> (88%)
>>
>> diff --git a/meta/recipes-extended/ethtool/ethtool_4.16.bb
>> b/meta/recipes-extended/ethtool/ethtool_4.17.bb
>> similarity index 88%
>> rename from meta/recipes-extended/ethtool/ethtool_4.16.bb
>> rename to meta/recipes-extended/ethtool/ethtool_4.17.bb
>> index 5ccb162..844a958 100644
>> --- a/meta/recipes-extended/ethtool/ethtool_4.16.bb
>> +++ b/meta/recipes-extended/ethtool/ethtool_4.17.bb
>> @@ -11,8 +11,8 @@ SRC_URI =
>> "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
>> file://avoid_parallel_tests.patch \
>> "
>>
>> -SRC_URI[md5sum] = "2b50adf06fc1b033951edef5987c32f3"
>> -SRC_URI[sha256sum] =
>> "25f8fc3a4b2cb2cbfe8741148d8e743127dd7c951df96d8d6dccb88741f8a27d"
>> +SRC_URI[md5sum] = "4dba0345a4ab9f51b4a4a9739284238d"
>> +SRC_URI[sha256sum] =
>> "4130142a15f7409d18de3667998f3c99fba52fd7c8d94be7ecdabf8dcab3d6c1"
>>
>> inherit autotools ptest
>> RDEPENDS_${PN}-ptest += "make"
>> --
>> 2.7.4
>>
>>
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] harfbuzz:1.7.5 -> 1.7.6
Packaging is broken, as it was the last time this was submitted to the list:
packages/corei7-64-poky-linux/harfbuzz/harfbuzz: FILELIST: removed
"/usr/lib/libharfbuzz.so.0.10705.0", added
"/usr/lib/libharfbuzz.so.0.10706.0 /usr/lib/libharfbuzz-subset.so.0
/usr/lib/libharfbuzz-subset.so.0.10706.0"
packages/corei7-64-poky-linux/harfbuzz/harfbuzz: PKG changed from
libharfbuzz0 to harfbuzz [default] - may indicate debian renaming
failure
Ross
On 10 July 2018 at 03:42, Hong Liu wrote:
> Upgrade harfbuzz from 1.7.5 to 1.7.6.
>
> Signed-off-by: Hong Liu
> ---
> .../harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.7.6.bb} | 4
> ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.5.bb =>
> harfbuzz_1.7.6.bb} (88%)
>
> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.6.bb
> similarity index 88%
> rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.7.6.bb
> index 0a9b029..80d413a 100644
> --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
> +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.6.bb
> @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
>
> SRC_URI =
> "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2;
>
> -SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
> -SRC_URI[sha256sum] =
> "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
> +SRC_URI[md5sum] = "ffb94cf2942327344ac31330d07036ba"
> +SRC_URI[sha256sum] =
> "da7bed39134826cd51e57c29f1dfbe342ccedb4f4773b1c951ff05ff383e2e9b"
>
> inherit autotools pkgconfig lib_package gtk-doc
>
> --
> 2.7.4
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] ethtool:4.16 -> 4.17
WARNING: ethtool-4.17-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify
devtool finish --force-patch-refresh
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch avoid_parallel_tests.patch
patching file configure.ac
Hunk #1 succeeded at 2 with fuzz 1.
Now at patch avoid_parallel_tests.patch
On 10 July 2018 at 03:42, Hong Liu wrote:
> Upgrade ethtool from 4.16 to 4.17
>
> Signed-off-by: Hong Liu
> ---
> meta/recipes-extended/ethtool/{ethtool_4.16.bb => ethtool_4.17.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-extended/ethtool/{ethtool_4.16.bb => ethtool_4.17.bb}
> (88%)
>
> diff --git a/meta/recipes-extended/ethtool/ethtool_4.16.bb
> b/meta/recipes-extended/ethtool/ethtool_4.17.bb
> similarity index 88%
> rename from meta/recipes-extended/ethtool/ethtool_4.16.bb
> rename to meta/recipes-extended/ethtool/ethtool_4.17.bb
> index 5ccb162..844a958 100644
> --- a/meta/recipes-extended/ethtool/ethtool_4.16.bb
> +++ b/meta/recipes-extended/ethtool/ethtool_4.17.bb
> @@ -11,8 +11,8 @@ SRC_URI =
> "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
> file://avoid_parallel_tests.patch \
> "
>
> -SRC_URI[md5sum] = "2b50adf06fc1b033951edef5987c32f3"
> -SRC_URI[sha256sum] =
> "25f8fc3a4b2cb2cbfe8741148d8e743127dd7c951df96d8d6dccb88741f8a27d"
> +SRC_URI[md5sum] = "4dba0345a4ab9f51b4a4a9739284238d"
> +SRC_URI[sha256sum] =
> "4130142a15f7409d18de3667998f3c99fba52fd7c8d94be7ecdabf8dcab3d6c1"
>
> inherit autotools ptest
> RDEPENDS_${PN}-ptest += "make"
> --
> 2.7.4
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libdrm: allow to build native and nativesdk
Whilst I'm not yet convinced this is something we should have on by
default, I am very interested in seeing it working.
Ross
On 10 July 2018 at 10:49, Martin Jansa wrote:
> On Tue, Jul 10, 2018 at 09:45:45AM +0100, Richard Purdie wrote:
>> Normally I don't mind native/nativesdk variants but libdrm starts to
>> worry me as its a short step away from mesa and when we've tried native
>> or nativesdk versions in the past its been a nightmare, particularly
>> around GL.
>>
>> Could you explain a little more about why we need libdrm-native?
>
> It's for mesa and nativesdk-mesa indeed and qemu-native with spice,
> virglrenderer and opengl support enabled.
>
> http://lists.openembedded.org/pipermail/openembedded-core/2017-September/142349.html
>
>> On Tue, 2018-07-10 at 08:07 +, Martin Jansa wrote:
>> > Signed-off-by: Martin Jansa
>> > ---
>> > meta/recipes-graphics/drm/libdrm_2.4.92.bb | 2 ++
>> > 1 file changed, 2 insertions(+)
>> >
>> > diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
>> > b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
>> > index 1526553254..b4d06d19a6 100644
>> > --- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
>> > +++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
>> > @@ -56,3 +56,5 @@ FILES_${PN}-kms = "${libdir}/libkms*.so.*"
>> > FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
>> > FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*"
>> > FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
>> > +
>> > +BBCLASSEXTEND = "native nativesdk"
>> > --
>> > 2.17.1
>> >
>
> --
> Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] kernel-devsrc: restructure for out of tree (and on target) module builds
On Mon, 2018-07-09 at 11:53 -0400, Bruce Ashfield wrote: > The existing kernel-devsrc package starts with a full copy of the > kernel > source and then starts to strip out elements that are not required. > > This results in extra time (I/O) and extra space being taken up in > the > final package. The main purpose of the kernel-devsrc package has been > to > build modules against the running kernel, not to include a full copy > of > the source code for re-building the kernel. The end result was a > 600M kernel-devsrc package. > > This restructuring of the package uses an approach similar to other > distros, where the kernel-devsrc package is for building against the > running kernel and uses a curated set of copied infrastructure, > versus > a mass copy of the entire kernel. > > The differences in this approach versus other is largely due to the > architecture support and the split build/source directory of the > kernel. > > The result is a kernel-devsrc package of about 10M, which is capable > of running "make scripts" and compiling kernel modules against the > running kernel. > > Along with the changes to the copying of the infrascture, we also > have the following changes: > > - a better/more explicit listing of dependencies for on-target >builds of "make scripts" or "make modules_prepare" > > - The kernel source is installed into /lib/modules//build >and a symlink created from /usr/src/kernel to the new location. >This aligns with the standard location for module support >code > > - There is also a symlink from /lib/modules//source -> > build >to reserve a spot for a new package that is simply the kernel >source. That package is not part of this update. > > Signed-off-by: Bruce Ashfield > --- > > v2: drop DEPENDS on perf. We no longer need to depend on perf since > the source > is copied before modification. It probably won't surprise you to know there were some issues with this patch, sadly. The main recurring issue (on all arches and poky+poky-lsb) is failure of the kernelmodule.KernelModuleTest.test_kernel_module test. The exact failure varies by arch, for x86-64: https://autobuilder.yocto.io/builders/nightly-x86-64/builds/1154/steps/Running%20Sanity%20Tests/logs/stdio | CHK include/generated/utsrelease.h | DESCEND objtool | /lib/modules/4.14.48-yocto-standard/build/tools/build/Makefile.build:37: /lib/modules/4.14.48-yocto-standard/build/tools/build/Build.include: No such file or directory | make[4]: *** No rule to make target '/lib/modules/4.14.48-yocto-standard/build/tools/build/Build.include'. Stop. | make[3]: *** [Makefile:43: /lib/modules/4.14.48-yocto-standard/build/tools/objtool/fixdep-in.o] Error 2 | make[2]: *** [/lib/modules/4.14.48-yocto-standard/build/tools/build/Makefile.include:4: fixdep] Error 2 | make[1]: *** [Makefile:62: objtool] Error 2 | make: *** [Makefile:1647: tools/objtool] Error 2 For mips: https://autobuilder.yocto.io/builders/nightly-mips/builds/1115 | HOSTCC scripts/sortextable | make[1]: *** No rule to make target 'arch/mips/boot/tools/relocs_32.c', needed by 'arch/mips/boot/tools/relocs_32.o'. Stop. | make: *** [arch/mips/Makefile:16: archscripts] Error 2 (same for mips64) For arm: https://autobuilder.yocto.io/builders/nightly-arm/builds/1187/ | HOSTCC scripts/sortextable | make[1]: *** No rule to make target 'arch/arm/tools/syscall.tbl', needed by 'arch/arm/include/generated/uapi/asm/unistd-common.h'. Stop. | make: *** [arch/arm/Makefile:319: archheaders] Error 2 For arm64: https://autobuilder.yocto.io/builders/nightly-arm64/builds/1101/steps/Running%20Sanity%20Tests/logs/stdio | CHK include/generated/uapi/linux/version.h | CHK include/generated/utsrelease.h | make[1]: *** No rule to make target 'arch/arm64/kernel/vdso/vdso.lds', needed by 'arch/arm64/kernel/vdso/vdso.so.dbg'. Stop. | make: *** [arch/arm64/Makefile:160: vdso_prepare] Error 2 There was also a failure in building the build-appliance image: https://autobuilder.yocto.io/builders/build-appliance/builds/1110 and also a failure in one of the multilib builds, probably from different dependencies pulled in by kernel-devsrc: https://autobuilder.yocto.io/builders/nightly-multilib/builds/1139/steps/BuildImages_4/logs/stdio Error: Transaction check error: file /usr/bin/libtool from install of libtool-2.4.6-r0.0.i586 conflicts with file from package lib64-libtool-2.4.6-r0.0.x86_64 file /usr/bin/libtoolize from install of libtool-2.4.6-r0.0.i586 conflicts with file from package lib64-libtool-2.4.6-r0.0.x86_64 I'll retest with this patch removed just so we can unblock the other patches. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
I can't replicate the error, I don't think util-macros is needed anymore. Ross On 10 July 2018 at 10:52, Martin Jansa wrote: > On Tue, Jul 10, 2018 at 10:41:10AM +0100, Burton, Ross wrote: >> On 10 July 2018 at 09:07, Martin Jansa wrote: >> > * Use the same defaults as meson does, with few modifications based on >> > previous EXTRA_OEMESON >> > * move libpciaccess dependency to new intel PACKAGECONFIG >> > * add dependency on util-macros which was previously pulled by >> > libpciaccess, because it's still needed even with intel disabled: >> > | configure.ac:34: error: must install xorg-macros 1.12 or later >> > before running autoconf/autogen >> >> Why is configure giving you an error message when Meson is being used? > > Because this error message is almost a year old from: > http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/qemu=2eb3926cc54fef8e8cdd39cc20fbdc129aa1e52f > switch to meson just pushed me to send this part upstream instead of > rebasing it forever. > > I can update it with meson version of the error if you want. > > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lttng-tools: Allow reconnect to relayd
Ping.
Zhe
On 2018年07月04日 18:17, He Zhe wrote:
> If relayd is started after connection attempt from consumerd it will
> leave the session in disconnected state and causes the following
> inconvenience. This is covered by an upstream feature, see
> https://bugs.lttng.org/issues/883. Before it's done, this patches
> allows users to reconnect to relayd.
>
> root@localhost:~# lttng enable-event --userspace --all
> Error: Events: UST create channel failed (channel channel0, session
> trace_session)
> root@localhost:~# lttng-relayd -b
> Warning: No tracing group detected
> root@localhost:~# lttng enable-event --userspace --all
> Error: Events: UST create channel failed (channel channel0, session
> trace_session)
>
> Signed-off-by: He Zhe
> ---
> ...ow-multiple-attempts-to-connect-to-relayd.patch | 43
> ++
> meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb | 1 +
> 2 files changed, 44 insertions(+)
> create mode 100644
> meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
>
> diff --git
> a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
>
> b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
> new file mode 100644
> index 000..62a0978592d
> --- /dev/null
> +++
> b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
> @@ -0,0 +1,43 @@
> +From 70eff899104b86bae02862927c76caaef5de5d3c Mon Sep 17 00:00:00 2001
> +From: Mikael Beckius
> +Date: Thu, 7 May 2015 16:14:25 +0200
> +Subject: [PATCH] Allow multiple attempts to connect to relayd.
> +
> +It is unclear why a session needs to be made
> +unusable after a failure to connect to relayd
> +since a check for a relayd connection is
> +always made before a session can be configured.
> +
> +The behaviour was introduced in:
> +d9078d0c000d04d49c599a72c1a725026b636ec0
> +
> +Signed-off-by: Mikael Beckius
> +[ The context has moved, adjust the hunk accordingly ]
> +Signed-off-by: He Zhe
> +Upstream-Status: Pending
> +---
> + src/bin/lttng-sessiond/cmd.c |8
> + 1 file changed, 8 deletions(-)
> +
> +diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
> +index 73b4ce3..36f62ee 100644
> +--- a/src/bin/lttng-sessiond/cmd.c
> b/src/bin/lttng-sessiond/cmd.c
> +@@ -689,14 +689,6 @@ close_sock:
> + free(rsock);
> +
> + error:
> +-if (ret != LTTNG_OK) {
> +-/*
> +- * The consumer output for this session should not be used
> anymore
> +- * since the relayd connection failed thus making any tracing
> or/and
> +- * streaming not usable.
> +- */
> +-consumer->enabled = 0;
> +-}
> + return ret;
> + }
> +
> +--
> +1.7.9.5
> +
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
> b/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
> index 93626dd4b5f..e4969c30807 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
> @@ -30,6 +30,7 @@ PACKAGECONFIG_remove_riscv64 = "lttng-ust"
> SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
> file://x32.patch \
> file://run-ptest \
> + file://0001-Allow-multiple-attempts-to-connect-to-relayd.patch \
> "
>
> SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lttng-modules: Fix do_compile failure for btrfs related tracepoints
From: He Zhe Building lttng-modules with linux-yocto-dev will cause do_compile failure: lttng-modules/2.10.6-r0/lttng-modules-2.10.6/probes/../probes/lttng-tracepoint-event-impl.h:143:6: error: conflicting types for 'trace_btrfs_reserve_extent' void trace_##_name(_proto); ^~ The following commit from latest mainline kernel changes some btrfs functions' prototype. 3dca5c942dac60164e6a6e89172f25b86af07ce7 "btrfs: trace: Remove unnecessary fs_info parameter for btrfs__reserve_extent event class" This patch backports a commit from upstream to meet the above changes. 51ab0b1da29354375a19f865abcd233dd2178295 "Fix: btrfs: Remove unnecessary fs_info parameter" Signed-off-by: He Zhe --- ...trfs-Remove-unnecessary-fs_info-parameter.patch | 116 + meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb | 1 + 2 files changed, 117 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch new file mode 100644 index 000..0fe4ee8 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch @@ -0,0 +1,116 @@ +From 51ab0b1da29354375a19f865abcd233dd2178295 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 18 Jun 2018 14:53:19 -0400 +Subject: [PATCH] Fix: btrfs: Remove unnecessary fs_info parameter + +See upstream commit: + + commit 3dca5c942dac60164e6a6e89172f25b86af07ce7 + Author: Qu Wenruo + Date: Thu Apr 26 14:24:25 2018 +0800 + +btrfs: trace: Remove unnecessary fs_info parameter for btrfs__reserve_extent event class + +fs_info can be extracted from btrfs_block_group_cache, and all +btrfs_block_group_cache is created by btrfs_create_block_group_cache() +with fs_info initialized, no need to worry about NULL pointer +dereference. + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Upstream-Status: Backport +Signed-off-by: He Zhe +--- + instrumentation/events/lttng-module/btrfs.h | 54 - + 1 file changed, 53 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h +index 75cc73b..fd1b6b8 100644 +--- a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h +@@ -1658,8 +1658,57 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_f + + #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0)) ++LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, ++ ++ btrfs_find_free_extent, ++ ++ TP_PROTO(const struct btrfs_fs_info *info, u64 num_bytes, u64 empty_size, ++ u64 data), ++ ++ TP_ARGS(info, num_bytes, empty_size, data), ++ ++ TP_FIELDS( ++ ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) ++ ctf_integer(u64, num_bytes, num_bytes) ++ ctf_integer(u64, empty_size, empty_size) ++ ctf_integer(u64, data, data) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, ++ ++ TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, ++ u64 len), ++ ++ TP_ARGS(block_group, start, len), ++ ++ TP_FIELDS( ++ ctf_array(u8, fsid, block_group->fs_info->fsid, BTRFS_UUID_SIZE) ++ ctf_integer(u64, bg_objectid, block_group->key.objectid) ++ ctf_integer(u64, flags, block_group->flags) ++ ctf_integer(u64, start, start) ++ ctf_integer(u64, len, len) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent, ++ ++ TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, ++ u64 len), ++ ++ TP_ARGS(block_group, start, len) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster, ++ ++ TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, ++ u64 len), ++ ++ TP_ARGS(block_group, start, len) ++) + ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) + LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, + + btrfs_find_free_extent, +@@ -1670,6 +1719,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, + TP_ARGS(info, num_bytes, empty_size, data), + + TP_FIELDS( ++ ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, num_bytes, num_bytes) + ctf_integer(u64, empty_size, empty_size) + ctf_integer(u64, data, data) +@@ -1685,6 +1735,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, +
Re: [OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
On Tue, Jul 10, 2018 at 10:41:10AM +0100, Burton, Ross wrote: > On 10 July 2018 at 09:07, Martin Jansa wrote: > > * Use the same defaults as meson does, with few modifications based on > > previous EXTRA_OEMESON > > * move libpciaccess dependency to new intel PACKAGECONFIG > > * add dependency on util-macros which was previously pulled by > > libpciaccess, because it's still needed even with intel disabled: > > | configure.ac:34: error: must install xorg-macros 1.12 or later > > before running autoconf/autogen > > Why is configure giving you an error message when Meson is being used? Because this error message is almost a year old from: http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/qemu=2eb3926cc54fef8e8cdd39cc20fbdc129aa1e52f switch to meson just pushed me to send this part upstream instead of rebasing it forever. I can update it with meson version of the error if you want. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libdrm: allow to build native and nativesdk
On Tue, Jul 10, 2018 at 09:45:45AM +0100, Richard Purdie wrote:
> Normally I don't mind native/nativesdk variants but libdrm starts to
> worry me as its a short step away from mesa and when we've tried native
> or nativesdk versions in the past its been a nightmare, particularly
> around GL.
>
> Could you explain a little more about why we need libdrm-native?
It's for mesa and nativesdk-mesa indeed and qemu-native with spice,
virglrenderer and opengl support enabled.
http://lists.openembedded.org/pipermail/openembedded-core/2017-September/142349.html
> On Tue, 2018-07-10 at 08:07 +, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa
> > ---
> > meta/recipes-graphics/drm/libdrm_2.4.92.bb | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> > b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> > index 1526553254..b4d06d19a6 100644
> > --- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> > +++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> > @@ -56,3 +56,5 @@ FILES_${PN}-kms = "${libdir}/libkms*.so.*"
> > FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
> > FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*"
> > FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
> > +
> > +BBCLASSEXTEND = "native nativesdk"
> > --
> > 2.17.1
> >
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] nss:3.37.1 -> 3.37.3
master is at 3.38 now.
Ross
On 10 July 2018 at 03:42, Hong Liu wrote:
> Upgrade nss from 3.37.1 to 3.37.3
>
> Signed-off-by: Hong Liu
> ---
> meta/recipes-support/nss/{nss_3.37.1.bb => nss_3.37.3.bb} | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
> rename meta/recipes-support/nss/{nss_3.37.1.bb => nss_3.37.3.bb} (97%)
>
> diff --git a/meta/recipes-support/nss/nss_3.37.1.bb
> b/meta/recipes-support/nss/nss_3.37.3.bb
> similarity index 97%
> rename from meta/recipes-support/nss/nss_3.37.1.bb
> rename to meta/recipes-support/nss/nss_3.37.3.bb
> index 0e8b5be..a053659 100644
> --- a/meta/recipes-support/nss/nss_3.37.1.bb
> +++ b/meta/recipes-support/nss/nss_3.37.3.bb
> @@ -25,11 +25,10 @@ SRC_URI =
> "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
> file://nss-fix-nsinstall-build.patch \
> file://disable-Wvarargs-with-clang.patch \
> file://pqg.c-ULL_addend.patch \
> -
> file://0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch \
> "
>
> -SRC_URI[md5sum] = "e9526d7217d02afa96b90b89924c38df"
> -SRC_URI[sha256sum] =
> "097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405"
> +SRC_URI[md5sum] = "22e8ce40f80ce1e7d9d92ebd07124840"
> +SRC_URI[sha256sum] =
> "9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be"
>
> UPSTREAM_CHECK_URI =
> "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases;
> UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes"
> --
> 2.7.4
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [PATCH] file:5.32 -> 5.33
This has been already submitted, and the usage patch should be dropped
instead of rebased.
Ross
On 10 July 2018 at 03:42, Hong Liu wrote:
> Upgrade file from 5.32 to 5.33
>
> Signed-off-by: Hong Liu
> ---
> .../file/file/0001-Add-P-prompt-into-Usage-info.patch | 14
> --
> meta/recipes-devtools/file/{file_5.32.bb => file_5.33.bb} | 2 +-
> 2 files changed, 9 insertions(+), 7 deletions(-)
> rename meta/recipes-devtools/file/{file_5.32.bb => file_5.33.bb} (96%)
>
> diff --git
> a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
> b/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
> index 8a16b2c..0d12d86 100644
> --- a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
> +++ b/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
> @@ -23,16 +23,18 @@ diff --git a/src/file.c b/src/file.c
> index 2b15e21..e5a957b 100644
> --- a/src/file.c
> +++ b/src/file.c
> -@@ -76,8 +76,8 @@ int getopt_long(int argc, char * const *argv, const char
> *optstring, const struc
> +@@ -87,9 +87,8 @@ int getopt_long(int, char * const *, const char *,
> +
> # define USAGE \
> - "Usage: %s [" FILE_FLAGS \
> - "] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \
> --"[-e testname] [-F separator] [-f namefile] [-m magicfiles]
> " \
> --"file ...\n" \
> + "Usage: %s [-" FILE_FLAGS "] [--apple] [--extension]
> [--mime-encoding]\n" \
> +-"[--mime-type] [-e ] [-F ] " \
> +-" [-f ]\n" \
> +-"[-m ] [-P ] ...\n" \
> +"[-e testname] [-F separator] [-f namefile] [-m
> magicfiles]\n " \
> +"[-P parameter=limits] file ...\n" \
> - " %s -C [-m magicfiles]\n" \
> + " %s -C [-m ]\n" \
> " %s [--help]\n"
> +
>
> --
> 1.8.3.4
> diff --git a/meta/recipes-devtools/file/file_5.32.bb
> b/meta/recipes-devtools/file/file_5.33.bb
> similarity index 96%
> rename from meta/recipes-devtools/file/file_5.32.bb
> rename to meta/recipes-devtools/file/file_5.33.bb
> index 5e15925..c1688ff 100644
> --- a/meta/recipes-devtools/file/file_5.32.bb
> +++ b/meta/recipes-devtools/file/file_5.33.bb
> @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/file/file.git \
> file://0001-Add-P-prompt-into-Usage-info.patch \
> "
>
> -SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c"
> +SRCREV = "d14511987263ae3c6f5ad28ed7b81c26afdb422c"
> S = "${WORKDIR}/git"
>
> inherit autotools
> --
> 2.7.4
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
On 10 July 2018 at 09:07, Martin Jansa wrote: > * Use the same defaults as meson does, with few modifications based on > previous EXTRA_OEMESON > * move libpciaccess dependency to new intel PACKAGECONFIG > * add dependency on util-macros which was previously pulled by > libpciaccess, because it's still needed even with intel disabled: > | configure.ac:34: error: must install xorg-macros 1.12 or later > before running autoconf/autogen Why is configure giving you an error message when Meson is being used? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] coreutils: fix compile error since use wrong libnss_nis.so
On 07/09/2018 04:46 PM, Richard Purdie wrote: On Mon, 2018-07-09 at 15:49 +0800, changqing...@windriver.com wrote: From: Changqing Li id: relocation error: /lib/x86_64-linux-gnu/libnss_nis.so.2: symbol _nsl_default_nss version GLIBC_PRIVATE not defined in file libnsl.so.1 with link time reference Recent glibc change removed libnss-nis module from glibc and a new recipe libnss-nis.bb was added. After this change, we need to include native libnss_nis in coreutils. otherwise, with "nis" in host /etc/nssswitch.conf, id will use host libnss_nis.so, which will cause above error Signed-off-by: Changqing Li --- meta/recipes-core/coreutils/coreutils_8.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I think this would be fixed by a new version of uninative-tarball after the recent change to include libnss-nis in it. We should probably have a new release of uninative rather than starting to add these DEPENDS everywhere... Cheers, Richard You're right, checked recently merged buildtools-tarball.bb which fix same error, it cannot cover this uninative-tarball, so we still need to add libnss-nis in uninative-tarball. Will you handle fix of uninative-tarball, add libnss-nis to http://downloads.yoctoproject.org/releases/uninative? I should not be able to do this. //changqing -- BRs Sandy(Li Changqing) +861084778653 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libdrm: allow to build native and nativesdk
Normally I don't mind native/nativesdk variants but libdrm starts to
worry me as its a short step away from mesa and when we've tried native
or nativesdk versions in the past its been a nightmare, particularly
around GL.
Could you explain a little more about why we need libdrm-native?
Cheers,
Richard
On Tue, 2018-07-10 at 08:07 +, Martin Jansa wrote:
> Signed-off-by: Martin Jansa
> ---
> meta/recipes-graphics/drm/libdrm_2.4.92.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> index 1526553254..b4d06d19a6 100644
> --- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> +++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
> @@ -56,3 +56,5 @@ FILES_${PN}-kms = "${libdir}/libkms*.so.*"
> FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
> FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*"
> FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] image-live: fix check for rootfs size with hddimg images
Currently we check if the rootfs.img size is greater than 4 GB and use
mcopy to copy it over to a hddimg, a FAT32 volume.
This results in problems when IMAGE_ROOTFS_SIZE is set to be exact 4 GB
(4294967296 bytes). mcopy uses the max offset/file size to be 4294967295
and as a result, it errors out without any warning to the user.
Change the 4 GB check to '-ge' to catch these cases. Since we allow
IMAGE_ROOTFS_SIZE to be in KBs, the maximum allowed is 4194303 KB. Also,
tweaked the error message to refer to wic too.
Fixes [YOCTO #12776]
Signed-off-by: Anuj Mittal
---
meta/classes/image-live.bbclass | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 966277c678..90e5a815c2 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -232,11 +232,11 @@ build_hddimg() {
if [ -f ${HDDDIR}/rootfs.img ]; then
rootfs_img_size=`stat -c '%s' ${HDDDIR}/rootfs.img`
max_size=`expr 4 \* 1024 \* 1024 \* 1024`
- if [ $rootfs_img_size -gt $max_size ]; then
- bberror "${HDDDIR}/rootfs.img execeeds 4GB,"
- bberror "this doesn't work on FAT filesystem,
you can try either of:"
- bberror "1) Reduce the size of rootfs.img"
- bbfatal "2) Use iso, vmdk or vdi to instead of
hddimg\n"
+ if [ $rootfs_img_size -ge $max_size ]; then
+ bberror "${HDDDIR}/rootfs.img rootfs size is
greather than or equal to 4GB,"
+ bberror "and this doesn't work on a FAT
filesystem. You can either:"
+ bberror "1) Reduce the size of rootfs.img, or,"
+ bbfatal "2) Use wic, vmdk or vdi instead of
hddimg\n"
fi
fi
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] perf: add dwarf to PACKAGECONFIG
Enable perf to be built with DWARF support.
Fixes [YOCTO #3359]
Signed-off-by: Anuj Mittal
---
meta/recipes-kernel/perf/perf.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 51f5597eb9..458b355864 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -12,6 +12,7 @@ LICENSE = "GPLv2"
PR = "r9"
PACKAGECONFIG ??= "scripting tui libunwind"
+PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python"
# gui support was added with kernel 3.6.35
# since 3.10 libnewt was replaced by slang
@@ -80,7 +81,7 @@ EXTRA_OEMAKE = '\
EXTRA_CFLAGS="-ldw" \
EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
perfexecdir=${libexecdir} \
-NO_GTK2=1 NO_DWARF=1 \
+NO_GTK2=1 \
${PACKAGECONFIG_CONFARGS} \
'
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libdrm: allow to build native and nativesdk
Signed-off-by: Martin Jansa
---
meta/recipes-graphics/drm/libdrm_2.4.92.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
index 1526553254..b4d06d19a6 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
@@ -56,3 +56,5 @@ FILES_${PN}-kms = "${libdir}/libkms*.so.*"
FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*"
FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
* Use the same defaults as meson does, with few modifications based on
previous EXTRA_OEMESON
* move libpciaccess dependency to new intel PACKAGECONFIG
* add dependency on util-macros which was previously pulled by
libpciaccess, because it's still needed even with intel disabled:
| configure.ac:34: error: must install xorg-macros 1.12 or later
before running autoconf/autogen
Signed-off-by: Martin Jansa
---
meta/recipes-graphics/drm/libdrm_2.4.92.bb | 26 --
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
index 347090cd5f..1526553254 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
@@ -8,7 +8,7 @@ SECTION = "x11/base"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
PROVIDES = "drm"
-DEPENDS = "libpthread-stubs libpciaccess"
+DEPENDS = "libpthread-stubs util-macros"
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://musl-ioctl.patch"
@@ -17,12 +17,24 @@ SRC_URI[sha256sum] =
"e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51
inherit meson pkgconfig manpages
-EXTRA_OEMESON = "-Dvalgrind=false \
- -Dcairo-tests=false \
- -Dinstall-test-programs=true \
- -Domap=true \
- -Detnaviv=true"
-
+PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno
vc4 etnaviv install-test-programs"
+PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false"
+PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess"
+PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false"
+PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false"
+PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false"
+PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false"
+PACKAGECONFIG[omap] = "-Domap=true,-Domap=false"
+PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false"
+PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false"
+PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false"
+PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false"
+PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false"
+PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false"
+PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind"
+PACKAGECONFIG[install-test-programs] =
"-Dinstall-test-programs=true,-Dinstall-test-programs=false"
+PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false"
+PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native
xmlto-native"
ALLOW_EMPTY_${PN}-drivers = "1"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 3/3] openssl-1.1: /etc/ssl location compatibility
Some packages have hard-coded path to /etc/ssl location.
Create a symlinks to correct location.
Signed-off-by: Andrej Valek
Signed-off-by: Marko Peter
---
meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index e2d3020a28..ca6224165a 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -26,7 +26,7 @@ SRC_URI_append_class-nativesdk = " \
S = "${WORKDIR}/openssl-${PV}"
-inherit lib_package multilib_header ptest
+inherit lib_package multilib_header ptest relative_symlinks
do_configure () {
os=${HOST_OS}
@@ -137,6 +137,18 @@ EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC"
do_install () {
oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
oe_multilib_header openssl/opensslconf.h
+
+# Create SSL structure for PATH hard-coded packages like
ca-certificates
+# Debian is also using this technique
+install -d ${D}${sysconfdir}/ssl/
+mv ${D}${libdir}/ssl-1.1/openssl.cnf \
+ ${D}${libdir}/ssl-1.1/certs \
+ ${D}${libdir}/ssl-1.1/private \
+ \
+ ${D}${sysconfdir}/ssl/
+ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs
+ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private
+ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf
}
do_install_append_class-native () {
@@ -174,6 +186,6 @@ FILES_${PN} =+ " ${libdir}/ssl-1.1/*"
FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
FILES_${PN}-engines = "${libdir}/engines-1.1"
-FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
-CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
+FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf
${libdir}/ssl-1.1/openssl.cnf"
+CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
RRECOMMENDS_libcrypto += "openssl-conf"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 2/3] openssl-1.1: rework packaging
The main idea is to have libssl and libcrypto in separate packages.
This saves space if only single library is needed and also some recipes
(in other layers) depend on these library packages.
Together with this other packages like in 1.0.x were created.
The only difference is that openssl 1.1 has additional package openssl-bin.
Add missing dependency to perl for openssl-bin pkg, c_rehash requires it.
Signed-off-by: Andrej Valek
Signed-off-by: Marko Peter
---
meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 3e068669b7..e2d3020a28 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -166,8 +166,14 @@ do_install_ptest() {
RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python"
+PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-engines openssl-conf"
+RDEPENDS_${PN}-bin = "perl"
+FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
+FILES_libssl = "${libdir}/libssl${SOLIBS}"
FILES_${PN} =+ " ${libdir}/ssl-1.1/*"
-
-PACKAGES =+ "${PN}-engines"
+FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
+RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
FILES_${PN}-engines = "${libdir}/engines-1.1"
-
+FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
+CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
+RRECOMMENDS_libcrypto += "openssl-conf"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 1/3] openssl-1.1: fix c_rehash perl errors
Patch original c_rehash script with Debian patch instead
of overriding it with own version.
Error output from c_reshah without patching:
Unknown regexp modifier "/b" at ./c_rehash line 15, at end of line
Unknown regexp modifier "/W" at ./c_rehash line 28, at end of line
Unknown regexp modifier "/3" at ./c_rehash line 28, at end of line
Unknown regexp modifier "/2" at ./c_rehash line 28, at end of line
No such class installdir at ./c_rehash line 63, near "Prefix our
installdir"
(Might be a runaway multi-line // string starting on line 28)
syntax error at ./c_rehash line 63, near "Prefix our installdir"
Can't redeclare "my" in "my" at ./c_rehash line 68, near ""
Execution of ./c_rehash aborted due to compilation errors.
Signed-off-by: Andrej Valek
Signed-off-by: Marko Peter
---
...-dofile.pl-only-quote-stuff-that-actually.patch | 29 ++
.../recipes-connectivity/openssl/openssl_1.1.0h.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644
meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch
b/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch
new file mode 100644
index 00..81a9b2d060
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch
@@ -0,0 +1,29 @@
+openssl-1.1.0h: Fix c_rehash perl errors
+
+[No upstream tracking] -- https://github.com/openssl/openssl/issues/5772
+
+dofile.pl: Revert only quote stuff that actually needs quoting
+
+This wasn't a good solution, too many things depend on the quotes being
+there consistently.
+
+Upstream-Status: Backport
[https://github.com/openssl/openssl/commit/00701e5ea84861b74d9d624f21a6b3fcb12e8acd]
+bug: 5772
+Signed-off-by: Andrej Valek
+
+diff --git a/util/dofile.pl b/util/dofile.pl
+index 955224df7d..b0e20681dd 100644
+--- a/util/dofile.pl
b/util/dofile.pl
+@@ -99,9 +99,9 @@ package main;
+ # This adds quotes (") around the given string, and escapes any $, @, \,
+ # " and ' by prepending a \ to them.
+ sub quotify1 {
+-my $s = my $orig = shift @_;
++my $s = shift @_;
+ $s =~ s/([\$\@\\"'])/\\$1/g;
+-$s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s;
++'"'.$s.'"';
+ }
+
+ # quotify_l LIST
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 64b8a997d0..3e068669b7 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://run-ptest \
file://openssl-c_rehash.sh \
file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \
+
file://0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch \
"
SRC_URI_append_class-nativesdk = " \
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 0/3] Openssl 1.1 upgrading
Changes: [v4] - just resend series [v5] - sync dofile.pl patch with mainline Andrej Valek (3): openssl-1.1: fix c_rehash perl errors openssl-1.1: rework packaging openssl-1.1: /etc/ssl location compatibility ...-dofile.pl-only-quote-stuff-that-actually.patch | 29 ++ .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 27 +--- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/0002-Revert-util-dofile.pl-only-quote-stuff-that-actually.patch -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel-devicetree.bbclass: DTB make targets may contain path components
Please rebase on top of current master-next.
On Mon, Jul 9, 2018 at 6:20 PM Jonathan Haigh
wrote:
> normalize_dtb() turns DTS and DTB paths into values that can be used as
> make targets. These make targets sometimes contain some directory
> components so 'basename' is not suitable for turning the paths into make
> targets - we should only strip off leading directory components of the
> path up to and including the 'dts' directory (if it exists). For
> example:
> * 'overlays/at86rf233.dtbo' should not be changed.
> * 'some/directory/path/dts/overlays/at86rf233.dtbo' should be changed to
> 'overlays/at86rf233.dtbo' rather than just 'at86rf233.dtbo'
>
> Signed-off-by: Jonathan Haigh
> ---
> meta/classes/kernel-devicetree.bbclass | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/kernel-devicetree.bbclass
> b/meta/classes/kernel-devicetree.bbclass
> index 4f80cc6..e42b664 100644
> --- a/meta/classes/kernel-devicetree.bbclass
> +++ b/meta/classes/kernel-devicetree.bbclass
> @@ -12,10 +12,10 @@ KERNEL_DEVICETREE_BUNDLE ?= "0"
> normalize_dtb () {
> DTB="$1"
> if echo ${DTB} | grep -q '/dts/'; then
> -bbwarn "${DTB} contains the full path to the the dts file, but only the
> dtb name should be used."
> -DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
> +bbwarn "${DTB} contains the full path to the the dts file, but the path
> should be relative to the dts directory."
> +DTB=`echo "${DTB}" | sed 's,^.*/dts/,,'`
> fi
> -echo "${DTB}"
> +echo "${DTB}" | sed 's,\.dts$,.dtb,g'
> }
>
> get_real_dtb_path_in_kernel () {
> --
> 2.7.4
>
> IMPORTANT NOTICE: The contents of this email and any attachments are
> confidential and may also be privileged. If you are not the intended
> recipient, please notify the sender immediately and do not disclose the
> contents to any other person, use it for any purpose, or store or copy the
> information in any medium. Thank you.
> --
> ___
> 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
