[OE-core] [PATCH v2] m4: Fix build on musl/ppc
Signed-off-by: Khem Raj
---
v2: Update patch status
meta/recipes-devtools/m4/m4-1.4.19.inc| 1 +
.../0001-sigsegv-Fix-build-on-ppc-musl.patch | 37 +++
2 files changed, 38 insertions(+)
create mode 100644
meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc
b/meta/recipes-devtools/m4/m4-1.4.19.inc
index 2785a3d22cd..2adf4de6f2f 100644
--- a/meta/recipes-devtools/m4/m4-1.4.19.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
@@ -8,6 +8,7 @@ inherit autotools texinfo ptest gettext
SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
file://ac_config_links.patch \
+ file://0001-sigsegv-Fix-build-on-ppc-musl.patch \
"
SRC_URI:append:class-target = " file://run-ptest \
file://serial-tests-config.patch \
diff --git
a/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
new file mode 100644
index 000..04320de63a2
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
@@ -0,0 +1,37 @@
+From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Wed, 9 Mar 2022 20:22:20 -0800
+Subject: [PATCH] sigsegv: Fix build on ppc/musl
+
+mcontext is not a standard layout so glibc and musl differ sadly.
+
+Fixes
+../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler':
../../m4-1.4.19/lib/sigsegv.c:223:75: error:
'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
223 | #
define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.uc_regs->gregs[1]
|
^~~
+
+Upstream-Status: Submitted
[https://lists.gnu.org/archive/html/m4-patches/2022-03/msg0.html]
+Signed-off-by: Khem Raj
+---
+ lib/sigsegv.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/sigsegv.c b/lib/sigsegv.c
+index 696a152..fa0c465 100644
+--- a/lib/sigsegv.c
b/lib/sigsegv.c
+@@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.gp_regs[1]
+ # else /* 32-bit */
+ /* both should be equivalent */
+-# if 0
+-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.regs->gpr[1]
++# if ! defined __GLIBC__
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_regs->gregs[1]
+ # else
+-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.uc_regs->gregs[1]
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.uc_regs->gregs[1]
+ # endif
+ # endif
+
+--
+2.35.1
+
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163003):
https://lists.openembedded.org/g/openembedded-core/message/163003
Mute This Topic: https://lists.openembedded.org/mt/89681969/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] m4: Fix build on musl/ppc
On Wed, Mar 9, 2022 at 10:27 PM Alexander Kanavin
wrote:
>
> Submit upstream first please :)
>
its already sent but it has not appeared on ml yet since I am not
subscribed to m4 ml I guess.
>
> Ale
>
> On Thu 10. Mar 2022 at 5.31, Khem Raj wrote:
>>
>> Signed-off-by: Khem Raj
>> ---
>> meta/recipes-devtools/m4/m4-1.4.19.inc| 1 +
>> .../0001-sigsegv-Fix-build-on-ppc-musl.patch | 37 +++
>> 2 files changed, 38 insertions(+)
>> create mode 100644
>> meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
>>
>> diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc
>> b/meta/recipes-devtools/m4/m4-1.4.19.inc
>> index 2785a3d22cd..2adf4de6f2f 100644
>> --- a/meta/recipes-devtools/m4/m4-1.4.19.inc
>> +++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
>> @@ -8,6 +8,7 @@ inherit autotools texinfo ptest gettext
>>
>> SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
>> file://ac_config_links.patch \
>> + file://0001-sigsegv-Fix-build-on-ppc-musl.patch \
>> "
>> SRC_URI:append:class-target = " file://run-ptest \
>> file://serial-tests-config.patch \
>> diff --git
>> a/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
>> b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
>> new file mode 100644
>> index 000..8f2ad81c0c5
>> --- /dev/null
>> +++ b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
>> @@ -0,0 +1,37 @@
>> +From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj
>> +Date: Wed, 9 Mar 2022 20:22:20 -0800
>> +Subject: [PATCH] sigsegv: Fix build on ppc/musl
>> +
>> +mcontext is not a standard layout so glibc and musl differ sadly.
>> +
>> +Fixes
>> +../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler':
>>
>>../../m4-1.4.19/lib/sigsegv.c:223:75:
>> error: 'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
>>
>> 223 | #define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
>> ucp)->uc_mcontext.uc_regs->gregs[1]
>> |
>> ^~~
>> +
>> +Upstream-Status: Pending
>> +Signed-off-by: Khem Raj
>> +---
>> + lib/sigsegv.c | 6 +++---
>> + 1 file changed, 3 insertions(+), 3 deletions(-)
>> +
>> +diff --git a/lib/sigsegv.c b/lib/sigsegv.c
>> +index 696a152..fa0c465 100644
>> +--- a/lib/sigsegv.c
>> b/lib/sigsegv.c
>> +@@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
>> + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
>> ucp)->uc_mcontext.gp_regs[1]
>> + # else /* 32-bit */
>> + /* both should be equivalent */
>> +-# if 0
>> +-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
>> ucp)->uc_mcontext.regs->gpr[1]
>> ++# if ! defined __GLIBC__
>> ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
>> ucp)->uc_regs->gregs[1]
>> + # else
>> +-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
>> ucp)->uc_mcontext.uc_regs->gregs[1]
>> ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
>> ucp)->uc_mcontext.uc_regs->gregs[1]
>> + # endif
>> + # endif
>> +
>> +--
>> +2.35.1
>> +
>> --
>> 2.35.1
>>
>>
>>
>>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163002):
https://lists.openembedded.org/g/openembedded-core/message/163002
Mute This Topic: https://lists.openembedded.org/mt/89680211/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] m4: Fix build on musl/ppc
Submit upstream first please :)
Ale
On Thu 10. Mar 2022 at 5.31, Khem Raj wrote:
> Signed-off-by: Khem Raj
> ---
> meta/recipes-devtools/m4/m4-1.4.19.inc| 1 +
> .../0001-sigsegv-Fix-build-on-ppc-musl.patch | 37 +++
> 2 files changed, 38 insertions(+)
> create mode 100644
> meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
>
> diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc
> b/meta/recipes-devtools/m4/m4-1.4.19.inc
> index 2785a3d22cd..2adf4de6f2f 100644
> --- a/meta/recipes-devtools/m4/m4-1.4.19.inc
> +++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
> @@ -8,6 +8,7 @@ inherit autotools texinfo ptest gettext
>
> SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
> file://ac_config_links.patch \
> + file://0001-sigsegv-Fix-build-on-ppc-musl.patch \
> "
> SRC_URI:append:class-target = " file://run-ptest \
> file://serial-tests-config.patch \
> diff --git
> a/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
> b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
> new file mode 100644
> index 000..8f2ad81c0c5
> --- /dev/null
> +++ b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
> @@ -0,0 +1,37 @@
> +From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001
> +From: Khem Raj
> +Date: Wed, 9 Mar 2022 20:22:20 -0800
> +Subject: [PATCH] sigsegv: Fix build on ppc/musl
> +
> +mcontext is not a standard layout so glibc and musl differ sadly.
> +
> +Fixes
> +../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler':
>
>
> ../../m4-1.4.19/lib/sigsegv.c:223:75: error: 'mcontext_t' has no member
> named 'uc_regs'; did you mean 'gregs'?
> 223 | #define
> SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
> ucp)->uc_mcontext.uc_regs->gregs[1]
>|
>^~~
> +
> +Upstream-Status: Pending
> +Signed-off-by: Khem Raj
> +---
> + lib/sigsegv.c | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/lib/sigsegv.c b/lib/sigsegv.c
> +index 696a152..fa0c465 100644
> +--- a/lib/sigsegv.c
> b/lib/sigsegv.c
> +@@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
> + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
> ucp)->uc_mcontext.gp_regs[1]
> + # else /* 32-bit */
> + /* both should be equivalent */
> +-# if 0
> +-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
> ucp)->uc_mcontext.regs->gpr[1]
> ++# if ! defined __GLIBC__
> ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
> ucp)->uc_regs->gregs[1]
> + # else
> +-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
> ucp)->uc_mcontext.uc_regs->gregs[1]
> ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
> ucp)->uc_mcontext.uc_regs->gregs[1]
> + # endif
> + # endif
> +
> +--
> +2.35.1
> +
> --
> 2.35.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163001):
https://lists.openembedded.org/g/openembedded-core/message/163001
Mute This Topic: https://lists.openembedded.org/mt/89680211/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] m4: Fix build on musl/ppc
Signed-off-by: Khem Raj
---
meta/recipes-devtools/m4/m4-1.4.19.inc| 1 +
.../0001-sigsegv-Fix-build-on-ppc-musl.patch | 37 +++
2 files changed, 38 insertions(+)
create mode 100644
meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc
b/meta/recipes-devtools/m4/m4-1.4.19.inc
index 2785a3d22cd..2adf4de6f2f 100644
--- a/meta/recipes-devtools/m4/m4-1.4.19.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
@@ -8,6 +8,7 @@ inherit autotools texinfo ptest gettext
SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
file://ac_config_links.patch \
+ file://0001-sigsegv-Fix-build-on-ppc-musl.patch \
"
SRC_URI:append:class-target = " file://run-ptest \
file://serial-tests-config.patch \
diff --git
a/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
new file mode 100644
index 000..8f2ad81c0c5
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
@@ -0,0 +1,37 @@
+From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Wed, 9 Mar 2022 20:22:20 -0800
+Subject: [PATCH] sigsegv: Fix build on ppc/musl
+
+mcontext is not a standard layout so glibc and musl differ sadly.
+
+Fixes
+../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler':
../../m4-1.4.19/lib/sigsegv.c:223:75: error:
'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
223 | #
define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.uc_regs->gregs[1]
|
^~~
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+---
+ lib/sigsegv.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/sigsegv.c b/lib/sigsegv.c
+index 696a152..fa0c465 100644
+--- a/lib/sigsegv.c
b/lib/sigsegv.c
+@@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.gp_regs[1]
+ # else /* 32-bit */
+ /* both should be equivalent */
+-# if 0
+-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.regs->gpr[1]
++# if ! defined __GLIBC__
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_regs->gregs[1]
+ # else
+-#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.uc_regs->gregs[1]
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *)
ucp)->uc_mcontext.uc_regs->gregs[1]
+ # endif
+ # endif
+
+--
+2.35.1
+
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163000):
https://lists.openembedded.org/g/openembedded-core/message/163000
Mute This Topic: https://lists.openembedded.org/mt/89680211/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH 00/15] Pull request (cover letter only)
The following changes since commit 94db7109f21cdefd50baea5660b691e5fe44a0d1:
scripts/buildhistory-diff: drop use of distutils (2022-02-25 22:14:02 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib stable/hardknott-next
Anuj Mittal (1):
lttng-modules: upgrade 2.12.6 -> 2.12.7
Bruce Ashfield (6):
linux-yocto/5.10: ppc/riscv: fix build with binutils 2.3.8
linux-yocto/5.10: fix dssall build error with binutils 2.3.8
linux-yocto/5.10: features/zram: remove CONFIG_ZRAM_DEF_COMP
linux-yocto/5.10: update to v5.10.101
linux-yocto/5.10: Fix ramoops/ftrace
linux-yocto/5.10: update to v5.10.103
Changqing Li (1):
unfs3: correct configure option
Lee Chee Yang (1):
ruby : update to 3.0.3
Minjae Kim (1):
ghostscript: fix CVE-2021-45949
Peter Kjellerstedt (1):
selftest: recipetool: Correct the URI for socat
Richard Purdie (1):
libgcrypt: Upgrade 1.9.3 -> 1.9.4
Ross Burton (1):
asciidoc: update git repository
Sakib Sajal (1):
go: upgrade 1.16.13 -> 1.16.14
wangmy (1):
wireless-regdb: upgrade 2021.08.28 -> 2022.02.18
meta/lib/oeqa/selftest/cases/recipetool.py| 2 +-
.../go/{go-1.16.13.inc => go-1.16.14.inc} | 4 +-
...1.16.13.bb => go-binary-native_1.16.14.bb} | 4 +-
16.13.bb => go-cross-canadian_1.16.14.bb} | 0
...o-cross_1.16.13.bb => go-cross_1.16.14.bb} | 0
...ssdk_1.16.13.bb => go-crosssdk_1.16.14.bb} | 0
...native_1.16.13.bb => go-native_1.16.14.bb} | 0
...ntime_1.16.13.bb => go-runtime_1.16.14.bb} | 0
.../go/{go_1.16.13.bb => go_1.16.14.bb} | 0
.../ruby/ruby/CVE-2021-31799.patch| 57
.../ruby/ruby/CVE-2021-31810.patch| 258 --
.../ruby/ruby/CVE-2021-32066.patch| 102 ---
.../ruby/{ruby_3.0.1.bb => ruby_3.0.3.bb} | 7 +-
meta/recipes-devtools/unfs3/unfs3_git.bb | 2 +-
.../asciidoc/asciidoc_9.1.0.bb| 2 +-
.../ghostscript/CVE-2021-45949.patch | 65 +
...tack-limits-after-function-evalution.patch | 51
.../ghostscript/ghostscript_9.53.3.bb | 2 +
.../linux/linux-yocto-rt_5.10.bb | 6 +-
.../linux/linux-yocto-tiny_5.10.bb| 8 +-
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +-
...ules_2.12.6.bb => lttng-modules_2.12.7.bb} | 2 +-
08.28.bb => wireless-regdb_2022.02.18.bb} | 2 +-
...{libgcrypt_1.9.3.bb => libgcrypt_1.9.4.bb} | 2 +-
24 files changed, 148 insertions(+), 452 deletions(-)
rename meta/recipes-devtools/go/{go-1.16.13.inc => go-1.16.14.inc} (91%)
rename meta/recipes-devtools/go/{go-binary-native_1.16.13.bb =>
go-binary-native_1.16.14.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.16.13.bb =>
go-cross-canadian_1.16.14.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.16.13.bb => go-cross_1.16.14.bb}
(100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.16.13.bb =>
go-crosssdk_1.16.14.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.16.13.bb => go-native_1.16.14.bb}
(100%)
rename meta/recipes-devtools/go/{go-runtime_1.16.13.bb =>
go-runtime_1.16.14.bb} (100%)
rename meta/recipes-devtools/go/{go_1.16.13.bb => go_1.16.14.bb} (100%)
delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2021-31799.patch
delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2021-31810.patch
delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2021-32066.patch
rename meta/recipes-devtools/ruby/{ruby_3.0.1.bb => ruby_3.0.3.bb} (90%)
create mode 100644
meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch
create mode 100644
meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.12.6.bb =>
lttng-modules_2.12.7.bb} (94%)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2021.08.28.bb =>
wireless-regdb_2022.02.18.bb} (94%)
rename meta/recipes-support/libgcrypt/{libgcrypt_1.9.3.bb =>
libgcrypt_1.9.4.bb} (96%)
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162999):
https://lists.openembedded.org/g/openembedded-core/message/162999
Mute This Topic: https://lists.openembedded.org/mt/89677843/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 00/25] Pull request (cover letter only)
The following changes since commit eeae63c343c8ebd418679915ee20aa8c02fa0fdc:
uninative: Upgrade to 3.5 (2022-02-22 14:22:25 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib stable/honister-next
Alexander Kanavin (3):
ruby: update 3.0.2 -> 3.0.3
libarchive: upgrade 3.5.1 -> 3.5.2
devtool: explicitly set main or master branches in upgrades when
available
Bruce Ashfield (4):
linux-yocto/5.10: features/zram: remove CONFIG_ZRAM_DEF_COMP
linux-yocto/5.10: update to v5.10.101
linux-yocto/5.10: Fix ramoops/ftrace
linux-yocto/5.10: update to v5.10.103
Joe Slater (1):
zip: modify when match.S is built
Lee Chee Yang (2):
libarchive : update to 3.5.3
ghostscript: fix CVE-2021-45949
Oleksandr Ocheretnyi (1):
kernel-devsrc: do not copy Module.symvers file during install
Oleksandr Suvorov (1):
depmodwrapper-cross: add config directory option
Peter Kjellerstedt (1):
selftest: recipetool: Correct the URI for socat
Richard Purdie (3):
perl: Improve and update module RPDEPENDS
libxml-parser-perl: Add missing RDEPENDS
expat: Upgrade 2.4.6 -> 2.4.7
Robert Yang (2):
quilt: Disable external sendmail for deterministic build
cups: Add --with-dbusdir to EXTRA_OECONF for deterministic build
Ross Burton (4):
coreutils: remove obsolete ignored CVE list
cve-check: get_cve_info should open the database read-only
Revert "cve-check: add lockfile to task"
asciidoc: update git repository
Tean Cunningham (1):
rootfs-postcommands: amend systemd_create_users add user to group
check
wangmy (2):
harfbuzz: upgrade 2.9.0 -> 2.9.1
wireless-regdb: upgrade 2021.08.28 -> 2022.02.18
meta/classes/cve-check.bbclass| 4 +-
meta/classes/rootfs-postcommands.bbclass | 8 +-
meta/lib/oeqa/selftest/cases/recipetool.py| 2 +-
meta/recipes-core/coreutils/coreutils_8.32.bb | 3 -
.../expat/{expat_2.4.6.bb => expat_2.4.7.bb} | 2 +-
.../perl/files/perl-rdepends.txt | 338 --
.../perl/libxml-parser-perl_2.46.bb | 1 +
meta/recipes-devtools/perl/perl_5.34.0.bb | 12 +-
meta/recipes-devtools/quilt/quilt.inc | 3 +-
.../ruby/{ruby_3.0.2.bb => ruby_3.0.3.bb} | 4 +-
.../asciidoc/asciidoc_9.1.0.bb| 2 +-
meta/recipes-extended/cups/cups.inc | 1 +
.../ghostscript/CVE-2021-45949.patch | 68
.../ghostscript/ghostscript_9.54.0.bb | 1 +
...ibarchive_3.5.1.bb => libarchive_3.5.3.bb} | 2 +-
.../0001-configure-use-correct-CPP.patch | 47 +++
...002-configure-support-PIC-code-build.patch | 34 ++
meta/recipes-extended/zip/zip_3.0.bb | 2 +
.../{harfbuzz_2.9.0.bb => harfbuzz_2.9.1.bb} | 2 +-
.../kmod/depmodwrapper-cross_1.0.bb | 4 +-
meta/recipes-kernel/linux/kernel-devsrc.bb| 4 +-
.../linux/linux-yocto-rt_5.10.bb | 6 +-
.../linux/linux-yocto-tiny_5.10.bb| 8 +-
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +-
08.28.bb => wireless-regdb_2022.02.18.bb} | 2 +-
scripts/lib/devtool/upgrade.py| 15 +-
26 files changed, 526 insertions(+), 73 deletions(-)
rename meta/recipes-core/expat/{expat_2.4.6.bb => expat_2.4.7.bb} (91%)
rename meta/recipes-devtools/ruby/{ruby_3.0.2.bb => ruby_3.0.3.bb} (93%)
create mode 100644
meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch
rename meta/recipes-extended/libarchive/{libarchive_3.5.1.bb =>
libarchive_3.5.3.bb} (96%)
create mode 100644
meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch
create mode 100644
meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch
rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.9.0.bb => harfbuzz_2.9.1.bb}
(95%)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2021.08.28.bb =>
wireless-regdb_2022.02.18.bb} (94%)
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162998):
https://lists.openembedded.org/g/openembedded-core/message/162998
Mute This Topic: https://lists.openembedded.org/mt/89677732/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe-core][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
Oops, wrong list. Joe
> -Original Message-
> From: Slater, Joseph
> Sent: Wednesday, March 9, 2022 4:51 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Slater, Joseph ; MacLeod, Randy
>
> Subject: [oe-core][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
>
> src/remote/meson.build does not create a dependency on the generated
> lxc_protocol.h for remote_daemon.c. Restructure how this file is generated to
> allow the dependency.
>
> Signed-off-by: Joe Slater
> ---
> .../libvirt/libvirt/lxc_protocol.patch| 104 ++
> recipes-extended/libvirt/libvirt_7.2.0.bb | 1 +
> 2 files changed, 105 insertions(+)
> create mode 100644 recipes-extended/libvirt/libvirt/lxc_protocol.patch
>
> diff --git a/recipes-extended/libvirt/libvirt/lxc_protocol.patch b/recipes-
> extended/libvirt/libvirt/lxc_protocol.patch
> new file mode 100644
> index ..595c3fe4
> --- /dev/null
> +++ b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
> @@ -0,0 +1,104 @@
> +From 38af66c1a9c4cdeb256eeaf563c6807757c370ce Mon Sep 17 00:00:00
> 2001
> +From: Joe Slater
> +Date: Wed, 9 Mar 2022 23:17:33 +
> +Subject: [PATCH] working commit
> +
> +remote_daemon.c and others need the generated header lxc_protocol.h,
> +but do not have it as a dependency in meson.build. This means that
> +builds will randomly (ok, very occasionally) fail. Restructure how the
> +header is built so that remote_daemon can have it as a dependency.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Joe Slater
> +
> +---
> + src/remote/meson.build | 48 --
> + 1 file changed, 28 insertions(+), 20 deletions(-)
> +
> +diff --git a/src/remote/meson.build b/src/remote/meson.build index
> +0a18826..31a30ee 100644
> +--- a/src/remote/meson.build
> b/src/remote/meson.build
> +@@ -1,27 +1,11 @@
> +-remote_driver_sources = [
> +- 'remote_driver.c',
> +- 'remote_sockets.c',
> +-]
> +-
> +-remote_driver_generated = []
> ++remote_xxx_generated = []
> +
> + foreach name : [ 'remote', 'qemu', 'lxc' ]
> +- client_bodies_h = '@0@_client_bodies.h'.format(name)
> + protocol_c = '@0@_protocol.c'.format(name)
> + protocol_h = '@0@_protocol.h'.format(name)
> + protocol_x = '@0@_protocol.x'.format(name)
> +
> +- remote_driver_generated += custom_target(
> +-client_bodies_h,
> +-input: protocol_x,
> +-output: client_bodies_h,
> +-command: [
> +- gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
> +-],
> +-capture: true,
> +- )
> +-
> +- remote_driver_generated += custom_target(
> ++ remote_xxx_generated += custom_target(
> + protocol_h,
> + input: protocol_x,
> + output: protocol_h,
> +@@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
> + ],
> + )
> +
> +- remote_driver_generated += custom_target(
> ++ remote_xxx_generated += custom_target(
> + protocol_c,
> + input: protocol_x,
> + output: protocol_c,
> +@@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
> + rpc_probe_files += files(protocol_x) endforeach
> +
> ++
> ++remote_driver_sources = [
> ++ 'remote_driver.c',
> ++ 'remote_sockets.c',
> ++]
> ++
> ++remote_driver_generated =remote_xxx_generated
> ++
> ++foreach name : [ 'remote', 'qemu', 'lxc' ]
> ++ client_bodies_h = '@0@_client_bodies.h'.format(name)
> ++ protocol_x = '@0@_protocol.x'.format(name)
> ++
> ++ remote_driver_generated += custom_target(
> ++client_bodies_h,
> ++input: protocol_x,
> ++output: client_bodies_h,
> ++command: [
> ++ gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
> ++],
> ++capture: true,
> ++ )
> ++
> ++endforeach
> ++
> + remote_daemon_sources = files(
> + 'remote_daemon.c',
> + 'remote_daemon_config.c',
> +@@ -49,7 +57,7 @@ remote_daemon_sources = files(
> + 'remote_daemon_stream.c',
> + )
> +
> +-remote_daemon_generated = []
> ++remote_daemon_generated = remote_xxx_generated
> +
> + virt_ssh_helper_sources = files(
> + 'remote_sockets.c',
> +--
> +2.32.0
> +
> diff --git a/recipes-extended/libvirt/libvirt_7.2.0.bb b/recipes-
> extended/libvirt/libvirt_7.2.0.bb
> index 5ad7d59e..04c66eb5 100644
> --- a/recipes-extended/libvirt/libvirt_7.2.0.bb
> +++ b/recipes-extended/libvirt/libvirt_7.2.0.bb
> @@ -31,6 +31,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-
> ${PV}.tar.xz;name=libvirt \
> file://0002-meson-Fix-compatibility-with-Meson-0.58.patch \
> file://0001-security-fix-SELinux-label-generation-logic.patch \
>
> file://0001-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch \
> + file://lxc_protocol.patch \
>"
>
> SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3"
> --
> 2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162997):
https://lists.openembedded.org/g/openembedded-core/message/162997
Mute This Topic: https://li
[oe-core][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
src/remote/meson.build does not create a dependency on
the generated lxc_protocol.h for remote_daemon.c. Restructure
how this file is generated to allow the dependency.
Signed-off-by: Joe Slater
---
.../libvirt/libvirt/lxc_protocol.patch| 104 ++
recipes-extended/libvirt/libvirt_7.2.0.bb | 1 +
2 files changed, 105 insertions(+)
create mode 100644 recipes-extended/libvirt/libvirt/lxc_protocol.patch
diff --git a/recipes-extended/libvirt/libvirt/lxc_protocol.patch
b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
new file mode 100644
index ..595c3fe4
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
@@ -0,0 +1,104 @@
+From 38af66c1a9c4cdeb256eeaf563c6807757c370ce Mon Sep 17 00:00:00 2001
+From: Joe Slater
+Date: Wed, 9 Mar 2022 23:17:33 +
+Subject: [PATCH] working commit
+
+remote_daemon.c and others need the generated header lxc_protocol.h,
+but do not have it as a dependency in meson.build. This means that
+builds will randomly (ok, very occasionally) fail. Restructure how the
+header is built so that remote_daemon can have it as a dependency.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater
+
+---
+ src/remote/meson.build | 48 --
+ 1 file changed, 28 insertions(+), 20 deletions(-)
+
+diff --git a/src/remote/meson.build b/src/remote/meson.build
+index 0a18826..31a30ee 100644
+--- a/src/remote/meson.build
b/src/remote/meson.build
+@@ -1,27 +1,11 @@
+-remote_driver_sources = [
+- 'remote_driver.c',
+- 'remote_sockets.c',
+-]
+-
+-remote_driver_generated = []
++remote_xxx_generated = []
+
+ foreach name : [ 'remote', 'qemu', 'lxc' ]
+- client_bodies_h = '@0@_client_bodies.h'.format(name)
+ protocol_c = '@0@_protocol.c'.format(name)
+ protocol_h = '@0@_protocol.h'.format(name)
+ protocol_x = '@0@_protocol.x'.format(name)
+
+- remote_driver_generated += custom_target(
+-client_bodies_h,
+-input: protocol_x,
+-output: client_bodies_h,
+-command: [
+- gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
+-],
+-capture: true,
+- )
+-
+- remote_driver_generated += custom_target(
++ remote_xxx_generated += custom_target(
+ protocol_h,
+ input: protocol_x,
+ output: protocol_h,
+@@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
+ ],
+ )
+
+- remote_driver_generated += custom_target(
++ remote_xxx_generated += custom_target(
+ protocol_c,
+ input: protocol_x,
+ output: protocol_c,
+@@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
+ rpc_probe_files += files(protocol_x)
+ endforeach
+
++
++remote_driver_sources = [
++ 'remote_driver.c',
++ 'remote_sockets.c',
++]
++
++remote_driver_generated =remote_xxx_generated
++
++foreach name : [ 'remote', 'qemu', 'lxc' ]
++ client_bodies_h = '@0@_client_bodies.h'.format(name)
++ protocol_x = '@0@_protocol.x'.format(name)
++
++ remote_driver_generated += custom_target(
++client_bodies_h,
++input: protocol_x,
++output: client_bodies_h,
++command: [
++ gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
++],
++capture: true,
++ )
++
++endforeach
++
+ remote_daemon_sources = files(
+ 'remote_daemon.c',
+ 'remote_daemon_config.c',
+@@ -49,7 +57,7 @@ remote_daemon_sources = files(
+ 'remote_daemon_stream.c',
+ )
+
+-remote_daemon_generated = []
++remote_daemon_generated = remote_xxx_generated
+
+ virt_ssh_helper_sources = files(
+ 'remote_sockets.c',
+--
+2.32.0
+
diff --git a/recipes-extended/libvirt/libvirt_7.2.0.bb
b/recipes-extended/libvirt/libvirt_7.2.0.bb
index 5ad7d59e..04c66eb5 100644
--- a/recipes-extended/libvirt/libvirt_7.2.0.bb
+++ b/recipes-extended/libvirt/libvirt_7.2.0.bb
@@ -31,6 +31,7 @@ SRC_URI =
"http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
file://0002-meson-Fix-compatibility-with-Meson-0.58.patch \
file://0001-security-fix-SELinux-label-generation-logic.patch \
file://0001-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch \
+ file://lxc_protocol.patch \
"
SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3"
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162996):
https://lists.openembedded.org/g/openembedded-core/message/162996
Mute This Topic: https://lists.openembedded.org/mt/89676990/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] dbus-test: merge into main dbus recipe
The reason it was separate is that there is a peculiar circular
dependency: dbus tests require glib, while some of glib's gdbus tests
require dbus. So dbus was built with tests disabled and without glib
dependency, then glib was built with dbus dependency, then dbus was
built again with glib dependency and tests enabled, only for the purpose
of installing those tests. I find that brittle and hacky, so this
removes dbus dependecy from glib (the fallout is that some gdbus tests
are no longer being executed), and dbus and its tests are built once,
after glib. Conversely, dbus is now dependent on glib for the purpose
of building the tests.
Also, dbus ptest installation is no longer using custom code, and dbus
run-ptest simply uses standard installed tests execution mechanism from
gnome.
Signed-off-by: Alexander Kanavin
---
meta/conf/distro/include/maintainers.inc | 1 -
.../distro/include/ptest-packagelists.inc | 2 +-
meta/recipes-core/dbus/dbus-test_1.12.22.bb | 64 ---
meta/recipes-core/dbus/dbus.inc | 7 +-
meta/recipes-core/dbus/dbus/run-ptest | 34 +-
meta/recipes-core/dbus/dbus_1.12.22.bb| 11 +---
meta/recipes-core/glib-2.0/glib.inc | 2 +-
7 files changed, 12 insertions(+), 109 deletions(-)
delete mode 100644 meta/recipes-core/dbus/dbus-test_1.12.22.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 3fceb6701b..a8eceaadf4 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -134,7 +134,6 @@ RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton
"
RECIPE_MAINTAINER:pn-db = "Unassigned "
RECIPE_MAINTAINER:pn-dbus = "Chen Qi "
RECIPE_MAINTAINER:pn-dbus-glib = "Chen Qi "
-RECIPE_MAINTAINER:pn-dbus-test = "Chen Qi "
RECIPE_MAINTAINER:pn-dbus-wait = "Chen Qi "
RECIPE_MAINTAINER:pn-debianutils = "Yi Zhao "
RECIPE_MAINTAINER:pn-dejagnu = "Nathan Rossi "
diff --git a/meta/conf/distro/include/ptest-packagelists.inc
b/meta/conf/distro/include/ptest-packagelists.inc
index c503a6a594..402fb87a3c 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -76,7 +76,7 @@ PTESTS_SLOW = "\
babeltrace2-ptest \
busybox-ptest \
coreutils-ptest \
-dbus-test-ptest \
+dbus-ptest \
e2fsprogs-ptest \
findutils-ptest \
glib-2.0-ptest \
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.22.bb
b/meta/recipes-core/dbus/dbus-test_1.12.22.bb
deleted file mode 100644
index ae70301431..00
--- a/meta/recipes-core/dbus/dbus-test_1.12.22.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-SUMMARY = "D-Bus test package (for D-bus functionality testing only)"
-HOMEPAGE = "http://dbus.freedesktop.org";
-SECTION = "base"
-
-require dbus.inc
-
-SRC_URI += "file://run-ptest \
-file://python-config.patch \
- "
-
-DEPENDS = "dbus glib-2.0"
-
-RDEPENDS:${PN}-dev = ""
-
-S="${WORKDIR}/dbus-${PV}"
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
-
-inherit ptest
-
-EXTRA_OECONF += "--enable-tests \
---enable-modular-tests \
---enable-installed-tests \
---enable-checks \
---enable-asserts \
---with-dbus-test-dir=${PTEST_PATH} \
---enable-embedded-tests \
- "
-
-do_install() {
-:
-}
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/test
- l="shell printf refs syslog marshal syntax corrupt dbus-daemon
dbus-daemon-eavesdrop loopback relay \
- variant uid-permissions syntax spawn sd-activation names monitor
message fdpass service shell-service"
- for i in $l; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test;
done
-
- l="bus bus-system bus-launch-helper"
- for i in $l; do install ${B}/bus/.libs/test-$i ${D}${PTEST_PATH}/test;
done
-
- install -d ${D}${PTEST_PATH}/bus
- install ${B}/bus/.libs/dbus-daemon-launch-helper-test
${D}${PTEST_PATH}/bus
-
- install ${B}/test/test-segfault ${D}${PTEST_PATH}/test
-
- cp -r ${B}/test/data ${D}${PTEST_PATH}/test
- install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test
-
- install -d ${D}${PTEST_PATH}/test/.libs
- cp -a ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs
-
- # Remove build host references...
- find "${D}${PTEST_PATH}/test/data" \( -name *.service -o -name *.conf
-o -name "*.aaprofile" \) -type f -exec \
- sed -i \
--e 's:${B}:${PTEST_PATH}:g' \
-{} +
-sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest
-}
-
-RDEPENDS:${PN}-ptest += "bash make dbus"
-RDEPENDS:${PN}-ptest:remove = "${PN}"
-
-PRIVATE_LIBS:${PN}-ptest = "libdbus-1.so.3"
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index cb4c56db92..8e6f597c0a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/db
[OE-core] [PATCH 2/3] dbus: merge dbus.inc into the recipe
The content is unchanged.
Signed-off-by: Alexander Kanavin
---
meta/recipes-core/dbus/dbus.inc| 39 -
meta/recipes-core/dbus/dbus_1.12.22.bb | 40 +-
2 files changed, 39 insertions(+), 40 deletions(-)
delete mode 100644 meta/recipes-core/dbus/dbus.inc
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
deleted file mode 100644
index 8e6f597c0a..00
--- a/meta/recipes-core/dbus/dbus.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-inherit autotools pkgconfig gettext upstream-version-is-even ptest-gnome
-
-LICENSE = "AFL-2.1 | GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
-
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
-
-SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
- file://run-ptest \
- file://python-config.patch \
- file://tmpdir.patch \
- file://dbus-1.init \
- file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
- file://stop_using_selinux_set_mapping.patch \
-"
-
-SRC_URI[sha256sum] =
"8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474"
-
-EXTRA_OECONF = "--disable-xml-docs \
---disable-doxygen-docs \
---enable-largefile \
---with-system-socket=/run/dbus/system_bus_socket \
---enable-tests \
---enable-checks \
---enable-asserts \
-"
-EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
- user-session \
- "
-PACKAGECONFIG:class-native = ""
-PACKAGECONFIG:class-nativesdk = ""
-
-PACKAGECONFIG[systemd] = "--enable-systemd
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd
--without-systemdsystemunitdir,systemd"
-PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x
--disable-x11-autolaunch, virtual/libx11 libsm"
-PACKAGECONFIG[user-session] = "--enable-user-session
--with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session"
-PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,,"
-PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit"
-PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
diff --git a/meta/recipes-core/dbus/dbus_1.12.22.bb
b/meta/recipes-core/dbus/dbus_1.12.22.bb
index e611e7d98a..792f34c7ef 100644
--- a/meta/recipes-core/dbus/dbus_1.12.22.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.22.bb
@@ -3,7 +3,45 @@ DESCRIPTION = "D-Bus is a message bus system, a simple way for
applications to t
HOMEPAGE = "https://dbus.freedesktop.org";
SECTION = "base"
-require dbus.inc
+inherit autotools pkgconfig gettext upstream-version-is-even ptest-gnome
+
+LICENSE = "AFL-2.1 | GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
+
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
+
+SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://run-ptest \
+ file://python-config.patch \
+ file://tmpdir.patch \
+ file://dbus-1.init \
+ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
+ file://stop_using_selinux_set_mapping.patch \
+"
+
+SRC_URI[sha256sum] =
"8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474"
+
+EXTRA_OECONF = "--disable-xml-docs \
+--disable-doxygen-docs \
+--enable-largefile \
+--with-system-socket=/run/dbus/system_bus_socket \
+--enable-tests \
+--enable-checks \
+--enable-asserts \
+"
+EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
+ user-session \
+ "
+PACKAGECONFIG:class-native = ""
+PACKAGECONFIG:class-nativesdk = ""
+
+PACKAGECONFIG[systemd] = "--enable-systemd
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd
--without-systemdsystemunitdir,systemd"
+PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x
--disable-x11-autolaunch, virtual/libx11 libsm"
+PACKAGECONFIG[user-session] = "--enable-user-session
--with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session"
+PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,,"
+PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0"
RDEPENDS:${PN} += "${PN}-common ${PN}-tools"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply On
[OE-core] [PATCH 3/3] dbus: update 1.12.22 -> 1.14.0
Drop patches:
clear-guid_from_server-if-send_negotiate_unix_f.patch
stop_using_selinux_set_mapping.patch
(both merged upstream)
python-config.patch
(patched code removed upstream)
License-Update: whitespace fixes
Signed-off-by: Alexander Kanavin
---
...from_server-if-send_negotiate_unix_f.patch | 104
.../dbus/dbus/python-config.patch | 34
.../dbus/stop_using_selinux_set_mapping.patch | 148 --
.../dbus/{dbus_1.12.22.bb => dbus_1.14.0.bb} | 11 +-
4 files changed, 4 insertions(+), 293 deletions(-)
delete mode 100644
meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
delete mode 100644 meta/recipes-core/dbus/dbus/python-config.patch
delete mode 100644
meta/recipes-core/dbus/dbus/stop_using_selinux_set_mapping.patch
rename meta/recipes-core/dbus/{dbus_1.12.22.bb => dbus_1.14.0.bb} (94%)
diff --git
a/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
b/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
deleted file mode 100644
index 6bb6d9c82e..00
---
a/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From b8f84bd39485d3977625c9a8b8e8cff5d23be56f Mon Sep 17 00:00:00 2001
-From: Roy Li
-Date: Thu, 27 Feb 2014 09:05:02 +0800
-Subject: [PATCH] dbus: clear guid_from_server if send_negotiate_unix_fd
- failed
-
-Upstream-Status: Submitted
-
-bus-test dispatch test failed with below information:
-./bus/bus-test: Running message dispatch test
-Activating service name='org.freedesktop.DBus.TestSuiteEchoService'
-Successfully activated service 'org.freedesktop.DBus.TestSuiteEchoService'
-6363: assertion failed "_dbus_string_get_length (& DBUS_AUTH_CLIENT
(auth)->guid_from_server) == 0" file "dbus-auth.c" line 1545 function process_ok
- ./bus/bus-test(_dbus_print_backtrace+0x29) [0x80cb969]
- ./bus/bus-test(_dbus_abort+0x14) [0x80cfb44]
- ./bus/bus-test(_dbus_real_assert+0x53) [0x80b52c3]
- ./bus/bus-test() [0x80e24da]
- ./bus/bus-test(_dbus_auth_do_work+0x388) [0x80e3848]
- ./bus/bus-test() [0x80aea49]
- ./bus/bus-test() [0x80affde]
- ./bus/bus-test(_dbus_transport_handle_watch+0xb1) [0x80ad841]
- ./bus/bus-test(_dbus_connection_handle_watch+0x104) [0x8089174]
- ./bus/bus-test(dbus_watch_handle+0xd8) [0x80b15e8]
- ./bus/bus-test(_dbus_loop_iterate+0x4a9) [0x80d1509]
- ./bus/bus-test(bus_test_run_clients_loop+0x5d) [0x808129d]
- ./bus/bus-test() [0x806cab0]
- ./bus/bus-test() [0x806e0ca]
- ./bus/bus-test() [0x806da6f]
- ./bus/bus-test(_dbus_test_oom_handling+0x18c) [0x80b5c8c]
- ./bus/bus-test() [0x806f723]
- ./bus/bus-test(bus_dispatch_test+0x3c) [0x8071aac]
- ./bus/bus-test(main+0x1b7) [0x805acc7]
- /lib/libc.so.6(__libc_start_main+0xf3) [0x45f919b3]
- ./bus/bus-test() [0x805ae39]
-
-The stack is below:
-#0 0xe425 in __kernel_vsyscall ()
-#1 0x45fa62d6 in raise () from /lib/libc.so.6
-#2 0x45fa9653 in abort () from /lib/libc.so.6
-#3 0x080cfb65 in _dbus_abort () at dbus-sysdeps.c:94
-#4 0x080b52c3 in _dbus_real_assert (condition=0,
-condition_text=condition_text@entry=0x8117a38 "_dbus_string_get_length
(& DBUS_AUTH_CLIENT (auth)->guid_from_server) == 0",
-file=file@entry=0x8117273 "dbus-auth.c", line=line@entry=1545,
-func=func@entry=0x8117f8e <__FUNCTION__.3492> "process_ok")
-data=0x8157290) at dbus-connection.c:1515
-#0 0x0033fee353e9 in raise () from /lib64/libc.so.6
-#1 0x0033fee38508 in abort () from /lib64/libc.so.6
-#2 0x0047d585 in _dbus_abort () at dbus-sysdeps.c:94
-#3 0x00466486 in _dbus_real_assert (condition=,
-condition_text=condition_text@entry=0x4c2988 "_dbus_string_get_length
(& DBUS_AUTH_CLIENT (auth)->guid_from_server) == 0",
-file=file@entry=0x4c21a5 "dbus-auth.c", line=line@entry=1546,
-func=func@entry=0x4c2fce <__FUNCTION__.3845> "process_ok")
-at dbus-internals.c:931
-#4 0x0048d424 in process_ok (args_from_ok=0x7fffe480,
-auth=0x6ff340) at dbus-auth.c:1546
-#5 handle_client_state_waiting_for_data (auth=0x6ff340,
-command=, args=0x7fffe480) at dbus-auth.c:1996
-#6 0x0048e789 in process_command (auth=0x6ff340) at
dbus-auth.c:2208
-#7 _dbus_auth_do_work (auth=0x6ff340) at dbus-auth.c:2458
-#8 0x0046091d in do_authentication (
-transport=transport@entry=0x6ffaa0, do_reading=do_reading@entry=1,
-do_writing=do_writing@entry=0,
-auth_completed=auth_completed@entry=0x7fffe55c)
-at dbus-transport-socket.c:442
-#9 0x00461d08 in socket_handle_watch (transport=0x6ffaa0,
-watch=0x6f4190, flags=1) at dbus-transport-socket.c:921
-#10 0x0045fa3a in _dbus_transport_handle_watch (transp
[OE-core] [dunfell][PATCH] perf-tests: add bash into RDEPENDS (v5.12-rc5+)
From: Bruce Ashfield
Upstream commit:
commit 1dc481c0b0cf18d3952d93a73c4ece90dec277f0
Author: Leo Yan
Date: Sat Mar 20 18:45:54 2021 +0800
perf test: Change to use bash for daemon test
When executing the daemon test on Arm64 and x86 with Debian (Buster)
distro, both skip the test case with the log:
Changes tools/perf/tests/shell/daemon.sh to be explicitly bash
(it was already required, but was just skipped on various
distros).
We add it into our RDEPENDS for perf-tests to fixup 5.12+
builds.
We already have relatively heavy RDEPENDS for perf tests (python3), so
adding bash into the RDEPENDS isn't signifcant even for older perf
builds that use the same recipe.
(cherry picked from commit 159cdb159ad0e9d3ed73cfc07f9acd5c0b608e7b)
Signed-off-by: Bruce Ashfield
Signed-off-by: Richard Purdie
---
meta/recipes-kernel/perf/perf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index e04047e85a..9c9bf1647f 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -267,7 +267,7 @@ RDEPENDS_${PN} += "elfutils bash"
RDEPENDS_${PN}-archive =+ "bash"
RDEPENDS_${PN}-python =+ "bash python3 python3-modules
${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
-RDEPENDS_${PN}-tests =+ "python3"
+RDEPENDS_${PN}-tests =+ "python3 bash"
RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting',
'${PN}-perl ${PN}-python', '',d)}"
RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162992):
https://lists.openembedded.org/g/openembedded-core/message/162992
Mute This Topic: https://lists.openembedded.org/mt/89673138/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libtool: Recognise additional linker commandline options passed by clang
Like stdlib, these options are also used to select runtime libraries by
clang driver
Signed-off-by: Khem Raj
---
.../libtool/libtool-2.4.6.inc | 1 +
...in.in-Parse-additional-clang-options.patch | 37 +++
2 files changed, 38 insertions(+)
create mode 100644
meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index 2b5fd8fd942..ad6f5e6b6eb 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -26,6 +26,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \
file://libool.m4-add-ARFLAGS-variable.patch \
file://ARFLAGS-use-cr-instead-of-cru-by-default.patch \
+ file://0001-ltmain.in-Parse-additional-clang-options.patch \
"
SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e"
diff --git
a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
new file mode 100644
index 000..d59b5a834eb
--- /dev/null
+++
b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
@@ -0,0 +1,37 @@
+From c3b90d6107a1b638477d5f4dcee48af289647af7 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Wed, 9 Mar 2022 12:52:51 -0800
+Subject: [PATCH] ltmain.in: Parse additional clang options
+
+clang uses -rtlib and --unwindlib to select proper compiler runtime in
+some cases. There fore pass these options to linker when found in
+ldflags
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+---
+ build-aux/ltmain.in | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 6a7bb72..c355c0c 100644
+--- a/build-aux/ltmain.in
b/build-aux/ltmain.in
+@@ -5423,10 +5423,13 @@ func_mode_link ()
+ # --sysroot=* for sysroot support
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time
optimization
+ # -stdlib=*select c++ std lib with clang
++ # -rtlib=* select c runtime lib with clang
++ # --unwindlib=*select unwinder library with clang
+ # -f*-prefix-map* needed for lto linking
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-f*-prefix-map*)
++
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++ -rtlib=*|--unwindlib=*|-f*-prefix-map*)
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ func_append compile_command " $arg"
+--
+2.35.1
+
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162991):
https://lists.openembedded.org/g/openembedded-core/message/162991
Mute This Topic: https://lists.openembedded.org/mt/89672313/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] unzip: Pass LDFLAGS to configure tests
Ensures the configure time tests are compiled/linked with the Options
that it will be using to build.
Signed-off-by: Khem Raj
---
...ass-LDFLAGS-to-tests-doing-link-step.patch | 137 ++
meta/recipes-extended/unzip/unzip_6.0.bb | 1 +
2 files changed, 138 insertions(+)
create mode 100644
meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch
diff --git
a/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch
b/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch
new file mode 100644
index 000..716766de294
--- /dev/null
+++
b/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch
@@ -0,0 +1,137 @@
+From da29ba6a27d8e78562052c79061476848915eb2a Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Wed, 9 Mar 2022 12:13:28 -0800
+Subject: [PATCH] configure: Pass LDFLAGS to tests doing link step
+
+Ensures that right flags from recipes are honored, otherwise tests fail
+which otherwise should not.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+---
+ unix/configure | 28 ++--
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/unix/configure b/unix/configure
+index d4b0a8e..49579f3 100755
+--- a/unix/configure
b/unix/configure
+@@ -116,7 +116,7 @@ _EOF_
+ # Special Mac OS X shared library "ld" option?
+ if test ` uname -s 2> /dev/null ` = 'Darwin'; then
+ lf='-Wl,-search_paths_first'
+- $CC $CFLAGS $lf conftest.c > /dev/null 2>/dev/null
++ $CC $CFLAGS $LDFLAGS $lf conftest.c > /dev/null 2>/dev/null
+ if test $? -eq 0; then
+ BZLF=${lf}
+ fi
+@@ -276,7 +276,7 @@ int main()
+ }
+ _EOF_
+ # compile it
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+ echo -- no Large File Support
+ else
+@@ -322,7 +322,7 @@ int main()
+ }
+ _EOF_
+ # compile it
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+ echo "-- no Unicode (wchar_t) support"
+ else
+@@ -383,7 +383,7 @@ for func in fchmod fchown lchown nl_langinfo
+ do
+ echo Check for $func
+ echo "int main(){ $func(); return 0; }" > conftest.c
+- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
++ $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
+ done
+
+@@ -395,14 +395,14 @@ temp_link="link_$$"
+ echo "int main() { lchmod(\"${temp_file}\", 0666); }" \
+ ) > conftest.c
+ ln -s "${temp_link}" "${temp_file}" && \
+- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null && \
++ $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null && \
+ ./conftest
+ [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DNO_LCHMOD"
+ rm -f "${temp_file}"
+
+ echo Check for memset
+ echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DZMEM"
+
+ echo Check for errno declaration
+@@ -422,12 +422,12 @@ cat > conftest.c << _EOF_
+ int main() { return closedir(opendir(".")); }
+ _EOF_
+
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+ OPT=""
+ for lib in ndir dir ucb bsd BSD PW x dirent
+ do
+-$CC -o conftest conftest.c -l$lib >/dev/null 2>/dev/null
++$CC $CLFAGS $LDFLAGS -o conftest conftest.c -l$lib >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && OPT=-l$lib && break
+ done
+ if [ ${OPT} ]; then
+@@ -440,9 +440,9 @@ fi
+ # Dynix/ptx 1.3 needed this
+ echo Check for readlink
+ echo "int main(){ return readlink(); }" > conftest.c
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+- $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lseq >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq"
+ fi
+
+@@ -501,7 +501,7 @@ int main()
+ }
+ _EOF_
+ # compile it
+-$CC ${CFLAGS} ${CFLAGSR} -o conftest conftest.c >/dev/null 2>/dev/null
++$CC ${CFLAGS} ${CFLAGSR} $LDFLAGS -o conftest conftest.c >/dev/null
2>/dev/null
+ if [ $? -ne 0 ]; then
+ echo "-- no MBCS support"
+ CFLAGSR="${CFLAGSR} -DNO_MBCS"
+@@ -515,7 +515,7 @@ else
+ do
+ echo Check for MBCS $func
+ echo "int main() { $func(); return 0; }" > conftest.c
+-$CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
++$CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && CFLAGSR="${CFLAGSR} -D`echo $func | tr '[a-z]'
'[A-Z]'`=$func"
Re: [OE-core] [PATCH v2] pip_install_wheel: install wheel with a glob
On Wed, Mar 9, 2022 at 9:14 AM Khem Raj wrote:
> On Wed, Mar 9, 2022 at 8:51 AM Ross Burton wrote:
> >
> > Now that the build systems that use pip_install_wheel are all building
> > their wheel into a directory that we knew was empty before, we can just
> > install *.whl and not need to know the precise names.
> >
> > By design a pyproject.toml will always build a single wheel, so there
> > shouldn't be any way for this to end up installing more than expected.
> >
> > This obsoletes PIP_INSTALL_PACKAGE and PYPA_WHEEL, neither of which are
> > needed anymore.
> >
>
> this looks a better approach, we can unbold ton of workaround on
> meta-openembedded with this
Agreed. The second set of eyes on this is improving things dramatically.
>
> > Signed-off-by: Ross Burton
> > ---
> > meta/classes/pip_install_wheel.bbclass | 20
> > 1 file changed, 8 insertions(+), 12 deletions(-)
> >
> > diff --git a/meta/classes/pip_install_wheel.bbclass
> b/meta/classes/pip_install_wheel.bbclass
> > index 954a6b750f..3861dae75a 100644
> > --- a/meta/classes/pip_install_wheel.bbclass
> > +++ b/meta/classes/pip_install_wheel.bbclass
> > @@ -1,20 +1,10 @@
> > DEPENDS:append = " python3-pip-native"
> >
> > -def guess_pip_install_package_name(d):
> > -import re
> > -'''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode'
> ''
> > -name = d.getVar('PYPI_PACKAGE') or re.sub(r"^python3-", "",
> d.getVar('BPN'))
> > -return name.replace('-', '_')
> > -
> > -PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
> > -
> > # The directory where wheels should be written too. Build classes
> > # will ideally [cleandirs] this but we don't do that here in case
> > # a recipe wants to install prebuilt wheels.
> > PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
> >
> > -PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
> > -
> > PIP_INSTALL_ARGS = "\
> > - \
> > --ignore-installed \
> > @@ -29,8 +19,14 @@ PIP_INSTALL_PYTHON = "python3"
> > PIP_INSTALL_PYTHON:class-native = "nativepython3"
> >
> > pip_install_wheel_do_install () {
> > -nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
> > - bbfatal_log "Failed to pip install wheel. Check the logs."
> > +COUNT=$(find ${PIP_INSTALL_DIST_PATH} -name '*.whl' | wc -l)
> > +if test $COUNT -eq 0; then
> > +bbfatal No wheels found in ${PIP_INSTALL_DIST_PATH}
> > +elif test $COUNT -gt 1; then
> > +bbfatal More than one wheel found in ${PIP_INSTALL_DIST_PATH},
> this should not happen
> > +fi
> > +
> > +nativepython3 -m pip install ${PIP_INSTALL_ARGS}
> ${PIP_INSTALL_DIST_PATH}/*.whl
> >
> > cd ${D}
> > for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> > --
> > 2.25.1
> >
> >
> >
> >
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162989):
https://lists.openembedded.org/g/openembedded-core/message/162989
Mute This Topic: https://lists.openembedded.org/mt/89666433/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/1] go.bbclass: Allow network in do_compile
On Wed, Mar 9, 2022 at 3:10 AM wrote: > > On Thu, Mar 3, 2022 at 05:46 PM, Bruce Ashfield wrote: > > On Thu, Mar 3, 2022 at 10:13 AM wrote: > > On Thu, Mar 3, 2022 at 04:34 AM, Bruce Ashfield wrote: > > On Wed, Mar 2, 2022 at 4:57 PM Andrei Gherzan wrote: > > > Mar 1, 2022 20:15:52 Bruce Ashfield : > > On Tue, Mar 1, 2022 at 10:54 AM wrote: > > On Tue, Mar 1, 2022 at 02:14 PM, Bruce Ashfield wrote: > > On Tue, Mar 1, 2022 at 6:42 AM Andrei Gherzan wrote: > > > On Tue, 1 Mar 2022, at 01:55, Bruce Ashfield wrote: > > On Mon, Feb 28, 2022 at 8:17 PM Bruce Ashfield via > lists.openembedded.org > wrote: > > > On Mon, Feb 28, 2022 at 6:54 PM Andrei Gherzan wrote: > > > From: Andrei Gherzan > > Compile pulls in the go.mod list requiring network. Without this, do > compile would fail with a similar error to the following: > > dial tcp: lookup proxy.golang.org: Temporary failure in name resolution > > This is something that needs to be carried in your own layers, IMHO it > isn't appropriate for core. > > It isn't about the fetching, it is the entire gap in functionality > that we are missing if go starts fetching dependencies during compile. > > A further thought is that if this is for go.mod issues, there is the > go-mod.bbclass. > > Perhaps enabling it in that class and doing a bbwarn about go fetching > dependencies would be appropriate ? > > Otherwise, someone may not know that this is happening and that a no > network configuration has no chance of working. > > I reckon that is reasonable. I'll personally go down the recipe level to > workaround this change but understanding and agreeing with the reasoning > behind this change, I want to invest a bit into trying to find a proper > solution in the core. Bruce, I know you invested a fair amount of time into > this already. Would you be willing to sync up and see how we can work > together in tackling this? > > Definitely, more ideas are good. In fact, I think there are probably > several approaches that can co-exist, depending on what a > recipe/developer needs. > > I'm in the Eastern time zone here, and will try and grab folks on IRC > to have a level set > > Bruce > > Added Zyga to CC as he is also interested in this as part of his go > development activities. > > Thanks, > Andrei > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > > The problem in allowing downloads during compile (e.g. by go) is, that it > leads to non-reproducable builds. I'm currently facing the same issue and > would like to have a reproducable go *offline* build. > I would like to propose two ideas to workaround the go-compile fetching issue: > > First: > - Fetch go-dependencies using go.mod file from 'proxy.golang.org' (e.g. by > writing a seperate go fetcher or a wget-fetcher) and unpack the dependencies > into go projects 'vendor' folder. This forces go to compile offline. However, > one have to generate the 'modules.txt' file in the vendor folder 'manually' > during unpack. This is error prone, as there is no official documentation how > this format should look like. Anyway, I've tried this approach and it works > for me. > > Second: > - Fetch go-dependencies using go.mod file from 'proxy.golang.org' (e.g. by > writing a seperate go fetcher) and unpack the dependencies into a local > (workdir) go-path. This seemed a good solution for me as the go-path is well > defined. But for some reason 'go' fetches the zip-files during compile into > it's download-cache AGAIN, even if the source is already unpacked in the > go-path. I'll assume this is required to verify the source files integrity?! > With this approach one have to adapt 'go' to suppress this download behaviour. > > I've been doing offline builds using a constructed vendor/ directory > and generated modules.txt. > > The only difference between what I have working and what you are > suggesting (type 1), is that I've gone directly to the sources and > constructed the vendor directory using the OE git fetcher. That allows > all functionality to continue to work that is part of OEcore, and the > build to continue. Switching out the git fetches for tarballs would > be possible, I just wasn't sure how to use the proxied modules (and I > wanted the history for debug). > > I've never had any issues with the modules.txt, as I generate it at > the same time as the git fetch lines for the SRC_URI. I've also not > been using information from the go.mod directly from go.proxy.org, it > is information I've generated from a clone of the project and dumped > via go mod. There's likely improvements I can do there, but with what > I'm doing, I'm going directly to the source of the projects and doing > clones, which keeps everything clear of the go infrastructure. > > I have a utility that I'm still cleaning up that generates the SRC_URI > lines, as well as the modules.txt, when I resolve a few nagging > issues, I'll make
Re: [OE-core] [PATCH] pango: upgrade 1.50.4 -> 1.50.5
On Tue, 2022-03-08 at 18:34 +0800, wangmy wrote:
> Changelog:
> =
> * Fix compiler warnings
> * Enable cairo by default
> * pango-view: Show more baselines
> * layout: Handle baselines
> * Windows: build cleanups
>
> Signed-off-by: Wang Mingyu
> ---
> .../recipes-graphics/pango/{pango_1.50.4.bb => pango_1.50.5.bb} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta/recipes-graphics/pango/{pango_1.50.4.bb => pango_1.50.5.bb} (94%)
>
> diff --git a/meta/recipes-graphics/pango/pango_1.50.4.bb
> b/meta/recipes-graphics/pango/pango_1.50.5.bb
> similarity index 94%
> rename from meta/recipes-graphics/pango/pango_1.50.4.bb
> rename to meta/recipes-graphics/pango/pango_1.50.5.bb
> index 0ea621bf67..3a0cbd57f0 100644
> --- a/meta/recipes-graphics/pango/pango_1.50.4.bb
> +++ b/meta/recipes-graphics/pango/pango_1.50.5.bb
> @@ -20,7 +20,7 @@ GIR_MESON_DISABLE_FLAG = "disabled"
>
> SRC_URI += "file://run-ptest"
>
> -SRC_URI[archive.sha256sum] =
> "f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162"
> +SRC_URI[archive.sha256sum] =
> "6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5"
>
> DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv
> cairo harfbuzz fribidi"
I worry this may be causing:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/3211
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162987):
https://lists.openembedded.org/g/openembedded-core/message/162987
Mute This Topic: https://lists.openembedded.org/mt/89634080/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] glib-2.0: upgrade 2.70.4 -> 2.71.3
On Wednesday, 9 March 2022, 17:52:49 CET, Alexander Kanavin wrote: > 2.71.x is a development release, and should not be used. glib follows > odd-even version scheme. I already supposed something like this, but I didn't find any documentation about GLib's versioning scheme... Would be nice if there were some docs about that (particularly as the GNOME project moved away from odd/even release ([1], search for "even/odd")). regards, Christian > > Alex > [1] https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162986): https://lists.openembedded.org/g/openembedded-core/message/162986 Mute This Topic: https://lists.openembedded.org/mt/89665588/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] Change internal variables
Signed-off-by: Saul Wold
---
meta/classes/base.bbclass | 4 +--
meta/classes/cross-canadian.bbclass | 6 ++--
meta/classes/cve-check.bbclass| 31 ++-
meta/classes/insane.bbclass | 7 +++--
meta/classes/populate_sdk_ext.bbclass | 18 +--
meta/classes/sstate.bbclass | 4 +--
.../distro/include/cve-extra-exclusions.inc | 2 +-
meta/conf/distro/include/security_flags.inc | 2 +-
meta/lib/oe/utils.py | 4 +--
meta/lib/oeqa/manual/bsp-hw.json | 2 +-
.../lib/oeqa/selftest/cases/containerimage.py | 2 +-
scripts/lib/checklayer/cases/bsp.py | 2 +-
scripts/verify-bashisms | 10 +++---
13 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index b7869da3b3..cc81461473 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -329,9 +329,9 @@ python base_eventhandler() {
source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False)
if not source_mirror_fetch:
provs = (d.getVar("PROVIDES") or "").split()
-multiwhitelist = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or
"").split()
+multiprovidersallowed = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or
"").split()
for p in provs:
-if p.startswith("virtual/") and p not in multiwhitelist:
+if p.startswith("virtual/") and p not in multiprovidersallowed:
profprov = d.getVar("PREFERRED_PROVIDER_" + p)
if profprov and pn != profprov:
raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set
to %s, not %s" % (p, profprov, pn))
diff --git a/meta/classes/cross-canadian.bbclass
b/meta/classes/cross-canadian.bbclass
index ac82e86356..a0e9d23836 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -36,7 +36,7 @@ python () {
return
tos = d.getVar("TARGET_OS")
-whitelist = ["mingw32"]
+tos_known = ["mingw32"]
extralibcs = [""]
if "musl" in d.getVar("BASECANADIANEXTRAOS"):
extralibcs.append("musl")
@@ -51,8 +51,8 @@ python () {
entry = entry + "-gnu" + variant
elif libc:
entry = entry + "-" + libc
-whitelist.append(entry)
-if tos not in whitelist:
+tos_known.append(entry)
+if tos not in tos_known:
bb.fatal("Building cross-candian for an unknown TARGET_SYS (%s),
please update cross-canadian.bbclass" % d.getVar("TARGET_SYS"))
for n in ["PROVIDES", "DEPENDS"]:
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 079d09a76f..dfad10c22b 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -43,11 +43,12 @@ CVE_CHECK_CREATE_MANIFEST ??= "1"
CVE_CHECK_REPORT_PATCHED ??= "1"
-# Whitelist for packages (PN)
+# Skip CVE Check for packages (PN)
CVE_CHECK_SKIP_RECIPE ?= ""
-# Whitelist for CVE. If a CVE is found, then it is considered patched.
-# The value is a string containing space separated CVE values:
+# Ingore the check for a given list of CVEs. If a CVE is found,
+# then it is considered patched. The value is a string containing
+# space separated CVE values:
#
# CVE_CHECK_IGNORE = 'CVE-2014-2524 CVE-2018-1234'
#
@@ -101,10 +102,10 @@ python do_cve_check () {
patched_cves = get_patched_cves(d)
except FileNotFoundError:
bb.fatal("Failure in searching patches")
-whitelisted, patched, unpatched = check_cves(d, patched_cves)
+ignored, patched, unpatched = check_cves(d, patched_cves)
if patched or unpatched:
cve_data = get_cve_info(d, patched + unpatched)
-cve_write_data(d, patched, unpatched, whitelisted, cve_data)
+cve_write_data(d, patched, unpatched, ignored, cve_data)
else:
bb.note("No CVE database found, skipping CVE check")
@@ -176,12 +177,12 @@ def check_cves(d, patched_cves):
return ([], [], [])
pv = d.getVar("CVE_VERSION").split("+git")[0]
-# If the recipe has been whitelisted we return empty lists
+# If the recipe has been skipped/ignored we return empty lists
if pn in d.getVar("CVE_CHECK_SKIP_RECIPE").split():
-bb.note("Recipe has been whitelisted, skipping check")
+bb.note("Recipe has been skipped by cve-check")
return ([], [], [])
-cve_whitelist = d.getVar("CVE_CHECK_IGNORE").split()
+cve_ignore = d.getVar("CVE_CHECK_IGNORE").split()
import sqlite3
db_file = d.expand("file:${CVE_CHECK_DB_FILE}?mode=ro")
@@ -198,9 +199,9 @@ def check_cves(d, patched_cves):
for cverow in conn.execute("SELECT DISTINCT ID FROM PRODUCTS WHERE
PRODUCT IS ? AND VENDOR LIKE ?", (product, vendor)):
cve = cverow[0]
-
Re: [OE-core] [PATCH] pip_install_wheel: install wheel with a glob
On Wed, 9 Mar 2022 at 17:20, Khem Raj wrote: > will install work if there are more than one .whl file expected ? > I think we will get install failures, in that case it maybe just an > over optimization I confirmed with Python developers that a single project (ie a pyproject.toml) will build a single wheel. If a single recipe builds multiple wheels then it's already doing funky things, and we can revisit this then. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162984): https://lists.openembedded.org/g/openembedded-core/message/162984 Mute This Topic: https://lists.openembedded.org/mt/89664344/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH RESEND] conf/machine: fix QEMU x86 sound options
On Wed, Mar 9, 2022 at 2:03 AM Michael Opdenacker via lists.openembedded.org wrote: > > This updates the QEMU sounds options for x86 emulation, > when "runqemu" is called with the "audio" argument, > to fix the below error: > > runqemu - ERROR - Failed to run qemu: qemu-system-x86_64: warning: '-soundhw > ac97' is deprecated, please use '-device AC97' instead > > Signed-off-by: Michael Opdenacker > --- > meta/classes/qemuboot.bbclass | 2 +- > meta/conf/machine/include/x86/qemuboot-x86.inc | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass > index 755d49acd6..ad8489902a 100644 > --- a/meta/classes/qemuboot.bbclass > +++ b/meta/classes/qemuboot.bbclass > @@ -29,7 +29,7 @@ > # > # QB_AUDIO_DRV: qemu audio driver, e.g., "alsa", set it when support audio > # > -# QB_AUDIO_OPT: qemu audio option, e.g., "-soundhw ac97,es1370", used > +# QB_AUDIO_OPT: qemu audio option, e.g., "-device AC97", used > # when QB_AUDIO_DRV is set. > # > # QB_RNG: Pass-through for host random number generator, it can speedup boot > diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc > b/meta/conf/machine/include/x86/qemuboot-x86.inc > index d3b91070a8..b7b6428e44 100644 > --- a/meta/conf/machine/include/x86/qemuboot-x86.inc > +++ b/meta/conf/machine/include/x86/qemuboot-x86.inc > @@ -8,7 +8,7 @@ QB_CPU:x86-64 = "-cpu IvyBridge -machine q35" > QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35" > > QB_AUDIO_DRV = "alsa" > -QB_AUDIO_OPT = "-soundhw ac97,es1370" > +QB_AUDIO_OPT = "-device AC97" we are also dropping es1370 here, can you comment on it. > QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check > rcupdate.rcu_expedited=1" > QB_OPT_APPEND = "-usb -device usb-tablet" > > -- > 2.25.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162983): https://lists.openembedded.org/g/openembedded-core/message/162983 Mute This Topic: https://lists.openembedded.org/mt/89658861/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] pip_install_wheel: install wheel with a glob
On Wed, Mar 9, 2022 at 7:57 AM Konrad Weihmann wrote: > > > > On 09.03.22 16:53, Ross Burton wrote: > > On Wed, 9 Mar 2022 at 15:47, Konrad Weihmann wrote: > >> Can we, for the very unlikely case that do have more than one wheel in > >> this dir, bbfatal out here as well - otherwise I'm worried that this > >> will never get noticed > > > > I'm undecided on this. In the unlikely case (impossible, by design) > > that a number of wheels are built for a single package, wouldn't we > > want to install all of them as we're building the package? > > Classic assertion case IMO - as you said there shouldn't more than one, > but in the event of having more than one, I would just terminate the > build, as likely something is very wrong (like people playing around if > task appends or custom tasks in between compile and install). > > I'm just concerned that this here would create a blind spot, where there > none needed will install work if there are more than one .whl file expected ? I think we will get install failures, in that case it maybe just an over optimization > > > > > Ross > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162982): https://lists.openembedded.org/g/openembedded-core/message/162982 Mute This Topic: https://lists.openembedded.org/mt/89664344/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] pip_install_wheel: install wheel with a glob
On Wed, Mar 9, 2022 at 8:51 AM Ross Burton wrote:
>
> Now that the build systems that use pip_install_wheel are all building
> their wheel into a directory that we knew was empty before, we can just
> install *.whl and not need to know the precise names.
>
> By design a pyproject.toml will always build a single wheel, so there
> shouldn't be any way for this to end up installing more than expected.
>
> This obsoletes PIP_INSTALL_PACKAGE and PYPA_WHEEL, neither of which are
> needed anymore.
>
this looks a better approach, we can unbold ton of workaround on
meta-openembedded with this
> Signed-off-by: Ross Burton
> ---
> meta/classes/pip_install_wheel.bbclass | 20
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/meta/classes/pip_install_wheel.bbclass
> b/meta/classes/pip_install_wheel.bbclass
> index 954a6b750f..3861dae75a 100644
> --- a/meta/classes/pip_install_wheel.bbclass
> +++ b/meta/classes/pip_install_wheel.bbclass
> @@ -1,20 +1,10 @@
> DEPENDS:append = " python3-pip-native"
>
> -def guess_pip_install_package_name(d):
> -import re
> -'''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode'''
> -name = d.getVar('PYPI_PACKAGE') or re.sub(r"^python3-", "",
> d.getVar('BPN'))
> -return name.replace('-', '_')
> -
> -PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
> -
> # The directory where wheels should be written too. Build classes
> # will ideally [cleandirs] this but we don't do that here in case
> # a recipe wants to install prebuilt wheels.
> PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
>
> -PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
> -
> PIP_INSTALL_ARGS = "\
> - \
> --ignore-installed \
> @@ -29,8 +19,14 @@ PIP_INSTALL_PYTHON = "python3"
> PIP_INSTALL_PYTHON:class-native = "nativepython3"
>
> pip_install_wheel_do_install () {
> -nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
> - bbfatal_log "Failed to pip install wheel. Check the logs."
> +COUNT=$(find ${PIP_INSTALL_DIST_PATH} -name '*.whl' | wc -l)
> +if test $COUNT -eq 0; then
> +bbfatal No wheels found in ${PIP_INSTALL_DIST_PATH}
> +elif test $COUNT -gt 1; then
> +bbfatal More than one wheel found in ${PIP_INSTALL_DIST_PATH}, this
> should not happen
> +fi
> +
> +nativepython3 -m pip install ${PIP_INSTALL_ARGS}
> ${PIP_INSTALL_DIST_PATH}/*.whl
>
> cd ${D}
> for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162981):
https://lists.openembedded.org/g/openembedded-core/message/162981
Mute This Topic: https://lists.openembedded.org/mt/89666433/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/2] qemu: Fix build when x11 is not in distro features
There is use of MESA_EGL_NO_X11_HEADERS which is now renamed in newer headers to
EGL_NO_X11 from mesa/khronos headers, however this define is
relatively new and 3D stacks do not have this adopted but apps
like qemu and bunch of others depend on it, I guess they assume mesa.
One can argue that its better to fix the 3D stacks to behave
like mesa but this means every BSP using these stacks will need to
carry such a fix.
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/include/EGL/eglplatform.h
Signed-off-by: Khem Raj
---
meta/recipes-devtools/qemu/qemu_6.2.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
index 062ed32b015..c7eef0a9d5e 100644
--- a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
@@ -6,6 +6,8 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native
meson-native"
DEPENDS:append:libc-musl = " libucontext"
+CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
'-DEGL_NO_X11=1', d)}"
+
RDEPENDS:${PN}:class-target += "bash"
EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162979):
https://lists.openembedded.org/g/openembedded-core/message/162979
Mute This Topic: https://lists.openembedded.org/mt/89666903/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] webkitgtk: Fix build when x11 is not in distro features
ANGLE's copy of khrplatform.h is not uptodate with mesa/khronos khrplatform.h
which uses MESA_EGL_NO_X11_HEADERS which is now renamed in newer headers to
EGL_NO_X11 from mesa/khronos headers, however this define is
relatively new and 3D stacks do not have this adopted but apps
like qemu and bunch of others depend on it, I guess they assume mesa.
One can argue that its better to fix the 3D stacks to behave
like mesa but this means every BSP using these stacks will need to
carry such a fix.
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/include/EGL/eglplatform.h
This patch helps with that
Signed-off-by: Khem Raj
---
meta/recipes-sato/webkit/webkitgtk_2.34.6.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb
b/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb
index 8cea8a86000..6870eed5259 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb
@@ -98,6 +98,9 @@ EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF "
CFLAGS:append:arc = " -mlong-calls"
CXXFLAGS:append:arc = " -mlong-calls"
+# Needed for non-mesa graphics stacks when x11 is disabled
+CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
'-DEGL_NO_X11=1', d)}"
+
# Javascript JIT is not supported on powerpc
EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF "
EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF "
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162980):
https://lists.openembedded.org/g/openembedded-core/message/162980
Mute This Topic: https://lists.openembedded.org/mt/89666904/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] qemu: Fix build when x11 is not in distro features
Can you add this to the commit message please?
Alex
On Wed, 9 Mar 2022 at 17:47, Khem Raj wrote:
>
> On Tue, Mar 8, 2022 at 10:38 PM Alexander Kanavin
> wrote:
> >
> > Also, what error specifically are you seeing? How is your build set up?
> >
>
> There is use of MESA_EGL_NO_X11_HEADERS which is now renamed in newer headers
> to
> EGL_NO_X11 from mesa/khronos headers, however this define is
> relatively new and 3D stacks do not have this adopted but apps
> like qemu and bunch of others depend on it, I guess they assume mesa.
> One can argue that its better to fix the 3D stacks to behave
> like mesa but this means every BSP using these stacks will need to
> carry such a fix.
>
> https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/include/EGL/eglplatform.h
>
> > Alex
> >
> > On Wed 9. Mar 2022 at 7.11, Alexander Kanavin via lists.openembedded.org
> > wrote:
> >>
> >> Why is this issue not seen on autobuilder’s no-x11 job?
> >>
> >> Alex
> >>
> >> On Wed 9. Mar 2022 at 2.18, Khem Raj wrote:
> >>>
> >>> Signed-off-by: Khem Raj
> >>> ---
> >>> meta/recipes-devtools/qemu/qemu_6.2.0.bb | 2 ++
> >>> 1 file changed, 2 insertions(+)
> >>>
> >>> diff --git a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
> >>> b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
> >>> index 062ed32b015..c7eef0a9d5e 100644
> >>> --- a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
> >>> +++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
> >>> @@ -6,6 +6,8 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native
> >>> meson-native"
> >>>
> >>> DEPENDS:append:libc-musl = " libucontext"
> >>>
> >>> +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
> >>> '-DEGL_NO_X11=1', d)}"
> >>> +
> >>> RDEPENDS:${PN}:class-target += "bash"
> >>>
> >>> EXTRA_OECONF:append:class-target = "
> >>> --target-list=${@get_qemu_target_list(d)}"
> >>> --
> >>> 2.35.1
> >>>
> >>>
> >>>
> >>>
> >>
> >>
> >>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162978):
https://lists.openembedded.org/g/openembedded-core/message/162978
Mute This Topic: https://lists.openembedded.org/mt/89652908/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 03/16] dbus: update 1.12.22 -> 1.14.0
On Wed, 9 Mar 2022 at 17:39, Richard Purdie wrote: > > It's atomic with dbus gaining a glib dependency unfortunately. I don't > > want to break bisection. > > Are you saying that dbus gained a hard glib dependency? That wasn't clear from > the commit message if so and is an important detail... Only dbus tests (and they always had it), not dbus itself. I can look into making it optional subject to enabling tests, and split the tests rearrangement from the version update. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162977): https://lists.openembedded.org/g/openembedded-core/message/162977 Mute This Topic: https://lists.openembedded.org/mt/89633519/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] glib-2.0: upgrade 2.70.4 -> 2.71.3
2.71.x is a development release, and should not be used. glib follows
odd-even version scheme.
Alex
On Wed, 9 Mar 2022 at 17:18, Christian Eggers wrote:
>
> - 0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch:
> dropped (integrated upstream)
>
> Signed-off-by: Christian Eggers
> ---
> ...-correctly-when-building-with-mingw3.patch | 32 +++--
> ...degen.py-bump-timeout-to-100-seconds.patch | 26 --
> ...ble-more-tests-while-cross-compiling.patch | 48 ++-
> ...{glib-2.0_2.70.4.bb => glib-2.0_2.71.3.bb} | 3 +-
> 4 files changed, 44 insertions(+), 65 deletions(-)
> delete mode 100644
> meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.70.4.bb => glib-2.0_2.71.3.bb}
> (93%)
>
> diff --git
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
>
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> index 8a6d46df799b..59de3fa969a4 100644
> ---
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> +++
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> @@ -1,11 +1,10 @@
> -From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001
> +From 4f327be49fd6ac5a77da6e48459b37f37a601977 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin
> Date: Wed, 13 Feb 2019 15:32:05 +0100
> Subject: [PATCH] Set host_machine correctly when building with mingw32
>
> Upstream-Status: Inappropriate [oe-core specific]
> Signed-off-by: Alexander Kanavin
> -
> ---
> gio/tests/meson.build | 8
> glib/tests/meson.build | 2 +-
> @@ -14,10 +13,10 @@ Signed-off-by: Alexander Kanavin
> 4 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/gio/tests/meson.build b/gio/tests/meson.build
> -index 3a19c82..b762835 100644
> +index abe676767c60..34b347815308 100644
> --- a/gio/tests/meson.build
> +++ b/gio/tests/meson.build
> -@@ -27,7 +27,7 @@ test_c_args = [
> +@@ -27,7 +27,7 @@ if build_machine.system() == 'linux'
> endif # libutil.length() > 0
> endif # build_machine.system() == 'linux'
>
> @@ -26,7 +25,7 @@ index 3a19c82..b762835 100644
> common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library
> ('secur32')]
> endif
>
> -@@ -148,7 +148,7 @@ else
> +@@ -176,7 +176,7 @@ else
> endif
>
> # Test programs buildable on UNIX only
> @@ -35,7 +34,7 @@ index 3a19c82..b762835 100644
> gio_tests += {
> 'file' : {},
> 'gdbus-peer' : {
> -@@ -402,7 +402,7 @@ if host_machine.system() != 'windows'
> +@@ -434,7 +434,7 @@ if host_machine.system() != 'windows'
> endif # unix
>
> # Test programs buildable on Windows only
> @@ -44,7 +43,7 @@ index 3a19c82..b762835 100644
> gio_tests += {'win32-streams' : {}}
> endif
>
> -@@ -472,7 +472,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
> +@@ -504,7 +504,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
> }
> endif
>
> @@ -54,10 +53,10 @@ index 3a19c82..b762835 100644
> 'gdbus-example-unix-fd-client' : {
> 'install' : false,
> diff --git a/glib/tests/meson.build b/glib/tests/meson.build
> -index 6eb23e8..36eb919 100644
> +index a0c64afe6ae9..48407f99569c 100644
> --- a/glib/tests/meson.build
> +++ b/glib/tests/meson.build
> -@@ -142,7 +142,7 @@ if glib_conf.has('HAVE_EVENTFD')
> +@@ -151,7 +151,7 @@ if glib_conf.has('HAVE_EVENTFD')
> }
> endif
>
> @@ -67,10 +66,10 @@ index 6eb23e8..36eb919 100644
> glib_tests += {
> 'gpoll' : {
> diff --git a/meson.build b/meson.build
> -index 47f3a5c..7ea7ad1 100644
> +index e0b14319fb58..f6756a3c7dfb 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -32,6 +32,9 @@ else
> +@@ -54,6 +54,9 @@ else
> endif
>
> host_system = host_machine.system()
> @@ -81,15 +80,18 @@ index 47f3a5c..7ea7ad1 100644
> if host_system == 'darwin'
> ios_test_code = '''#include
> diff --git a/tests/meson.build b/tests/meson.build
> -index 6741f8f..12fdc90 100644
> +index 5ff99a4a8258..8a4dad0ccae7 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> -@@ -73,7 +73,7 @@ test_extra_programs = {
> - 'unicode-collate' : {},
> +@@ -53,7 +53,7 @@ test_extra_programs = {
> + 'assert-msg-test' : {},
> }
>
> -if host_machine.system() != 'windows'
> +if host_system != 'windows'
> tests += {
> 'timeloop' : {},
> - 'iochannel-test' : {},
> + }
> +--
> +2.34.1
> +
> diff --git
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
>
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
> deleted file mode 100644
> index 7690bb37a6be..
> ---
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
> +++ /
[OE-core] [PATCH v2] pip_install_wheel: install wheel with a glob
Now that the build systems that use pip_install_wheel are all building
their wheel into a directory that we knew was empty before, we can just
install *.whl and not need to know the precise names.
By design a pyproject.toml will always build a single wheel, so there
shouldn't be any way for this to end up installing more than expected.
This obsoletes PIP_INSTALL_PACKAGE and PYPA_WHEEL, neither of which are
needed anymore.
Signed-off-by: Ross Burton
---
meta/classes/pip_install_wheel.bbclass | 20
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/meta/classes/pip_install_wheel.bbclass
b/meta/classes/pip_install_wheel.bbclass
index 954a6b750f..3861dae75a 100644
--- a/meta/classes/pip_install_wheel.bbclass
+++ b/meta/classes/pip_install_wheel.bbclass
@@ -1,20 +1,10 @@
DEPENDS:append = " python3-pip-native"
-def guess_pip_install_package_name(d):
-import re
-'''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode'''
-name = d.getVar('PYPI_PACKAGE') or re.sub(r"^python3-", "",
d.getVar('BPN'))
-return name.replace('-', '_')
-
-PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
-
# The directory where wheels should be written too. Build classes
# will ideally [cleandirs] this but we don't do that here in case
# a recipe wants to install prebuilt wheels.
PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
-PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
-
PIP_INSTALL_ARGS = "\
- \
--ignore-installed \
@@ -29,8 +19,14 @@ PIP_INSTALL_PYTHON = "python3"
PIP_INSTALL_PYTHON:class-native = "nativepython3"
pip_install_wheel_do_install () {
-nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
- bbfatal_log "Failed to pip install wheel. Check the logs."
+COUNT=$(find ${PIP_INSTALL_DIST_PATH} -name '*.whl' | wc -l)
+if test $COUNT -eq 0; then
+bbfatal No wheels found in ${PIP_INSTALL_DIST_PATH}
+elif test $COUNT -gt 1; then
+bbfatal More than one wheel found in ${PIP_INSTALL_DIST_PATH}, this
should not happen
+fi
+
+nativepython3 -m pip install ${PIP_INSTALL_ARGS}
${PIP_INSTALL_DIST_PATH}/*.whl
cd ${D}
for i in ${D}${bindir}/* ${D}${sbindir}/*; do
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162975):
https://lists.openembedded.org/g/openembedded-core/message/162975
Mute This Topic: https://lists.openembedded.org/mt/89666433/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] qemu: Fix build when x11 is not in distro features
On Tue, Mar 8, 2022 at 10:38 PM Alexander Kanavin
wrote:
>
> Also, what error specifically are you seeing? How is your build set up?
>
There is use of MESA_EGL_NO_X11_HEADERS which is now renamed in newer headers to
EGL_NO_X11 from mesa/khronos headers, however this define is
relatively new and 3D stacks do not have this adopted but apps
like qemu and bunch of others depend on it, I guess they assume mesa.
One can argue that its better to fix the 3D stacks to behave
like mesa but this means every BSP using these stacks will need to
carry such a fix.
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/include/EGL/eglplatform.h
> Alex
>
> On Wed 9. Mar 2022 at 7.11, Alexander Kanavin via lists.openembedded.org
> wrote:
>>
>> Why is this issue not seen on autobuilder’s no-x11 job?
>>
>> Alex
>>
>> On Wed 9. Mar 2022 at 2.18, Khem Raj wrote:
>>>
>>> Signed-off-by: Khem Raj
>>> ---
>>> meta/recipes-devtools/qemu/qemu_6.2.0.bb | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>>> b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>>> index 062ed32b015..c7eef0a9d5e 100644
>>> --- a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>>> +++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>>> @@ -6,6 +6,8 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native
>>> meson-native"
>>>
>>> DEPENDS:append:libc-musl = " libucontext"
>>>
>>> +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
>>> '-DEGL_NO_X11=1', d)}"
>>> +
>>> RDEPENDS:${PN}:class-target += "bash"
>>>
>>> EXTRA_OECONF:append:class-target = "
>>> --target-list=${@get_qemu_target_list(d)}"
>>> --
>>> 2.35.1
>>>
>>>
>>>
>>>
>>
>>
>>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162974):
https://lists.openembedded.org/g/openembedded-core/message/162974
Mute This Topic: https://lists.openembedded.org/mt/89652908/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 03/16] dbus: update 1.12.22 -> 1.14.0
On Wed, 2022-03-09 at 16:51 +0100, Alexander Kanavin wrote: > It's atomic with dbus gaining a glib dependency unfortunately. I don't > want to break bisection. Are you saying that dbus gained a hard glib dependency? That wasn't clear from the commit message if so and is an important detail... Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162973): https://lists.openembedded.org/g/openembedded-core/message/162973 Mute This Topic: https://lists.openembedded.org/mt/89633519/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] qemu: Fix build when x11 is not in distro features
On Tue, Mar 8, 2022 at 10:11 PM Alexander Kanavin
wrote:
>
> Why is this issue not seen on autobuilder’s no-x11 job?
>
perhaps AB's no-x11 job is still using mesa and not an alternative
stack like mali or sgx ddk
if so then here is why
https://git.openembedded.org/openembedded-core/tree/meta/recipes-graphics/mesa/mesa.inc#n30
> Alex
>
> On Wed 9. Mar 2022 at 2.18, Khem Raj wrote:
>>
>> Signed-off-by: Khem Raj
>> ---
>> meta/recipes-devtools/qemu/qemu_6.2.0.bb | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>> b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>> index 062ed32b015..c7eef0a9d5e 100644
>> --- a/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>> +++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb
>> @@ -6,6 +6,8 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native
>> meson-native"
>>
>> DEPENDS:append:libc-musl = " libucontext"
>>
>> +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
>> '-DEGL_NO_X11=1', d)}"
>> +
>> RDEPENDS:${PN}:class-target += "bash"
>>
>> EXTRA_OECONF:append:class-target = "
>> --target-list=${@get_qemu_target_list(d)}"
>> --
>> 2.35.1
>>
>>
>>
>>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162972):
https://lists.openembedded.org/g/openembedded-core/message/162972
Mute This Topic: https://lists.openembedded.org/mt/89652908/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] glib-2.0: upgrade 2.70.4 -> 2.71.3
- 0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch:
dropped (integrated upstream)
Signed-off-by: Christian Eggers
---
...-correctly-when-building-with-mingw3.patch | 32 +++--
...degen.py-bump-timeout-to-100-seconds.patch | 26 --
...ble-more-tests-while-cross-compiling.patch | 48 ++-
...{glib-2.0_2.70.4.bb => glib-2.0_2.71.3.bb} | 3 +-
4 files changed, 44 insertions(+), 65 deletions(-)
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.70.4.bb => glib-2.0_2.71.3.bb}
(93%)
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
index 8a6d46df799b..59de3fa969a4 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
@@ -1,11 +1,10 @@
-From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001
+From 4f327be49fd6ac5a77da6e48459b37f37a601977 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with mingw32
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin
-
---
gio/tests/meson.build | 8
glib/tests/meson.build | 2 +-
@@ -14,10 +13,10 @@ Signed-off-by: Alexander Kanavin
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 3a19c82..b762835 100644
+index abe676767c60..34b347815308 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -27,7 +27,7 @@ test_c_args = [
+@@ -27,7 +27,7 @@ if build_machine.system() == 'linux'
endif # libutil.length() > 0
endif # build_machine.system() == 'linux'
@@ -26,7 +25,7 @@ index 3a19c82..b762835 100644
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library
('secur32')]
endif
-@@ -148,7 +148,7 @@ else
+@@ -176,7 +176,7 @@ else
endif
# Test programs buildable on UNIX only
@@ -35,7 +34,7 @@ index 3a19c82..b762835 100644
gio_tests += {
'file' : {},
'gdbus-peer' : {
-@@ -402,7 +402,7 @@ if host_machine.system() != 'windows'
+@@ -434,7 +434,7 @@ if host_machine.system() != 'windows'
endif # unix
# Test programs buildable on Windows only
@@ -44,7 +43,7 @@ index 3a19c82..b762835 100644
gio_tests += {'win32-streams' : {}}
endif
-@@ -472,7 +472,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
+@@ -504,7 +504,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
}
endif
@@ -54,10 +53,10 @@ index 3a19c82..b762835 100644
'gdbus-example-unix-fd-client' : {
'install' : false,
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index 6eb23e8..36eb919 100644
+index a0c64afe6ae9..48407f99569c 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -142,7 +142,7 @@ if glib_conf.has('HAVE_EVENTFD')
+@@ -151,7 +151,7 @@ if glib_conf.has('HAVE_EVENTFD')
}
endif
@@ -67,10 +66,10 @@ index 6eb23e8..36eb919 100644
glib_tests += {
'gpoll' : {
diff --git a/meson.build b/meson.build
-index 47f3a5c..7ea7ad1 100644
+index e0b14319fb58..f6756a3c7dfb 100644
--- a/meson.build
+++ b/meson.build
-@@ -32,6 +32,9 @@ else
+@@ -54,6 +54,9 @@ else
endif
host_system = host_machine.system()
@@ -81,15 +80,18 @@ index 47f3a5c..7ea7ad1 100644
if host_system == 'darwin'
ios_test_code = '''#include
diff --git a/tests/meson.build b/tests/meson.build
-index 6741f8f..12fdc90 100644
+index 5ff99a4a8258..8a4dad0ccae7 100644
--- a/tests/meson.build
+++ b/tests/meson.build
-@@ -73,7 +73,7 @@ test_extra_programs = {
- 'unicode-collate' : {},
+@@ -53,7 +53,7 @@ test_extra_programs = {
+ 'assert-msg-test' : {},
}
-if host_machine.system() != 'windows'
+if host_system != 'windows'
tests += {
'timeloop' : {},
- 'iochannel-test' : {},
+ }
+--
+2.34.1
+
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
deleted file mode 100644
index 7690bb37a6be..
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Sun, 20 Dec 2020 22:01:43 +0100
-Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds
-
-This may be necessary on overloaded CI systems.
-
-Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2348]
-Signed-off-by: Alexand
Re: [OE-core] [PATCH] binutils-cross-canadian: enable gold for mingw
On Wednesday, 9 March 2022, 10:13:23 CET, Samuli Piippo wrote:
> This reverts commit b5a595a4be09756b88e91f3353e3b221b165ab44,
> gold linker can now be built correctly for mingw SDKs.
I am interested how to use the gold linker from the SDK (on Linux).
I already tried this in the past [1], using -fuse-ld=gold, but without
much success.
[1]
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg142777.html
>
> Signed-off-by: Samuli Piippo
> ---
> meta/recipes-devtools/binutils/binutils-cross-canadian.inc | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
> b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
> index f44f46602d..b3d591e658 100644
> --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
> +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
> @@ -13,8 +13,6 @@ EXTRA_OECONF +=
> "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VEND
> # e.g. we switch between different machines with different tunes.
> EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
>
> -LDGOLD:sdkmingw32 = ""
> -
> do_install () {
> autotools_do_install
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162970):
https://lists.openembedded.org/g/openembedded-core/message/162970
Mute This Topic: https://lists.openembedded.org/mt/89658339/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] python3-scons: remove redundant FILES:${PN}-doc
mandir is in the default FILES:${PN}-doc, so there's no need to add it.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/python/python3-scons_4.3.0.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3-scons_4.3.0.bb
b/meta/recipes-devtools/python/python3-scons_4.3.0.bb
index 624f974805..ae91d980fe 100644
--- a/meta/recipes-devtools/python/python3-scons_4.3.0.bb
+++ b/meta/recipes-devtools/python/python3-scons_4.3.0.bb
@@ -28,7 +28,6 @@ do_install:append() {
install -d ${D}${mandir}/man1
mv ${D}${prefix}/scons*.1 ${D}${mandir}/man1/
}
-FILES:${PN}-doc += "${mandir}/man1/scons*.1"
do_install:append:class-native() {
create_wrapper ${D}${bindir}/scons
SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}'
PYTHONNOUSERSITE='1'
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162969):
https://lists.openembedded.org/g/openembedded-core/message/162969
Mute This Topic: https://lists.openembedded.org/mt/89665314/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] pip_install_wheel: install wheel with a glob
On 09.03.22 16:53, Ross Burton wrote: On Wed, 9 Mar 2022 at 15:47, Konrad Weihmann wrote: Can we, for the very unlikely case that do have more than one wheel in this dir, bbfatal out here as well - otherwise I'm worried that this will never get noticed I'm undecided on this. In the unlikely case (impossible, by design) that a number of wheels are built for a single package, wouldn't we want to install all of them as we're building the package? Classic assertion case IMO - as you said there shouldn't more than one, but in the event of having more than one, I would just terminate the build, as likely something is very wrong (like people playing around if task appends or custom tasks in between compile and install). I'm just concerned that this here would create a blind spot, where there none needed Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162968): https://lists.openembedded.org/g/openembedded-core/message/162968 Mute This Topic: https://lists.openembedded.org/mt/89664344/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] pip_install_wheel: install wheel with a glob
On Wed, 9 Mar 2022 at 15:47, Konrad Weihmann wrote: > Can we, for the very unlikely case that do have more than one wheel in > this dir, bbfatal out here as well - otherwise I'm worried that this > will never get noticed I'm undecided on this. In the unlikely case (impossible, by design) that a number of wheels are built for a single package, wouldn't we want to install all of them as we're building the package? Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162967): https://lists.openembedded.org/g/openembedded-core/message/162967 Mute This Topic: https://lists.openembedded.org/mt/89664344/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 03/16] dbus: update 1.12.22 -> 1.14.0
It's atomic with dbus gaining a glib dependency unfortunately. I don't
want to break bisection.
Alex
On Wed, 9 Mar 2022 at 13:33, Ross Burton wrote:
>
> Can you split the glib change out into a separate patch, as it's quite
> important but hidden in the dbus upgrade.
>
> Ross
>
> On Tue, 8 Mar 2022 at 09:32, Alexander Kanavin wrote:
> >
> > Drop patches:
> > clear-guid_from_server-if-send_negotiate_unix_f.patch
> > stop_using_selinux_set_mapping.patch
> > (both merged upstream)
> >
> > python-config.patch
> > (patched code removed upstream)
> >
> > Merge dbus-test recipe into the main recipe. The reason it was separate
> > is that there is a peculiar circular dependency: dbus tests require glib,
> > while some of glib's gdbus tests require dbus. So dbus was built with
> > tests disabled and without glib dependency, then glib was built with
> > dbus dependency, then dbus was built again with glib dependency and tests
> > enabled, only for the purpose of installing those tests. I find that
> > brittle and hacky, so this removes dbus dependecy from glib (the fallout
> > is that some gdbus tests are no longer being executed), and dbus and its
> > tests are built once, after glib.
> >
> > Also, dbus ptest installation is no longer using custom code,
> > and dbus run-ptest simply uses standard installed tests execution mechanism
> > from gnome.
> >
> > Signed-off-by: Alexander Kanavin
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 -
> > .../distro/include/ptest-packagelists.inc | 2 +-
> > meta/recipes-core/dbus/dbus-test_1.12.22.bb | 64
> > meta/recipes-core/dbus/dbus.inc | 34
> > ...from_server-if-send_negotiate_unix_f.patch | 104
> > .../dbus/dbus/python-config.patch | 34
> > meta/recipes-core/dbus/dbus/run-ptest | 34 +---
> > .../dbus/stop_using_selinux_set_mapping.patch | 148 --
> > .../dbus/{dbus_1.12.22.bb => dbus_1.14.0.bb} | 48 --
> > meta/recipes-core/glib-2.0/glib.inc | 2 +-
> > 10 files changed, 42 insertions(+), 429 deletions(-)
> > delete mode 100644 meta/recipes-core/dbus/dbus-test_1.12.22.bb
> > delete mode 100644 meta/recipes-core/dbus/dbus.inc
> > delete mode 100644
> > meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
> > delete mode 100644 meta/recipes-core/dbus/dbus/python-config.patch
> > delete mode 100644
> > meta/recipes-core/dbus/dbus/stop_using_selinux_set_mapping.patch
> > rename meta/recipes-core/dbus/{dbus_1.12.22.bb => dbus_1.14.0.bb} (74%)
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> > b/meta/conf/distro/include/maintainers.inc
> > index 3fceb6701b..a8eceaadf4 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -134,7 +134,6 @@ RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton
> > "
> > RECIPE_MAINTAINER:pn-db = "Unassigned "
> > RECIPE_MAINTAINER:pn-dbus = "Chen Qi "
> > RECIPE_MAINTAINER:pn-dbus-glib = "Chen Qi "
> > -RECIPE_MAINTAINER:pn-dbus-test = "Chen Qi "
> > RECIPE_MAINTAINER:pn-dbus-wait = "Chen Qi "
> > RECIPE_MAINTAINER:pn-debianutils = "Yi Zhao "
> > RECIPE_MAINTAINER:pn-dejagnu = "Nathan Rossi "
> > diff --git a/meta/conf/distro/include/ptest-packagelists.inc
> > b/meta/conf/distro/include/ptest-packagelists.inc
> > index c503a6a594..402fb87a3c 100644
> > --- a/meta/conf/distro/include/ptest-packagelists.inc
> > +++ b/meta/conf/distro/include/ptest-packagelists.inc
> > @@ -76,7 +76,7 @@ PTESTS_SLOW = "\
> > babeltrace2-ptest \
> > busybox-ptest \
> > coreutils-ptest \
> > -dbus-test-ptest \
> > +dbus-ptest \
> > e2fsprogs-ptest \
> > findutils-ptest \
> > glib-2.0-ptest \
> > diff --git a/meta/recipes-core/dbus/dbus-test_1.12.22.bb
> > b/meta/recipes-core/dbus/dbus-test_1.12.22.bb
> > deleted file mode 100644
> > index ae70301431..00
> > --- a/meta/recipes-core/dbus/dbus-test_1.12.22.bb
> > +++ /dev/null
> > @@ -1,64 +0,0 @@
> > -SUMMARY = "D-Bus test package (for D-bus functionality testing only)"
> > -HOMEPAGE = "http://dbus.freedesktop.org";
> > -SECTION = "base"
> > -
> > -require dbus.inc
> > -
> > -SRC_URI += "file://run-ptest \
> > -file://python-config.patch \
> > - "
> > -
> > -DEPENDS = "dbus glib-2.0"
> > -
> > -RDEPENDS:${PN}-dev = ""
> > -
> > -S="${WORKDIR}/dbus-${PV}"
> > -FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
> > -
> > -inherit ptest
> > -
> > -EXTRA_OECONF += "--enable-tests \
> > ---enable-modular-tests \
> > ---enable-installed-tests \
> > ---enable-checks \
> > ---enable-asserts \
> > ---with-dbus-test-dir=${PTEST_PATH} \
> > ---enable-embedded-tests \
> > - "
> > -
> > -do_install() {
> > -:
> > -}
> > -
> > -do_install_ptest() {
> > - install -d ${D}${PTEST_PATH}/test
> > - l="shel
Re: [OE-core] [PATCH] pip_install_wheel: install wheel with a glob
On 09.03.22 16:02, Ross Burton wrote:
Now that the build systems that use pip_install_wheel are all building
their wheel into a directory that we knew was empty before, we can just
install *.whl and not need to know the precise names.
By design a pyproject.toml will always build a single wheel, so there
shouldn't be any way for this to end up installing more than expected.
This obsoletes PIP_INSTALL_PACKAGE and PYPA_WHEEL, neither of which are
needed anymore.
Signed-off-by: Ross Burton
---
meta/classes/pip_install_wheel.bbclass | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/meta/classes/pip_install_wheel.bbclass
b/meta/classes/pip_install_wheel.bbclass
index 954a6b750f..5d09e795d0 100644
--- a/meta/classes/pip_install_wheel.bbclass
+++ b/meta/classes/pip_install_wheel.bbclass
@@ -1,20 +1,10 @@
DEPENDS:append = " python3-pip-native"
-def guess_pip_install_package_name(d):
-import re
-'''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode'''
-name = d.getVar('PYPI_PACKAGE') or re.sub(r"^python3-", "",
d.getVar('BPN'))
-return name.replace('-', '_')
-
-PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
-
# The directory where wheels should be written too. Build classes
# will ideally [cleandirs] this but we don't do that here in case
# a recipe wants to install prebuilt wheels.
PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
-PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
-
PIP_INSTALL_ARGS = "\
- \
--ignore-installed \
@@ -29,7 +19,9 @@ PIP_INSTALL_PYTHON = "python3"
PIP_INSTALL_PYTHON:class-native = "nativepython3"
pip_install_wheel_do_install () {
-nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
+test -f ${PIP_INSTALL_DIST_PATH}/*.whl || bbfatal No wheels in
${PIP_INSTALL_DIST_PATH}
Can we, for the very unlikely case that do have more than one wheel in
this dir, bbfatal out here as well - otherwise I'm worried that this
will never get noticed
+
+nativepython3 -m pip install ${PIP_INSTALL_ARGS}
${PIP_INSTALL_DIST_PATH}/*.whl ||
bbfatal_log "Failed to pip install wheel. Check the logs."
cd ${D}
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162965):
https://lists.openembedded.org/g/openembedded-core/message/162965
Mute This Topic: https://lists.openembedded.org/mt/89664344/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] pip_install_wheel: install wheel with a glob
Now that the build systems that use pip_install_wheel are all building
their wheel into a directory that we knew was empty before, we can just
install *.whl and not need to know the precise names.
By design a pyproject.toml will always build a single wheel, so there
shouldn't be any way for this to end up installing more than expected.
This obsoletes PIP_INSTALL_PACKAGE and PYPA_WHEEL, neither of which are
needed anymore.
Signed-off-by: Ross Burton
---
meta/classes/pip_install_wheel.bbclass | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/meta/classes/pip_install_wheel.bbclass
b/meta/classes/pip_install_wheel.bbclass
index 954a6b750f..5d09e795d0 100644
--- a/meta/classes/pip_install_wheel.bbclass
+++ b/meta/classes/pip_install_wheel.bbclass
@@ -1,20 +1,10 @@
DEPENDS:append = " python3-pip-native"
-def guess_pip_install_package_name(d):
-import re
-'''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode'''
-name = d.getVar('PYPI_PACKAGE') or re.sub(r"^python3-", "",
d.getVar('BPN'))
-return name.replace('-', '_')
-
-PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
-
# The directory where wheels should be written too. Build classes
# will ideally [cleandirs] this but we don't do that here in case
# a recipe wants to install prebuilt wheels.
PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
-PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
-
PIP_INSTALL_ARGS = "\
- \
--ignore-installed \
@@ -29,7 +19,9 @@ PIP_INSTALL_PYTHON = "python3"
PIP_INSTALL_PYTHON:class-native = "nativepython3"
pip_install_wheel_do_install () {
-nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
+test -f ${PIP_INSTALL_DIST_PATH}/*.whl || bbfatal No wheels in
${PIP_INSTALL_DIST_PATH}
+
+nativepython3 -m pip install ${PIP_INSTALL_ARGS}
${PIP_INSTALL_DIST_PATH}/*.whl ||
bbfatal_log "Failed to pip install wheel. Check the logs."
cd ${D}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162964):
https://lists.openembedded.org/g/openembedded-core/message/162964
Mute This Topic: https://lists.openembedded.org/mt/89664344/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] overlayfs: add systemd unit path prefix to FILES:${PN} array
The 'FILES:${PN}' array is missing the systemd unit dir prefix causing
them to not be packaged and the build fails with the
`installed-vs-shipped` error.
This adds the `systemd_system_unitdir` variable in front of every unit
file added with this class.
Signed-off-by: Claudius Heine
---
meta/classes/overlayfs.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/overlayfs.bbclass b/meta/classes/overlayfs.bbclass
index 4a860f7308..f525ea6625 100644
--- a/meta/classes/overlayfs.bbclass
+++ b/meta/classes/overlayfs.bbclass
@@ -103,7 +103,8 @@ python () {
unitList = unitFileList(d)
for unit in unitList:
d.appendVar('SYSTEMD_SERVICE:' + d.getVar('PN'), ' ' + unit)
-d.appendVar('FILES:' + d.getVar('PN'), ' ' + strForBash(unit))
+d.appendVar('FILES:' + d.getVar('PN'), ' ' +
+ d.getVar('systemd_system_unitdir') + '/' + strForBash(unit))
d.setVar('OVERLAYFS_UNIT_LIST', ' '.join([strForBash(s) for s in
unitList]))
}
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162963):
https://lists.openembedded.org/g/openembedded-core/message/162963
Mute This Topic: https://lists.openembedded.org/mt/89662850/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 03/16] dbus: update 1.12.22 -> 1.14.0
Can you split the glib change out into a separate patch, as it's quite
important but hidden in the dbus upgrade.
Ross
On Tue, 8 Mar 2022 at 09:32, Alexander Kanavin wrote:
>
> Drop patches:
> clear-guid_from_server-if-send_negotiate_unix_f.patch
> stop_using_selinux_set_mapping.patch
> (both merged upstream)
>
> python-config.patch
> (patched code removed upstream)
>
> Merge dbus-test recipe into the main recipe. The reason it was separate
> is that there is a peculiar circular dependency: dbus tests require glib,
> while some of glib's gdbus tests require dbus. So dbus was built with
> tests disabled and without glib dependency, then glib was built with
> dbus dependency, then dbus was built again with glib dependency and tests
> enabled, only for the purpose of installing those tests. I find that
> brittle and hacky, so this removes dbus dependecy from glib (the fallout
> is that some gdbus tests are no longer being executed), and dbus and its
> tests are built once, after glib.
>
> Also, dbus ptest installation is no longer using custom code,
> and dbus run-ptest simply uses standard installed tests execution mechanism
> from gnome.
>
> Signed-off-by: Alexander Kanavin
> ---
> meta/conf/distro/include/maintainers.inc | 1 -
> .../distro/include/ptest-packagelists.inc | 2 +-
> meta/recipes-core/dbus/dbus-test_1.12.22.bb | 64
> meta/recipes-core/dbus/dbus.inc | 34
> ...from_server-if-send_negotiate_unix_f.patch | 104
> .../dbus/dbus/python-config.patch | 34
> meta/recipes-core/dbus/dbus/run-ptest | 34 +---
> .../dbus/stop_using_selinux_set_mapping.patch | 148 --
> .../dbus/{dbus_1.12.22.bb => dbus_1.14.0.bb} | 48 --
> meta/recipes-core/glib-2.0/glib.inc | 2 +-
> 10 files changed, 42 insertions(+), 429 deletions(-)
> delete mode 100644 meta/recipes-core/dbus/dbus-test_1.12.22.bb
> delete mode 100644 meta/recipes-core/dbus/dbus.inc
> delete mode 100644
> meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
> delete mode 100644 meta/recipes-core/dbus/dbus/python-config.patch
> delete mode 100644
> meta/recipes-core/dbus/dbus/stop_using_selinux_set_mapping.patch
> rename meta/recipes-core/dbus/{dbus_1.12.22.bb => dbus_1.14.0.bb} (74%)
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index 3fceb6701b..a8eceaadf4 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -134,7 +134,6 @@ RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton
> "
> RECIPE_MAINTAINER:pn-db = "Unassigned "
> RECIPE_MAINTAINER:pn-dbus = "Chen Qi "
> RECIPE_MAINTAINER:pn-dbus-glib = "Chen Qi "
> -RECIPE_MAINTAINER:pn-dbus-test = "Chen Qi "
> RECIPE_MAINTAINER:pn-dbus-wait = "Chen Qi "
> RECIPE_MAINTAINER:pn-debianutils = "Yi Zhao "
> RECIPE_MAINTAINER:pn-dejagnu = "Nathan Rossi "
> diff --git a/meta/conf/distro/include/ptest-packagelists.inc
> b/meta/conf/distro/include/ptest-packagelists.inc
> index c503a6a594..402fb87a3c 100644
> --- a/meta/conf/distro/include/ptest-packagelists.inc
> +++ b/meta/conf/distro/include/ptest-packagelists.inc
> @@ -76,7 +76,7 @@ PTESTS_SLOW = "\
> babeltrace2-ptest \
> busybox-ptest \
> coreutils-ptest \
> -dbus-test-ptest \
> +dbus-ptest \
> e2fsprogs-ptest \
> findutils-ptest \
> glib-2.0-ptest \
> diff --git a/meta/recipes-core/dbus/dbus-test_1.12.22.bb
> b/meta/recipes-core/dbus/dbus-test_1.12.22.bb
> deleted file mode 100644
> index ae70301431..00
> --- a/meta/recipes-core/dbus/dbus-test_1.12.22.bb
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -SUMMARY = "D-Bus test package (for D-bus functionality testing only)"
> -HOMEPAGE = "http://dbus.freedesktop.org";
> -SECTION = "base"
> -
> -require dbus.inc
> -
> -SRC_URI += "file://run-ptest \
> -file://python-config.patch \
> - "
> -
> -DEPENDS = "dbus glib-2.0"
> -
> -RDEPENDS:${PN}-dev = ""
> -
> -S="${WORKDIR}/dbus-${PV}"
> -FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
> -
> -inherit ptest
> -
> -EXTRA_OECONF += "--enable-tests \
> ---enable-modular-tests \
> ---enable-installed-tests \
> ---enable-checks \
> ---enable-asserts \
> ---with-dbus-test-dir=${PTEST_PATH} \
> ---enable-embedded-tests \
> - "
> -
> -do_install() {
> -:
> -}
> -
> -do_install_ptest() {
> - install -d ${D}${PTEST_PATH}/test
> - l="shell printf refs syslog marshal syntax corrupt dbus-daemon
> dbus-daemon-eavesdrop loopback relay \
> - variant uid-permissions syntax spawn sd-activation names monitor
> message fdpass service shell-service"
> - for i in $l; do install ${B}/test/.libs/test-$i
> ${D}${PTEST_PATH}/test; done
> -
> - l="bus bus-system bus-launch-helper"
> - for i in $l; do install ${
Re: [OE-core] [PATCH 2/5] libsdl2: Depend on virtual/egl
On Tue, 8 Mar 2022 at 15:52, Khem Raj wrote: > -PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/libgl" > +PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl" What does libSDL2 look for, then? Is it EGL explicitly? Or GLX? Or something else. I agree that the virtual/libgl thing is a mess, but if we're clearing it up we need to clear about what is changing. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162961): https://lists.openembedded.org/g/openembedded-core/message/162961 Mute This Topic: https://lists.openembedded.org/mt/89640092/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/5] qemu: Depend on virtual/egl
On Tue, 8 Mar 2022 at 15:52, Khem Raj wrote: > -PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" > +PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/egl" Either the packageconfig name is wrong, or this patch is wrong: GLX is explicitly big-GL not EGL. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162960): https://lists.openembedded.org/g/openembedded-core/message/162960 Mute This Topic: https://lists.openembedded.org/mt/89640091/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] overlayfs-etc: add condition to package-management feature conflict
The conflict with the `package-managment` only happens if the
`overlayfs-etc` class overwrites `/sbin/init`, which is not the case
when `OVERLAYFS_ETC_USE_ORIG_INIT_NAME` is set to `0`.
Signed-off-by: Claudius Heine
---
meta/classes/overlayfs-etc.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/overlayfs-etc.bbclass
b/meta/classes/overlayfs-etc.bbclass
index 4ced07ba11..bf107b67e7 100644
--- a/meta/classes/overlayfs-etc.bbclass
+++ b/meta/classes/overlayfs-etc.bbclass
@@ -26,7 +26,8 @@
# overlay is out of scope of this class
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES",
"overlayfs-etc", "create_overlayfs_etc_preinit;", "", d)}'
-IMAGE_FEATURES_CONFLICTS_overlayfs-etc = "package-management"
+IMAGE_FEATURES_CONFLICTS_overlayfs-etc = " \
+ ${@ 'package-management' if
bb.utils.to_boolean(d.getVar('OVERLAYFS_ETC_USE_ORIG_INIT_NAME'), True) else
''}"
OVERLAYFS_ETC_MOUNT_POINT ??= ""
OVERLAYFS_ETC_FSTYPE ??= ""
--
2.33.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162959):
https://lists.openembedded.org/g/openembedded-core/message/162959
Mute This Topic: https://lists.openembedded.org/mt/89660257/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [poky][dunfell][PATCH] tiff: Add backports for two CVEs from upstream
(From OE-Core rev: 6ae14b4ff7a655b48c6d99ac565d12bf8825414f)
Signed-off-by: Richard Purdie
(cherry picked from commit e600227b136aa21b54f16e218858d640c8942f73)
Signed-off-by: Sana Kazi
Signed-off-by: Sana Kazi
---
...99c99f987dc32ae110370cfdd7df7975586b.patch | 28 +
...0712f4c3a5b449f70c57988260a667ddbdef.patch | 30 +++
meta/recipes-multimedia/libtiff/tiff_4.1.0.bb | 2 ++
3 files changed, 60 insertions(+)
create mode 100644
meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch
create mode 100644
meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch
diff --git
a/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch
b/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch
new file mode 100644
index 00..01ed5dcd24
--- /dev/null
+++
b/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch
@@ -0,0 +1,28 @@
+From 561599c99f987dc32ae110370cfdd7df7975586b Mon Sep 17 00:00:00 2001
+From: Even Rouault
+Date: Sat, 5 Feb 2022 20:36:41 +0100
+Subject: [PATCH] TIFFReadDirectory(): avoid calling memcpy() with a null
+ source pointer and size of zero (fixes #362)
+
+Upstream-Status: Backport
+CVE: CVE-2022-0562
+Signed-off-by: Sana Kazi
+Comment: Refreshed patch
+---
+ libtiff/tif_dirread.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index 2bbc4585..23194ced 100644
+--- a/libtiff/tif_dirread.c
b/libtiff/tif_dirread.c
+@@ -4126,7 +4126,8 @@
+ goto bad;
+ }
+
+-memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo,
old_extrasamples * sizeof(uint16));
++if (old_extrasamples > 0)
++memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo,
old_extrasamples * sizeof(uint16));
+ _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo,
new_sampleinfo, tif->tif_dir.td_extrasamples);
+ _TIFFfree(new_sampleinfo);
+ }
diff --git
a/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch
b/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch
new file mode 100644
index 00..fc5d0ab5f4
--- /dev/null
+++
b/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch
@@ -0,0 +1,30 @@
+From eecb0712f4c3a5b449f70c57988260a667ddbdef Mon Sep 17 00:00:00 2001
+From: Even Rouault
+Date: Sun, 6 Feb 2022 13:08:38 +0100
+Subject: [PATCH] TIFFFetchStripThing(): avoid calling memcpy() with a null
+ source pointer and size of zero (fixes #362)
+
+Upstream-Status: Backport
+CVE: CVE-2022-0561
+Signed-off-by: Sana Kazi
+Comment: Refreshed patch
+---
+ libtiff/tif_dirread.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index 23194ced..50ebf8ac 100644
+--- a/libtiff/tif_dirread.c
b/libtiff/tif_dirread.c
+@@ -5683,8 +5682,9 @@
+ _TIFFfree(data);
+ return(0);
+ }
+-
_TIFFmemcpy(resizeddata,data,(uint32)dir->tdir_count*sizeof(uint64));
+-
_TIFFmemset(resizeddata+(uint32)dir->tdir_count,0,(nstrips-(uint32)dir->tdir_count)*sizeof(uint64));
++ if( dir->tdir_count )
++ _TIFFmemcpy(resizeddata,data, (uint32)dir->tdir_count
* sizeof(uint64));
++ _TIFFmemset(resizeddata+(uint32)dir->tdir_count, 0, (nstrips -
(uint32)dir->tdir_count) * sizeof(uint64));
+ _TIFFfree(data);
+ data=resizeddata;
+ }
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb
b/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb
index 0948bb4e2f..9db247ecc7 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb
@@ -16,6 +16,8 @@ SRC_URI =
"http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://002_support_patch_for_CVE-2020-35521_and_CVE-2020-35522.patch \
file://CVE-2020-35521_and_CVE-2020-35522.patch \
file://0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch \
+ file://561599c99f987dc32ae110370cfdd7df7975586b.patch \
+ file://eecb0712f4c3a5b449f70c57988260a667ddbdef.patch \
"
SRC_URI[md5sum] = "2165e7aba557463acc0664e71a3ed424"
SRC_URI[sha256sum] =
"5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162958):
https://lists.openembedded.org/g/openembedded-core/message/162958
Mute This Topic: https://lists.openembedded.org/mt/89660166/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-arch
Re: [OE-core] [qa-build-notification] QA notification for completed autobuilder build (yocto-3.5_M3.rc1)
Hello All, This is the full report for yocto-3.5_M3.rc1: https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults === Summary No high milestone defects. No new issue found. Thanks, Jay > -Original Message- > From: qa-build-notificat...@lists.yoctoproject.org notificat...@lists.yoctoproject.org> On Behalf Of Richard Purdie > Sent: Tuesday, 8 March, 2022 12:08 AM > To: > Cc: qa-build-notification > Subject: [qa-build-notification] QA notification for completed autobuilder > build (yocto-3.5_M3.rc1) > > A build flagged for QA (yocto-3.5_M3.rc1) was completed on the autobuilder > and is available at: > > > /srv/autobuilder/autobuilder.yocto.io/pub/releases/yocto-3.5_M3.rc1 > > > Build hash information: > > bitbake: 8055ec360507e6a678ee5c4018ec1ab7f5a9cce5 > meta-agl: 9df7a40dd0b5e3ee1ed72e460dc99193eeb4bd6c > meta-arm: 643cf58a6988505dbd9243142496a3bc649efb1c > meta-aws: 214a5867b3b0d9ba54818aabb1711eadf4ba9eb3 > meta-gplv2: 5c9f033892ae56c178616859a1245efd375e64bd > meta-intel: 6fba58adb3823cd7578062b0afa4938dd7206adb > meta-mingw: d49e803e4b8b62dc148c182af499e582e7684de4 > meta-openembedded: a75b9a549563e09fca9a8c280f5731152913b651 > oecore: 4caea2d32f177fbbe3887f37b6700b2b4996b2be > poky: afbdba9b12bc12638d82813d1cd31ec479971c4b > > > > This is an automated message from the Yocto Project Autobuilder > Git: git://git.yoctoproject.org/yocto-autobuilder2 > Email: richard.pur...@linuxfoundation.org > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162957): https://lists.openembedded.org/g/openembedded-core/message/162957 Mute This Topic: https://lists.openembedded.org/mt/89630600/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] local.conf.sample: https and no newline for SSTATE_MIRRORS
Both http and https work, but we will get fewer user questions with https Remove no longer necessary \n character in the sample definition Signed-off-by: Michael Opdenacker --- meta/conf/local.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 82efc2c4f5..4d0883302b 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -185,7 +185,7 @@ BB_DISKMON_DIRS ??= "\ # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # -# This can be a filesystem directory, or a remote url such as http or ftp. These +# This can be a filesystem directory, or a remote url such as https or ftp. These # would contain the sstate-cache results from previous builds (possibly from other # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the # cache locations to check for the shared objects. @@ -193,7 +193,7 @@ BB_DISKMON_DIRS ??= "\ # at the end as shown in the examples below. This will be substituted with the # correct path within the directory structure. #SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ #file://.* file:///some/local/dir/sstate/PATH" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162956): https://lists.openembedded.org/g/openembedded-core/message/162956 Mute This Topic: https://lists.openembedded.org/mt/89659152/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH RESEND] conf/machine: fix QEMU x86 sound options
This updates the QEMU sounds options for x86 emulation, when "runqemu" is called with the "audio" argument, to fix the below error: runqemu - ERROR - Failed to run qemu: qemu-system-x86_64: warning: '-soundhw ac97' is deprecated, please use '-device AC97' instead Signed-off-by: Michael Opdenacker --- meta/classes/qemuboot.bbclass | 2 +- meta/conf/machine/include/x86/qemuboot-x86.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 755d49acd6..ad8489902a 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -29,7 +29,7 @@ # # QB_AUDIO_DRV: qemu audio driver, e.g., "alsa", set it when support audio # -# QB_AUDIO_OPT: qemu audio option, e.g., "-soundhw ac97,es1370", used +# QB_AUDIO_OPT: qemu audio option, e.g., "-device AC97", used # when QB_AUDIO_DRV is set. # # QB_RNG: Pass-through for host random number generator, it can speedup boot diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc index d3b91070a8..b7b6428e44 100644 --- a/meta/conf/machine/include/x86/qemuboot-x86.inc +++ b/meta/conf/machine/include/x86/qemuboot-x86.inc @@ -8,7 +8,7 @@ QB_CPU:x86-64 = "-cpu IvyBridge -machine q35" QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35" QB_AUDIO_DRV = "alsa" -QB_AUDIO_OPT = "-soundhw ac97,es1370" +QB_AUDIO_OPT = "-device AC97" QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1" QB_OPT_APPEND = "-usb -device usb-tablet" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162955): https://lists.openembedded.org/g/openembedded-core/message/162955 Mute This Topic: https://lists.openembedded.org/mt/89658861/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] local.conf.sample: fix reference to extended configuration sample
The file name is local.conf.sample.extended, not local.conf.extended Signed-off-by: Michael Opdenacker --- meta/conf/local.conf.sample | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 82efc2c4f5..1edbb73987 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -2,9 +2,10 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. +# be set in this file. More adventurous users can look at +# local.conf.sample.extended which contains other examples of configuration which +# can be placed in this file but new users likely won't need any of them +# initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162954): https://lists.openembedded.org/g/openembedded-core/message/162954 Mute This Topic: https://lists.openembedded.org/mt/89658674/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] binutils-cross-canadian: enable gold for mingw
This reverts commit b5a595a4be09756b88e91f3353e3b221b165ab44,
gold linker can now be built correctly for mingw SDKs.
Signed-off-by: Samuli Piippo
---
meta/recipes-devtools/binutils/binutils-cross-canadian.inc | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index f44f46602d..b3d591e658 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -13,8 +13,6 @@ EXTRA_OECONF +=
"--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VEND
# e.g. we switch between different machines with different tunes.
EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
-LDGOLD:sdkmingw32 = ""
-
do_install () {
autotools_do_install
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162953):
https://lists.openembedded.org/g/openembedded-core/message/162953
Mute This Topic: https://lists.openembedded.org/mt/89658339/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH] babeltrace: Handle negative time and offset from Epoch
Backport a patch from upstream to handle negative time and offset from Epoch
Signed-off-by: He Zhe
---
...-negative-time-and-offset-from-Epoch.patch | 853 ++
meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 1 +
2 files changed, 854 insertions(+)
create mode 100644
meta/recipes-kernel/lttng/babeltrace/0001-Handle-negative-time-and-offset-from-Epoch.patch
diff --git
a/meta/recipes-kernel/lttng/babeltrace/0001-Handle-negative-time-and-offset-from-Epoch.patch
b/meta/recipes-kernel/lttng/babeltrace/0001-Handle-negative-time-and-offset-from-Epoch.patch
new file mode 100644
index 00..37ca698bd8
--- /dev/null
+++
b/meta/recipes-kernel/lttng/babeltrace/0001-Handle-negative-time-and-offset-from-Epoch.patch
@@ -0,0 +1,853 @@
+From 78f62745313a51ebdaa64d4c59131ef87ef00917 Mon Sep 17 00:00:00 2001
+From: Mathieu Desnoyers
+Date: Wed, 22 Apr 2020 03:00:02 +
+Subject: [PATCH] Handle negative time and offset from Epoch
+
+Handle cases where a trace have a negative offset from Epoch.
+If Epoch is arbitrary (e.g. embedded system starting at 0, without any
+network access), the "0" can be used as correlation point between
+various components, and some components could start before the
+correlation point. Therefore, especially in traces where the time is
+meant to be shown in nanoseconds or cycles from the correlation point,
+it also makes sense to have a negative time value.
+
+It introduces API-breaking changes in the C and Python APIs, since we
+need to be able to return negative time values, which were previously
+used as errors (-1ULL).
+
+The --offset and --offset-ns command line parameters can now take
+negative offset (seconds and nanoseconds) values too.
+
+The [sec.ns] format is used as fallback so we don't attempt to pass
+a negative time value to POSIX time-formatting APIs.
+
+This also fixes an inaccurate return value in an error path of
+bt_ctf_event_populate_event_header().
+
+Signed-off-by: Mathieu Desnoyers
+Signed-off-by: Jérémie Galarneau
+
+Upstream-Status: Backport
[https://git.efficios.com/?p=babeltrace.git;a=commit;h=61cf588beae752e5ddfc60b6b5310f769ac9e852]
+
+Signed-off-by: He Zhe
+---
+ converter/babeltrace.c| 4 +-
+ formats/ctf-text/ctf-text.c | 2 +-
+ formats/ctf/ctf.c | 115 +-
+ formats/ctf/events-private.h | 10 +-
+ formats/ctf/events.c | 11 +-
+ .../metadata/ctf-visitor-generate-io-struct.c | 1 -
+ include/babeltrace/babeltrace-internal.h | 8 +-
+ include/babeltrace/clock-internal.h | 2 +-
+ include/babeltrace/ctf-ir/clock-internal.h| 2 +-
+ include/babeltrace/ctf/events.h | 8 +-
+ include/babeltrace/ctf/types.h| 6 +-
+ include/babeltrace/format.h | 10 +-
+ include/babeltrace/trace-handle-internal.h| 8 +-
+ include/babeltrace/trace-handle.h | 25 ++--
+ lib/context.c | 44 +--
+ lib/trace-handle.c| 39 +++---
+ tests/lib/test_ctf_writer.c | 6 +-
+ tests/lib/test_seek.c | 28 ++---
+ 18 files changed, 209 insertions(+), 120 deletions(-)
+
+diff --git a/converter/babeltrace.c b/converter/babeltrace.c
+index ef783ed4..2ac16179 100644
+--- a/converter/babeltrace.c
b/converter/babeltrace.c
+@@ -375,7 +375,7 @@ static int parse_options(int argc, char **argv)
+ goto end;
+ }
+ errno = 0;
+- opt_clock_offset = strtoull(str, &endptr, 0);
++ opt_clock_offset = strtoll(str, &endptr, 0);
+ if (*endptr != '\0' || str == endptr || errno != 0) {
+ fprintf(stderr, "[error] Incorrect
--clock-offset argument: %s\n", str);
+ ret = -EINVAL;
+@@ -400,7 +400,7 @@ static int parse_options(int argc, char **argv)
+ goto end;
+ }
+ errno = 0;
+- opt_clock_offset_ns = strtoull(str, &endptr, 0);
++ opt_clock_offset_ns = strtoll(str, &endptr, 0);
+ if (*endptr != '\0' || str == endptr || errno != 0) {
+ fprintf(stderr, "[error] Incorrect
--clock-offset-ns argument: %s\n", str);
+ ret = -EINVAL;
+diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
+index 16f156de..e001a548 100644
+--- a/formats/ctf-text/ctf-text.c
b/formats/ctf-text/ctf-text.c
+@@ -43,7 +43,7 @@
+ #include
+ #include
+
+-#define NSEC_PER_SEC 10ULL
++#define NSEC_PER_SEC 10LL
+
+ int opt_all_field_names,
+ opt_scope_field_names,
+diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
+index 1ba9017f..3c774188 100644
+--- a/formats/ctf/ctf.c
Re: [OE-core] [PATCH 1/1] go.bbclass: Allow network in do_compile
On Thu, Mar 3, 2022 at 05:46 PM, Bruce Ashfield wrote: > > On Thu, Mar 3, 2022 at 10:13 AM wrote: > >> On Thu, Mar 3, 2022 at 04:34 AM, Bruce Ashfield wrote: >> >> On Wed, Mar 2, 2022 at 4:57 PM Andrei Gherzan wrote: >> >> >> Mar 1, 2022 20:15:52 Bruce Ashfield : >> >> On Tue, Mar 1, 2022 at 10:54 AM wrote: >> >> On Tue, Mar 1, 2022 at 02:14 PM, Bruce Ashfield wrote: >> >> On Tue, Mar 1, 2022 at 6:42 AM Andrei Gherzan wrote: >> >> >> On Tue, 1 Mar 2022, at 01:55, Bruce Ashfield wrote: >> >> On Mon, Feb 28, 2022 at 8:17 PM Bruce Ashfield via >> lists.openembedded.org >> wrote: >> >> >> On Mon, Feb 28, 2022 at 6:54 PM Andrei Gherzan wrote: >> >> >> >> From: Andrei Gherzan >> >> Compile pulls in the go.mod list requiring network. Without this, do >> compile would fail with a similar error to the following: >> >> dial tcp: lookup proxy.golang.org: Temporary failure in name resolution >> >> This is something that needs to be carried in your own layers, IMHO it >> isn't appropriate for core. >> >> It isn't about the fetching, it is the entire gap in functionality >> that we are missing if go starts fetching dependencies during compile. >> >> A further thought is that if this is for go.mod issues, there is the >> go-mod.bbclass. >> >> Perhaps enabling it in that class and doing a bbwarn about go fetching >> dependencies would be appropriate ? >> >> Otherwise, someone may not know that this is happening and that a no >> network configuration has no chance of working. >> >> I reckon that is reasonable. I'll personally go down the recipe level to >> workaround this change but understanding and agreeing with the reasoning >> behind this change, I want to invest a bit into trying to find a proper >> solution in the core. Bruce, I know you invested a fair amount of time >> into this already. Would you be willing to sync up and see how we can work >> together in tackling this? >> >> Definitely, more ideas are good. In fact, I think there are probably >> several approaches that can co-exist, depending on what a >> recipe/developer needs. >> >> I'm in the Eastern time zone here, and will try and grab folks on IRC >> to have a level set >> >> Bruce >> >> Added Zyga to CC as he is also interested in this as part of his go >> development activities. >> >> Thanks, >> Andrei >> >> >> >> -- >> - Thou shalt not follow the NULL pointer, for chaos and madness await >> thee at its end >> - "Use the force Harry" - Gandalf, Star Trek II >> >> The problem in allowing downloads during compile (e.g. by go) is, that it >> leads to non-reproducable builds. I'm currently facing the same issue and >> would like to have a reproducable go *offline* build. >> I would like to propose two ideas to workaround the go-compile fetching >> issue: >> >> First: >> - Fetch go-dependencies using go.mod file from 'proxy.golang.org' (e.g. by >> writing a seperate go fetcher or a wget-fetcher) and unpack the >> dependencies into go projects 'vendor' folder. This forces go to compile >> offline. However, one have to generate the 'modules.txt' file in the >> vendor folder 'manually' during unpack. This is error prone, as there is >> no official documentation how this format should look like. Anyway, I've >> tried this approach and it works for me. >> >> Second: >> - Fetch go-dependencies using go.mod file from 'proxy.golang.org' (e.g. by >> writing a seperate go fetcher) and unpack the dependencies into a local >> (workdir) go-path. This seemed a good solution for me as the go-path is >> well defined. But for some reason 'go' fetches the zip-files during >> compile into it's download-cache AGAIN, even if the source is already >> unpacked in the go-path. I'll assume this is required to verify the source >> files integrity?! With this approach one have to adapt 'go' to suppress >> this download behaviour. >> >> I've been doing offline builds using a constructed vendor/ directory >> and generated modules.txt. >> >> The only difference between what I have working and what you are >> suggesting (type 1), is that I've gone directly to the sources and >> constructed the vendor directory using the OE git fetcher. That allows >> all functionality to continue to work that is part of OEcore, and the >> build to continue. Switching out the git fetches for tarballs would >> be possible, I just wasn't sure how to use the proxied modules (and I >> wanted the history for debug). >> >> I've never had any issues with the modules.txt, as I generate it at >> the same time as the git fetch lines for the SRC_URI. I've also not >> been using information from the go.mod directly from go.proxy.org, it >> is information I've generated from a clone of the project and dumped >> via go mod. There's likely improvements I can do there, but with what >> I'm doing, I'm going directly to the source of the projects and doing >> clones, which keeps everything clear of the go infrastructure. >> >> I have a utility that I'm still cleaning up that gen
