[OE-core] [PATCH v2] lttng-modules: update to 2.11.1
From: He Zhe
Fix build failure with kernel v5.5.
Remove patches as issues fixed upstream.
Signed-off-by: He Zhe
---
...ops-when-trace-sunrpc_task-events-in.patch | 94 -
...rpc_clnt-dereference-in-rpc_task_que.patch | 44 --
...rpc-use-signed-integer-for-client-id.patch | 105 --
...nrpc-introduce-lttng_get_clid-helper.patch | 130 --
...ules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 +--
5 files changed, 6 insertions(+), 383 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb =>
lttng-modules_2.11.1.bb} (68%)
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch
b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch
deleted file mode 100644
index bdbc4f811e..00
---
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 1ff7013bcf7f068cf4371d12d758f9c0fd16a619 Mon Sep 17 00:00:00 2001
-From: Quanyang Wang
-Date: Thu, 5 Dec 2019 15:35:32 +0800
-Subject: [PATCH 1/4] Fix: SUNRPC: Fix oops when trace sunrpc_task events in
- nfs client
-
-See upstream commit :
-
- commit 2ca310fc4160ed0420da65534a21ae77b24326a8
- Author: Ditang Chen
- Date: Fri, 7 Mar 2014 13:27:57 +0800
- Subject: SUNRPC: Fix oops when trace sunrpc_task events in nfs client
-
- When tracking sunrpc_task events in nfs client, the clnt pointer may be
NULL.
-
- [ 139.269266] BUG: unable to handle kernel NULL pointer dereference at
0004
- [ 139.269915] IP: []
ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc]
- [ 139.269915] PGD 1d293067 PUD 1d294067 PMD 0
- [ 139.269915] Oops: [#1] SMP
- [ 139.269915] Modules linked in: nfsv4 dns_resolver nfs lockd sunrpc
fscache sg ppdev e1000
- serio_raw pcspkr parport_pc parport i2c_piix4 i2c_core microcode xfs
libcrc32c sd_mod sr_mod
- cdrom ata_generic crc_t10dif crct10dif_common pata_acpi ahci libahci
ata_piix libata dm_mirror
- dm_region_hash dm_log dm_mod
- [ 139.269915] CPU: 0 PID: 59 Comm: kworker/0:2 Not tainted
3.10.0-84.el7.x86_64 #1
- [ 139.269915] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS
VirtualBox 12/01/2006
- [ 139.269915] Workqueue: rpciod rpc_async_schedule [sunrpc]
- [ 139.269915] task: 88001b598000 ti: 88001b632000 task.ti:
88001b632000
- [ 139.269915] RIP: 0010:[] []
ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc]
- [ 139.269915] RSP: 0018:88001b633d70 EFLAGS: 00010206
- [ 139.269915] RAX: 88001dfc5338 RBX: 88001cc37a00 RCX:
88001dfc5334
- [ 139.269915] RDX: 88001dfc5338 RSI: RDI:
88001dfc533c
- [ 139.269915] RBP: 88001b633db0 R08: 002c R09:
000a
- [ 139.269915] R10: 00062180 R11: 0020759fb9dc R12:
a0292c20
- [ 139.269915] R13: 88001dfc5334 R14: R15:
- [ 139.269915] FS: () GS:88001fc0()
knlGS:
- [ 139.269915] CS: 0010 DS: ES: CR0: 8005003b
- [ 139.269915] CR2: 0004 CR3: 1d29 CR4:
06f0
- [ 139.269915] DR0: DR1: DR2:
- [ 139.269915] DR3: DR6: 0ff0 DR7:
0400
- [ 139.269915] Stack:
- [ 139.269915] 1b633d98 0246 88001df1dc00
88001cc37a00
- [ 139.269915] 88001bc35e60 88001ffa0a48
88001bc35ee0
- [ 139.269915] 88001b633e08 a02704b5 0001
88001cc37a70
- [ 139.269915] Call Trace:
- [ 139.269915] [] __rpc_execute+0x1d5/0x400 [sunrpc]
- [ 139.269915] [] rpc_async_schedule+0x26/0x30
[sunrpc]
- [ 139.269915] [] process_one_work+0x17b/0x460
- [ 139.269915] [] worker_thread+0x11b/0x400
- [ 139.269915] [] ? rescuer_thread+0x3e0/0x3e0
- [ 139.269915] [] kthread+0xc0/0xd0
- [ 139.269915] [] ?
kthread_create_on_node+0x110/0x110
- [ 139.269915] [] ret_from_fork+0x7c/0xb0
- [ 139.269915] [] ?
kthread_create_on_node+0x110/0x110
- [ 139.269915] Code: 4c 8b 45 c8 48 8d 7d d0 89 4d
Re: [OE-core] [PATCH] lttng-modules: update to 2.11.1
Oops, sure. I'll send v2.
Zhe
On 2/3/20 3:18 PM, Alexander Kanavin wrote:
> The patch files should also be removed.
>
> Alex
>
>> On 3 Feb 2020, at 7.47, wrote:
>>
>> From: He Zhe
>>
>> Fix build failure with kernel v5.5.
>> Remove patch as issues fixed upstream.
>>
>> Signed-off-by: He Zhe
>> ---
>> ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++--
>> 1 file changed, 6 insertions(+), 10 deletions(-)
>> rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb =>
>> lttng-modules_2.11.1.bb} (68%)
>>
>> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
>> b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
>> similarity index 68%
>> rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
>> rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
>> index 3465a43d38..c833ff7009 100644
>> --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
>> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
>> @@ -11,14 +11,10 @@ COMPATIBLE_HOST =
>> '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
>> SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
>>file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
>> \
>>file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
>> -
>> file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \
>> -
>> file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \
>> - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \
>> - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \
>>"
>>
>> -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4"
>> -SRC_URI[sha256sum] =
>> "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f"
>> +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604"
>> +SRC_URI[sha256sum] =
>> "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1"
>>
>> export INSTALL_MOD_DIR="kernel/lttng-modules"
>>
>> @@ -35,13 +31,13 @@ python do_package_prepend() {
>> }
>>
>> BBCLASSEXTEND = "devupstream:target"
>> -LIC_FILES_CHKSUM_class-devupstream =
>> "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3"
>> +LIC_FILES_CHKSUM_class-devupstream =
>> "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
>> DEFAULT_PREFERENCE_class-devupstream = "-1"
>> -SRC_URI_class-devupstream =
>> "git://git.lttng.org/lttng-modules;branch=stable-2.10 \
>> +SRC_URI_class-devupstream =
>> "git://git.lttng.org/lttng-modules;branch=stable-2.11 \
>>file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
>> \
>>file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
>>"
>> -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31"
>> -PV_class-devupstream = "2.10.10+git${SRCPV}"
>> +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a"
>> +PV_class-devupstream = "2.11.1+git${SRCPV}"
>> S_class-devupstream = "${WORKDIR}/git"
>> SRCREV_FORMAT ?= "lttng_git"
>> --
>> 2.17.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
Re: [OE-core] [PATCH 0/3][RFT]: kernel-yocto: v5.4 LTS kernel
On Sat, Feb 1, 2020 at 5:47 PM Bruce Ashfield wrote: > > On Fri, Jan 31, 2020 at 1:25 PM Khem Raj wrote: > > > > On 1/29/20 4:48 AM, Bruce Ashfield wrote: > > > On Wed, Jan 29, 2020 at 2:31 AM Alexander Kanavin > > > wrote: > > >> > > >> Can these issues be bisected? That's how the two kernel regressions > > >> (both found last year via ptests) were tracked down to specific commits. > > >> > > > > > > mips64 was already bisected, and reported upstream, not much help > > > there .. I've already reached out to some more hardcore mips folks for > > > more help, so hopefully that works :D > > > > > can you point to link where this thread is > > It was on the mips-kernel mailing list, but thanks to our friends at > Cisco, I have a patch in hand for this issue now. They'll follow up to > the original thread on the kernel mailing list with the detailed > findings (also watch for it on the linux-yocto mailing list). > > > > > > The musl one didn't bisect in my attempt(s), but in that config it is > > > an easy issue to trigger. I'm out of time to debug it for the next two > > > weeks, hence why I'm broadcasting to see if others want to take a > > > look. > > > > > > > As I saw, I do not see this with latest master-next > > ok, cool. I'll queue the mips fix and re-test. Hopefully it has been > sorted out through the latest version bumps. I'm unfortunately still seeing this on my AB run against master next. https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1520/steps/8/logs/step1c Which does imply that the kernel bump is triggering it (since master-next had 5.4, but it wasn't the default, my series makes it the default). I won't have any time to look at this until late next week, since I'm still traveling. Bruce > > Bruce > > > > > > Bruce > > > > > >> Alex > > >> > > >> On Tue, 28 Jan 2020 at 23:14, wrote: > > >>> > > >>> From: Bruce Ashfield > > >>> > > >>> Hi all, > > >>> > > >>> I just wanted to send these to the list, so everyone could see the > > >>> reference kernel that we are planning for the upcoming release. > > >>> > > >>> I have other patches to drop 4.19, 5.2 and make this the default > > >>> kernel for the various reference platforms as well, but I'm not > > >>> sending them, since we still have two outstanding issues: > > >>> > > >>> 1) mips64 init is segfaulting after / during some self tests. > > >>> > > >>> > > >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/1520/steps/8/logs/step6c > > >>> > > >>> 2) x86 musl is getting a gpf on many commands: > > >>> > > >>> > > >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1501/steps/8/logs/step1c > > >>> > > >>> I've looked into both, and don't have any great ideas on how to debug > > >>> or fix them. > > >>> > > >>> So if anyone has ideas, or wants to poke at these, feel free to follow > > >>> up. > > >>> But as of now, we still can't merge the v5.4 kernel as the reference due > > >>> to these remaining problems. > > >>> > > >>> Bruce > > >>> > > >>> > > >>> The following changes since commit > > >>> ca3993cc4b13d4e661228cee6fb9448adfd0a4ba: > > >>> > > >>>bitbake: tests/fetch: Allow wget upgrade tests to run against a > > >>> local server (2020-01-22 15:56:39 +) > > >>> > > >>> are available in the Git repository at: > > >>> > > >>>git://git.pokylinux.org/poky-contrib zedd/kernel-oe > > >>>http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe > > >>> > > >>> Bruce Ashfield (3): > > >>>linux-yocto: introduce 5.4 recipes > > >>>kern-tools: update Kconfiglib to latest (for 5.4+ kernel) > > >>>kernel-devsrc: update to v5.4+ > > >>> > > >>> .../kern-tools/kern-tools-native_git.bb | 2 +- > > >>> meta/recipes-kernel/linux/kernel-devsrc.bb| 8 +-- > > >>> .../linux/linux-yocto-rt_5.4.bb | 44 +++ > > >>> .../linux/linux-yocto-tiny_5.4.bb | 32 +++ > > >>> meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++ > > >>> 5 files changed, 136 insertions(+), 4 deletions(-) > > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >>> > > >>> -- > > >>> 2.19.1 > > >>> > > >>> -- > > >>> ___ > > >>> Openembedded-core mailing list > > >>> Openembedded-core@lists.openembedded.org > > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > > > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- ___ Openembedded-core mailing list
Re: [OE-core] [PATCH] perf: Additional fixes for 5.5+
On Mon, Feb 3, 2020 at 1:35 AM Joel Stanley wrote:
>
> In e5c4f3127521 ("perf: fix build for v5.5+") this recipe was fixed for
> 5.5 kernels, however testing shows that there's a few other changes
> required.
>
> perf's build system uses a file from the scripts/ directory to
> generate a bpf header, so this must be added to the list of files to
> perform a replace on.
>
> Additionally the replacement would run on all occurrences of
> /usr/bin/python first, resulting in lines that contained
> "/usr/bin/env python32". This re-orders the sed lines to avoid that.
>
> This fixes warnings such the following:
>
>File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix
> _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
> ModuleNotFoundError: No module named '_sysconfigdata'
>
> Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e
> Signed-off-by: Joel Stanley
> ---
> Found when attempting to use 5.5 with OpenBMC.
>
> The sed method of fixing this may be fragile, and moving to patching the
> source tree may be preferred in the future.
unfortunately, we cannot do patches. Since perf is a copy of the code
from the kernel source, you can't carry patches that apply everywhere.
Bruce
>
> meta/recipes-kernel/perf/perf.bb | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> index 6d1b06693d26..1e0be467c024 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -239,11 +239,11 @@ do_configure_prepend () {
> fi
>
> # use /usr/bin/env instead of version specific python
> -for s in `find ${S}/tools/perf/ -name '*.py'`; do
> -sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
> +for s in `find ${S}/tools/perf/ -name '*.py'`
> scripts/bpf_helpers_doc.py; do
> sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
> sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
> sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}"
> +sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
> done
>
> # unistd.h can be out of sync between libc-headers and the captured
> version in the perf source
> --
> 2.24.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lttng-modules: update to 2.11.1
The patch files should also be removed.
Alex
> On 3 Feb 2020, at 7.47, wrote:
>
> From: He Zhe
>
> Fix build failure with kernel v5.5.
> Remove patch as issues fixed upstream.
>
> Signed-off-by: He Zhe
> ---
> ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++--
> 1 file changed, 6 insertions(+), 10 deletions(-)
> rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb =>
> lttng-modules_2.11.1.bb} (68%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
> b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
> similarity index 68%
> rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
> rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
> index 3465a43d38..c833ff7009 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
> @@ -11,14 +11,10 @@ COMPATIBLE_HOST =
> '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
> SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
>file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
>file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
> -
> file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \
> -
> file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \
> - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \
> - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \
>"
>
> -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4"
> -SRC_URI[sha256sum] =
> "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f"
> +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604"
> +SRC_URI[sha256sum] =
> "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1"
>
> export INSTALL_MOD_DIR="kernel/lttng-modules"
>
> @@ -35,13 +31,13 @@ python do_package_prepend() {
> }
>
> BBCLASSEXTEND = "devupstream:target"
> -LIC_FILES_CHKSUM_class-devupstream =
> "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3"
> +LIC_FILES_CHKSUM_class-devupstream =
> "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
> DEFAULT_PREFERENCE_class-devupstream = "-1"
> -SRC_URI_class-devupstream =
> "git://git.lttng.org/lttng-modules;branch=stable-2.10 \
> +SRC_URI_class-devupstream =
> "git://git.lttng.org/lttng-modules;branch=stable-2.11 \
>file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
>file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
>"
> -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31"
> -PV_class-devupstream = "2.10.10+git${SRCPV}"
> +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a"
> +PV_class-devupstream = "2.11.1+git${SRCPV}"
> S_class-devupstream = "${WORKDIR}/git"
> SRCREV_FORMAT ?= "lttng_git"
> --
> 2.17.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
Re: [OE-core] [PATCH] perf: Additional fixes for 5.5+
On Mon, Feb 3, 2020 at 7:35 AM Joel Stanley wrote:
>
> In e5c4f3127521 ("perf: fix build for v5.5+") this recipe was fixed for
> 5.5 kernels, however testing shows that there's a few other changes
> required.
>
> perf's build system uses a file from the scripts/ directory to
> generate a bpf header, so this must be added to the list of files to
> perform a replace on.
>
> Additionally the replacement would run on all occurrences of
> /usr/bin/python first, resulting in lines that contained
> "/usr/bin/env python32". This re-orders the sed lines to avoid that.
>
> This fixes warnings such the following:
>
>File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix
> _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
> ModuleNotFoundError: No module named '_sysconfigdata'
>
> Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e
> Signed-off-by: Joel Stanley
> ---
> Found when attempting to use 5.5 with OpenBMC.
>
> The sed method of fixing this may be fragile, and moving to patching the
> source tree may be preferred in the future.
>
> meta/recipes-kernel/perf/perf.bb | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> index 6d1b06693d26..1e0be467c024 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -239,11 +239,11 @@ do_configure_prepend () {
> fi
>
> # use /usr/bin/env instead of version specific python
> -for s in `find ${S}/tools/perf/ -name '*.py'`; do
> -sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
> +for s in `find ${S}/tools/perf/ -name '*.py'`
> scripts/bpf_helpers_doc.py; do
bpf_helpers_doc.py script is already python3, and according to the GIT
[1] - it was created like that. Do we really need to include it in the
list? Besides, provided this is really needed - does it make sense to
check all scripts instead of explicitly supplying just one here?
> sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
> sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
> sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}"
> +sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
> done
>
> # unistd.h can be out of sync between libc-headers and the captured
> version in the perf source
> --
> 2.24.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[1]:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/scripts/bpf_helpers_doc.py?h=v5.5
--
Regards,
Andrey.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] perf: Additional fixes for 5.5+
On Mon, 3 Feb 2020 at 06:45, Mittal, Anuj wrote:
>
> On Mon, 2020-02-03 at 17:04 +1030, Joel Stanley wrote:
> > # use /usr/bin/env instead of version specific python
> > -for s in `find ${S}/tools/perf/ -name '*.py'`; do
> > -sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
> > +for s in `find ${S}/tools/perf/ -name '*.py'`
> > scripts/bpf_helpers_doc.py; do
> > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
> > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
> > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}"
> > +sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
>
> Can all these lines be replaced by:
>
> sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${s}
This would have the same effect, yes.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] perf: Additional fixes for 5.5+
On Mon, 2020-02-03 at 17:04 +1030, Joel Stanley wrote:
> # use /usr/bin/env instead of version specific python
> -for s in `find ${S}/tools/perf/ -name '*.py'`; do
> -sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
> +for s in `find ${S}/tools/perf/ -name '*.py'`
> scripts/bpf_helpers_doc.py; do
> sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
> sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
> sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}"
> +sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
Can all these lines be replaced by:
sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${s}
Thanks,
Anuj
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lttng-modules: update to 2.11.1
From: He Zhe
Fix build failure with kernel v5.5.
Remove patch as issues fixed upstream.
Signed-off-by: He Zhe
---
...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb =>
lttng-modules_2.11.1.bb} (68%)
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
similarity index 68%
rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
index 3465a43d38..c833ff7009 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
@@ -11,14 +11,10 @@ COMPATIBLE_HOST =
'(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
-
file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \
-
file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \
- file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \
- file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \
"
-SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4"
-SRC_URI[sha256sum] =
"98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f"
+SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604"
+SRC_URI[sha256sum] =
"d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1"
export INSTALL_MOD_DIR="kernel/lttng-modules"
@@ -35,13 +31,13 @@ python do_package_prepend() {
}
BBCLASSEXTEND = "devupstream:target"
-LIC_FILES_CHKSUM_class-devupstream =
"file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3"
+LIC_FILES_CHKSUM_class-devupstream =
"file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
DEFAULT_PREFERENCE_class-devupstream = "-1"
-SRC_URI_class-devupstream =
"git://git.lttng.org/lttng-modules;branch=stable-2.10 \
+SRC_URI_class-devupstream =
"git://git.lttng.org/lttng-modules;branch=stable-2.11 \
file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
"
-SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31"
-PV_class-devupstream = "2.10.10+git${SRCPV}"
+SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a"
+PV_class-devupstream = "2.11.1+git${SRCPV}"
S_class-devupstream = "${WORKDIR}/git"
SRCREV_FORMAT ?= "lttng_git"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perf: Additional fixes for 5.5+
In e5c4f3127521 ("perf: fix build for v5.5+") this recipe was fixed for
5.5 kernels, however testing shows that there's a few other changes
required.
perf's build system uses a file from the scripts/ directory to
generate a bpf header, so this must be added to the list of files to
perform a replace on.
Additionally the replacement would run on all occurrences of
/usr/bin/python first, resulting in lines that contained
"/usr/bin/env python32". This re-orders the sed lines to avoid that.
This fixes warnings such the following:
File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix
_temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
ModuleNotFoundError: No module named '_sysconfigdata'
Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e
Signed-off-by: Joel Stanley
---
Found when attempting to use 5.5 with OpenBMC.
The sed method of fixing this may be fragile, and moving to patching the
source tree may be preferred in the future.
meta/recipes-kernel/perf/perf.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 6d1b06693d26..1e0be467c024 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -239,11 +239,11 @@ do_configure_prepend () {
fi
# use /usr/bin/env instead of version specific python
-for s in `find ${S}/tools/perf/ -name '*.py'`; do
-sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
+for s in `find ${S}/tools/perf/ -name '*.py'` scripts/bpf_helpers_doc.py;
do
sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}"
+sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
done
# unistd.h can be out of sync between libc-headers and the captured
version in the perf source
--
2.24.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [zeus][{ATCH] python2: add ntpath
python3 has this but python is missing this.
[Yocto #13740]
Signed-off-by: Armin Kuster
---
meta/recipes-devtools/python/python/python2-manifest.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/python/python/python2-manifest.json
b/meta/recipes-devtools/python/python/python2-manifest.json
index eb52e862ab..fd98774d00 100644
--- a/meta/recipes-devtools/python/python/python2-manifest.json
+++ b/meta/recipes-devtools/python/python/python2-manifest.json
@@ -267,6 +267,7 @@
"${libdir}/python2.7/lib-dynload/xreadlines.so",
"${libdir}/python2.7/linecache.py",
"${libdir}/python2.7/new.py",
+"${libdir}/python2.7/ntpath.py",
"${libdir}/python2.7/os.py",
"${libdir}/python2.7/platform.py",
"${libdir}/python2.7/posixpath.py",
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libchamplain: Add support for building libchamplain
On Sat, Feb 1, 2020 at 6:43 PM Tim Orling wrote:
>
>
>
> On Sat, Feb 1, 2020 at 6:11 PM Alistair Francis
> wrote:
>
> Maybe some explanation of what is for and why we want it in core would be
> helpful here.
On second thought it probably should go into meta-openembeded. I'll
send a patch there.
Alistair
>
>> Signed-off-by: Alistair Francis
>> ---
>> .../libchamplain/libchamplain_0.12.20.bb | 12
>> 1 file changed, 12 insertions(+)
>> create mode 100644 meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>>
>> diff --git a/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>> b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>> new file mode 100644
>> index 00..90e5533015
>> --- /dev/null
>> +++ b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
>> @@ -0,0 +1,12 @@
>> +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable
>> maps"
>> +LICENSE = "LGPLv2.1"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
>> +DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0
>> libsoup-2.4"
>> +
>> +inherit meson gobject-introspection
>> +
>> +SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e"
>> +SRC_URI = "git://github.com/gnome/libchamplain.git"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> --
>> 2.25.0
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] musl: Update to latest on master
Details on commit delta [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range=83350eb17b9cb355e3f08b0340c4f1e8c437fac9..e6093b5a870a38ebfb3e54382acd48c698bde15d Signed-off-by: Khem Raj --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 629872050c..f4853b4f2e 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" +SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" BASEVER = "1.1.24" -- 2.25.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] netbase: Upgrade to 6.0
adjust install to pick new files from S
Signed-off-by: Khem Raj
---
.../netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} (61%)
diff --git a/meta/recipes-core/netbase/netbase_5.8.bb
b/meta/recipes-core/netbase/netbase_6.0.bb
similarity index 61%
rename from meta/recipes-core/netbase/netbase_5.8.bb
rename to meta/recipes-core/netbase/netbase_6.0.bb
index df617f4481..2fb5762b30 100644
--- a/meta/recipes-core/netbase/netbase_5.8.bb
+++ b/meta/recipes-core/netbase/netbase_6.0.bb
@@ -8,13 +8,13 @@ PE = "1"
SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
-SRC_URI[md5sum] = "ca2e339861b64370779341b9696ee3df"
-SRC_URI[sha256sum] =
"4a9035eb379c4f7f7d424e5580b219b79566fa366c812542691ae337486cfb8e"
+SRC_URI[md5sum] = "3417b0487161f1a2b070a3308cd7f957"
+SRC_URI[sha256sum] =
"692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594"
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
do_install () {
install -d ${D}/${mandir}/man8 ${D}${sysconfdir}
- install -m 0644 etc-rpc ${D}${sysconfdir}/rpc
- install -m 0644 etc-protocols ${D}${sysconfdir}/protocols
- install -m 0644 etc-services ${D}${sysconfdir}/services
+ install -m 0644 ${S}/etc/rpc ${D}${sysconfdir}/rpc
+ install -m 0644 ${S}/etc/protocols ${D}${sysconfdir}/protocols
+ install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services
}
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Update musl, netbase
musl has few more commits fixing NAME_MAX
The following changes since commit 2b9781da7c6d60f8d0ddb36de2666b1ba702f551:
opensbi: Remove dependency on FDT (2020-02-02 16:57:21 +)
are available in the Git repository at:
git://git.yoctoproject.org/poky-contrib kraj/pu
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/pu
Khem Raj (2):
netbase: Upgrade to 6.0
musl: Update to latest on master
meta/recipes-core/musl/musl_git.bb | 2 +-
.../netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} (61%)
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for reproducible: Allow configuration of saved debug output
== Series Details == Series: reproducible: Allow configuration of saved debug output Revision: 1 URL : https://patchwork.openembedded.org/series/22387/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 138ed4aa96) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] reproducible: Allow configuration of saved debug output
If OEQA_DEBUGGING_SAVED_OUTPUT is set in the environment, use this location
to store reproducibile build failure output. This aids debugging on the
YP autobuilder in particular.
Use a date in the directory name to make it easier to find failure output.
Also clean up empty directories as they're unnecessary distracting noise.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/selftest/cases/reproducible.py | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
b/meta/lib/oeqa/selftest/cases/reproducible.py
index 9c715ef8ebd..c261074 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -15,6 +15,7 @@ import tempfile
import shutil
import stat
import os
+import datetime
MISSING = 'MISSING'
DIFFERENT = 'DIFFERENT'
@@ -80,6 +81,9 @@ class ReproducibleTests(OESelftestTestCase):
package_classes = ['deb', 'ipk']
images = ['core-image-minimal', 'core-image-sato',
'core-image-full-cmdline']
save_results = False
+if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ:
+save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT']
+
# This variable controls if one of the test builds is allowed to pull from
# an sstate cache/mirror. The other build is always done clean as a point
of
# comparison.
@@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase):
diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE",
"diffutils-native")
if self.save_results:
-save_dir = tempfile.mkdtemp(prefix='oe-reproducible-')
+os.makedirs(self.save_results, exist_ok=True)
+datestr = datetime.datetime.now().strftime('%Y%m%d')
+save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' %
datestr, dir=self.save_results)
os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP |
stat.S_IROTH | stat.S_IXOTH)
self.logger.info('Non-reproducible packages will be copied to %s',
save_dir)
@@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase):
self.fail("The following %s packages are missing or
different: %s" %
(c, ' '.join(r.test for r in (result.missing +
result.different
+# Clean up empty directories
+if self.save_results:
+if not os.listdir(save_dir):
+os.rmdir(save_dir)
+
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
