Re: [OE-core][PATCH] webkitgtk: Add packageconfig for libsoup2
On December 9, 2021 11:08:31 PM GMT+01:00, Joshua Watt
wrote:
>On Thu, Dec 9, 2021 at 3:55 PM Quentin Schulz wrote:
>>
>> Hi Joshua,
>>
>> On December 9, 2021 9:44:17 PM GMT+01:00, Joshua Watt
>> wrote:
>> >Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
>> >Including libsoup2 and libsoup3 in the same process can cause strange
>> >runtime failures, and the latest release of each major version will
>> >cause the process to exit if either if both are detected on process
>> >startup.
>> >
>> >The default is changed from libsoup3 back to libsoup2. Most GNOME
>> >packages are still using libsoup2, and a large number of these pull in
>> >webkitgtk either directly or indirectly. If webkitgtk uses libsoup3,
>> >this causes all of these packages to fail at startup. It appears that
>> >most GNOME packages will have to switch to libsoup3 when they transition
>> >to GTK4.
>> >
>> >Signed-off-by: Joshua Watt
>> >---
>> > meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 --
>> > 1 file changed, 4 insertions(+), 2 deletions(-)
>> >
>> >diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>> >b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>> >index 413e0cdf92..279e260441 100644
>> >--- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>> >+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>> >@@ -38,12 +38,12 @@ DEPENDS = " \
>> > atk \
>> > libwebp \
>> > gtk+3 \
>> >- libsoup \
>> > libxslt \
>> > libtasn1 \
>> > libnotify \
>> > gstreamer1.0 \
>> > gstreamer1.0-plugins-base \
>> >+ ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
>> >"libsoup", d)} \
>> > "
>> >
>> > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland
>> > x11', d)} \
>> >@@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
>> >'systemd wayland x11',
>> >${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
>> > 'opengl-or-es', '', d)} \
>> >enchant \
>> >libsecret \
>> >+ soup2 \
>> > "
>> >
>> > PACKAGECONFIG[wayland] =
>> > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
>> > wpebackend-fdo wayland-native"
>> >@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] =
>> >"-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
>> > PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
>> > PACKAGECONFIG[reduce-size] =
>> > "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
>> > PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
>> >+PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,,"
>> >
>>
>> What about leveraging package conflicts in PACKAGECONFIG?
>>
>> e.g.:
>> PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup"
>> PACKAGECONFIG[soup] = ",,libsoup,,,soup2"
>> ?
>> No need for the check on PACKAGECONFIG in depends then.
>
>Ya, the weird part there is that if you want libsoup3, you *must* put
>"soup" in PACKAGECONFIG *and* remove soup2, otherwise libsoup won't be
>added to DEPENDS and the build fails.
>
I can suggest a solution à la qt package from meta-qt5:
PACKAGECONFIG_LIBSOUP ?= "soup2"
PACKAGECONFIG ??= "[...] ${PACKAGECONFIG_LIBSOUP}"
If you want to make really sure one or the other is selected, you can add a
check in an anonymous Python function?
This should tackle the "must" part and also allow easy swap in bbappends in
addition of making sure libsoup and libsoup-2.4 can't be selected at the same
time?
What do you think?
On a side note, I feel like this patch could be split in two. One for the
libsoup switch mechanism and one for switching the default to libsoup-2.4? I
don't think Richard care usually though, so no biggie :)
Cheers,
Quentin
>>
>> > # webkitgtk is full of /usr/bin/env python, particular for generating docs
>> > do_configure[postfuncs] += "setup_python_link"
>> >@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
>> > SECURITY_CFLAGS:remove:aarch64 = "-fpie"
>> > SECURITY_CFLAGS:append:aarch64 = " -fPIE"
>> >
>> >-FILES:${PN} +=
>> >"${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
>> >+FILES:${PN} +=
>> >"${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
>> >
>>
>> Was this change suppose to make it in this commit?
>
>Yes. The minor version of the library changes based on libsoup3 (4.1)
>vs. libsoup2 (4.0)
>
>>
>> Cheers,
>> Quentin
>>
>> > RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
>> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159491):
https://lists.openembedded.org/g/openembedded-core/message/159491
Mute This Topic: https://lists.openembedded.org/mt/87621243/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] libx11: update to 1.7.3
Dropped upstreamed patches.
Signed-off-by: Oleksandr Kravchuk
---
.../libx11/Fix-hanging-issue-in-_XReply.patch | 49 ---
.../xorg-lib/libx11/keysym.patch | 46 -
.../{libx11_1.7.2.bb => libx11_1.7.3.bb} | 19 ---
3 files changed, 12 insertions(+), 102 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/keysym.patch
rename meta/recipes-graphics/xorg-lib/{libx11_1.7.2.bb => libx11_1.7.3.bb}
(67%)
diff --git
a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
deleted file mode 100644
index 660e6968bf..00
--- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5235a7f3692a4c3c90dd4ac1be3c670388904bbe Mon Sep 17 00:00:00 2001
-From: Tatu Frisk
-Date: Tue, 14 Mar 2017 14:41:27 +0200
-Subject: [PATCH] Fix hanging issue in _XReply
-
-Assume event queue is empty if another thread is blocking waiting for event.
-
-If one thread was blocking waiting for an event and another thread sent a
-reply to the X server, both threads got blocked until an event was
-received.
-
-Upstream-Status: Backport [93a050c3ad2d2264d3880db3791387b1a9bf2e9e]
-Signed-off-by: Ross Burton
-
- src/xcb_io.c | 19 +++
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-Index: libX11-1.6.7/src/xcb_io.c
-===
libX11-1.6.7.orig/src/xcb_io.c
-+++ libX11-1.6.7/src/xcb_io.c
-@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep
- if(dpy->xcb->event_owner == XlibOwnsEventQueue)
- {
- xcb_generic_reply_t *event;
-- /* If some thread is already waiting for events,
-- * it will get the first one. That thread must
-- * process that event before we can continue. */
-- /* FIXME: That event might be after this reply,
-- * and might never even come--or there might be
-- * multiple threads trying to get events. */
-- while(dpy->xcb->event_waiter)
-- { /* need braces around ConditionWait */
-- ConditionWait(dpy, dpy->xcb->event_notify);
-- }
-- while((event = poll_for_event(dpy, True)))
-- handle_response(dpy, event, True);
-+
-+ /* Assume event queue is empty if another thread is
blocking
-+ * waiting for event. */
-+ if(!dpy->xcb->event_waiter)
-+ {
-+ while((event = poll_for_response(dpy)))
-+ handle_response(dpy, event, True);
-+}
- }
-
- req->reply_waiter = 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysym.patch
b/meta/recipes-graphics/xorg-lib/libx11/keysym.patch
deleted file mode 100644
index f4d7419c02..00
--- a/meta/recipes-graphics/xorg-lib/libx11/keysym.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Submitted
[https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79]
-Signed-off-by: Ross Burton
-
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
- #define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer
- src/util/makekeys.c | 12
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char
*prefix)
- return 1;
- }
-
-+/* See if we can parse one of the _EVDEVK symbols */
-+i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+memcpy(prefix, key, (size_t)(tmp - key));
-+prefix[tmp - key] = '\0';
-+tmp += 3;
-+memmove(key, tmp, strlen(tmp) + 1);
-+
-+*val += 0x10081000;
-+return 1;
-+}
-+
- /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
- * immediately: if the target is in the form XF86XK_foo, we need to
- * canonicalise this to XF86foo before we do the lookup. */
---
-GitLab
-
diff --git
[OE-core] [PATCH] bootchart2: remove wait_boot logic
From: Mingli Yu When boot with "init=/sbin/bootchartd" as below: # runqemu qemux86 bootparams="init=/sbin/bootchartd" There are two bootchartd process after boot [1]. # ps -ef | grep bootchart root 101 1 0 03:27 ?00:00:00 /bin/sh /sbin/bootchartd root 103 101 8 03:27 ?00:00:02 /lib64/bootchart/bootchart-collector 50 root 106 1 0 03:27 ?00:00:00 /bin/sh /sbin/bootchartd root 792 106 0 03:27 ?00:00:00 /lib64/bootchart/bootchart-collector --usleep 100 root 794 725 0 03:27 ttyS000:00:00 grep bootchart # /sbin/bootchartd stop [bootchart] bootchart-collector started as pid 596 with 2 args: [bootchart] '--dump' [bootchart] '/tmp/bootchart.3lXpVDAq3v' [bootchart] Extracting profile data from pid 204 [bootchart] map 0xbed9a000 -> 0xbedbb000 size: 132k from 'bed9a000' 'bedbb000' [bootchart] read 135168 bytes of 135168 [bootchart] reading 150 chunks (of 150) ... [bootchart] wrote 18760 kbB [bootchart] bootchart-collector pid: 596 unmounted proc / clean exit But there still one process exist after the above stop command finish. # ps -ef | grep bootchartd root 202 1 0 09:09 ? 00:00:00 /bin/sh /sbin/bootchartd root 629 516 0 09:10 ? 00:00:00 grep bootchartd Remove the wait_boot which used to wait the boot process to finish to make sure only one bootchartd process and meanwhile we don't need the wait_boot logic because we either use "/sbin/bootchartd stop" to stop the bootchartd manually or install package bootchartd-stop-initscript altogether with bootchart2 to stop bootchartd automatically after boot. After patch: # ps -ef | grep bootchart root 101 1 0 03:36 ?00:00:00 /bin/sh /sbin/bootchartd root 103 101 6 03:36 ?00:00:04 /lib64/bootchart/bootchart-collector 50 root 596 592 0 03:37 ttyS000:00:00 grep bootchart [1] https://github.com/xrmx/bootchart/issues/94 Signed-off-by: Mingli Yu --- ...ake-sure-only-one-bootchartd-process.patch | 68 +++ .../bootchart2/bootchart2_0.14.9.bb | 1 + 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch new file mode 100644 index 00..0d6c20c47c --- /dev/null +++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch @@ -0,0 +1,68 @@ +From 988ca784d4840c87509e770a21d5d22105af8668 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 5 Nov 2021 11:18:07 +0800 +Subject: [PATCH] bootchartd.in: make sure only one bootchartd process + +When boot with "init=/sbin/bootchartd" as below: + # runqemu qemux86 bootparams="init=/sbin/bootchartd" + +There are two bootchartd process after boot [1]. + # ps -ef | grep bootchart +root 101 1 0 03:27 ?00:00:00 /bin/sh /sbin/bootchartd +root 103 101 8 03:27 ?00:00:02 /lib64/bootchart/bootchart-collector 50 +root 106 1 0 03:27 ?00:00:00 /bin/sh /sbin/bootchartd +root 792 106 0 03:27 ?00:00:00 /lib64/bootchart/bootchart-collector --usleep 100 +root 794 725 0 03:27 ttyS000:00:00 grep bootchart + + # /sbin/bootchartd stop +[bootchart] bootchart-collector started as pid 596 with 2 args: +[bootchart] '--dump' +[bootchart] '/tmp/bootchart.3lXpVDAq3v' +[bootchart] Extracting profile data from pid 204 +[bootchart] map 0xbed9a000 -> 0xbedbb000 size: 132k from 'bed9a000' 'bedbb000' +[bootchart] read 135168 bytes of 135168 +[bootchart] reading 150 chunks (of 150) ... +[bootchart] wrote 18760 kbB +[bootchart] bootchart-collector pid: 596 unmounted proc / clean exit + +But there still one process exist after the above stop command finish. + # ps -ef | grep bootchartd +root 202 1 0 09:09 ? 00:00:00 /bin/sh /sbin/bootchartd +root 629 516 0 09:10 ? 00:00:00 grep bootchartd + +Remove the wait_boot which used to wait the boot process to finish to +make sure only one bootchartd process and meanwhile we don't need the +wait_boot logic because we either use "/sbin/bootchartd stop" to stop +the bootchartd manually or install package bootchartd-stop-initscript +altogether with bootchart2 to stop bootchartd automatically after boot. + +After patch: + # ps -ef | grep bootchart + root 101 1 0 03:36 ?00:00:00 /bin/sh /sbin/bootchartd + root 103 101 6 03:36 ?00:00:04 /lib64/bootchart/bootchart-collector 50 + root 596 592 0 03:37 ttyS000:00:00 grep bootchart + +[1] https://github.com/xrmx/bootchart/issues/94 + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + bootchartd.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/bootchartd.in b/bootchartd.in
[OE-core] [PATCH v2] pango: upgrade 1.48.10 -> 1.50.0
Add patch 0001-Fix-bug-for-x86_64_x32.patch
to fix compile bug when building 32bit on x86_64 environment.
Signed-off-by: Wang Mingyu
---
.../pango/0001-Fix-bug-for-x86_64_x32.patch | 55 +++
.../{pango_1.48.10.bb => pango_1.50.0.bb} | 4 +-
2 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-graphics/pango/pango/0001-Fix-bug-for-x86_64_x32.patch
rename meta/recipes-graphics/pango/{pango_1.48.10.bb => pango_1.50.0.bb} (91%)
diff --git
a/meta/recipes-graphics/pango/pango/0001-Fix-bug-for-x86_64_x32.patch
b/meta/recipes-graphics/pango/pango/0001-Fix-bug-for-x86_64_x32.patch
new file mode 100644
index 00..9ab55879a4
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango/0001-Fix-bug-for-x86_64_x32.patch
@@ -0,0 +1,55 @@
+From 8e97429dfb9a2931c79658869da25b44014f8eba Mon Sep 17 00:00:00 2001
+From: Wang Mingyu
+Date: Thu, 9 Dec 2021 00:13:20 +0900
+Subject: [PATCH] Fix bug for x86_64_x32
+
+When built 32-bit Pango on x86_64 environment, the following problems occured:
+
+error: size of array '_GStaticAssertCompileTimeAssertion_4' is negative
+| 826 | #define G_STATIC_ASSERT(expr) typedef char G_PASTE
(_GStaticAssertCompileTimeAssertion_, __COUNTER__)[(expr) ? 1 : -1]
G_GNUC_UNUSED
+
+This problem can be solved by removing the judgement of arch.
+
+Upstream-Status: Inappropriate
[https://gitlab.gnome.org/GNOME/pango/-/issues/637]
+
+Signed-off-by: Wang Mingyu
+---
+ pango/pango-item-private.h | 15 ---
+ 1 file changed, 15 deletions(-)
+
+diff --git a/pango/pango-item-private.h b/pango/pango-item-private.h
+index d37fc3f..d49f2a6 100644
+--- a/pango/pango-item-private.h
b/pango/pango-item-private.h
+@@ -40,19 +40,6 @@ G_BEGIN_DECLS
+
+ typedef struct _PangoItemPrivate PangoItemPrivate;
+
+-#ifdef __x86_64__
+-
+-struct _PangoItemPrivate
+-{
+- int offset;
+- int length;
+- int num_chars;
+- int char_offset;
+- PangoAnalysis analysis;
+-};
+-
+-#else
+-
+ struct _PangoItemPrivate
+ {
+ int offset;
+@@ -62,8 +49,6 @@ struct _PangoItemPrivate
+ int char_offset;
+ };
+
+-#endif
+-
+ G_STATIC_ASSERT (offsetof (PangoItem, offset) == offsetof (PangoItemPrivate,
offset));
+ G_STATIC_ASSERT (offsetof (PangoItem, length) == offsetof (PangoItemPrivate,
length));
+ G_STATIC_ASSERT (offsetof (PangoItem, num_chars) == offsetof
(PangoItemPrivate, num_chars));
+--
+2.25.1
+
diff --git a/meta/recipes-graphics/pango/pango_1.48.10.bb
b/meta/recipes-graphics/pango/pango_1.50.0.bb
similarity index 91%
rename from meta/recipes-graphics/pango/pango_1.48.10.bb
rename to meta/recipes-graphics/pango/pango_1.50.0.bb
index 40df7042e6..974e053b8f 100644
--- a/meta/recipes-graphics/pango/pango_1.48.10.bb
+++ b/meta/recipes-graphics/pango/pango_1.50.0.bb
@@ -20,7 +20,9 @@ GIR_MESON_DISABLE_FLAG = "disabled"
SRC_URI += "file://run-ptest"
-SRC_URI[archive.sha256sum] =
"21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98"
+SRC_URI:append:x86-x32 = " file://0001-Fix-bug-for-x86_64_x32.patch"
+
+SRC_URI[archive.sha256sum] =
"dba8b62ddf86e10f73f93c3d2256b73238b2bcaf87037ca229b40bdc040eb3f3"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo
harfbuzz fribidi"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159488):
https://lists.openembedded.org/g/openembedded-core/message/159488
Mute This Topic: https://lists.openembedded.org/mt/87627577/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] glibc: Redo tzselect bash dependency problem
New patch adds a knob to select needed shell interpreter for tzselect
script, which then we excercise via EXTRA_OEMAKE
Signed-off-by: Khem Raj
Cc: Hongxu Jia
---
v2: Fix cross-localedef-native as well
.../glibc/cross-localedef-native_2.34.bb | 7 ++-
meta/recipes-core/glibc/glibc.inc | 4 ++
...erpreter-overridable-in-tzselect.ksh.patch | 50 +++
...zone-re-written-tzselect-as-posix-sh.patch | 34 -
meta/recipes-core/glibc/glibc_2.34.bb | 2 +-
5 files changed, 61 insertions(+), 36 deletions(-)
create mode 100644
meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
delete mode 100644
meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
b/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
index 44c684bd74b..77ca3105ba0 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.34.bb
@@ -34,13 +34,13 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0001-localedef-Add-hardlink-resolver-from-util-linux.patch \
file://0002-localedef-fix-ups-hardlink-to-make-it-compile.patch \
\
- file://0017-timezone-re-written-tzselect-as-posix-sh.patch \
file://0018-Remove-bash-dependency-for-nscd-init-script.patch \
file://0019-eglibc-Cross-building-and-testing-instructions.patch \
file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \
file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \
file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
+
file://0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch \
"
# Makes for a rather long rev (22 characters), but...
#
@@ -49,6 +49,11 @@ SRCREV_FORMAT = "glibc_localedef"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--with-glibc=${S}"
+
+# We do not need bash to run tzselect script, the default is to use
+# bash but it can be configured by setting KSHELL Makefile variable
+EXTRA_OEMAKE += "KSHELL=/bin/sh"
+
CFLAGS += "-fgnu89-inline -std=gnu99 -DIS_IN\(x\)='0'"
do_install() {
diff --git a/meta/recipes-core/glibc/glibc.inc
b/meta/recipes-core/glibc/glibc.inc
index 80a3e0b493d..fdd241d973b 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -41,6 +41,10 @@ PARALLEL_MAKE = ""
# ensure make uses /bin/bash
EXTRA_OEMAKE += "SHELL=/bin/bash"
+# We do not need bash to run tzselect script, the default is to use
+# bash but it can be configured by setting KSHELL Makefile variable
+EXTRA_OEMAKE += "KSHELL=/bin/sh"
+
do_configure:prepend() {
sed -e "s#/bin/bash#/bin/sh#" -i ${S}/elf/ldd.bash.in
}
diff --git
a/meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
b/meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
new file mode 100644
index 000..0480c47b498
--- /dev/null
+++
b/meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
@@ -0,0 +1,50 @@
+From 76d170fbbfd07b26a0288212201e5d15558db36f Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Thu, 9 Dec 2021 15:14:42 -0800
+Subject: [PATCH] Make shell interpreter overridable in tzselect.ksh
+
+define new macro called KSHELL which can be used to define default shell
+use Bash by default
+
+Upstream-Status: Submitted
[https://patchwork.sourceware.org/project/glibc/patch/20211209234015.1554552-1-raj.k...@gmail.com/]
+Signed-off-by: Khem Raj
+---
+ Makeconfig| 9 +
+ timezone/Makefile | 1 +
+ 2 files changed, 10 insertions(+)
+
+diff --git a/Makeconfig b/Makeconfig
+index 3fa2f13003..a1ea5d5571 100644
+--- a/Makeconfig
b/Makeconfig
+@@ -292,6 +292,15 @@ ifndef sysincludedir
+ sysincludedir = /usr/include
+ endif
+
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++ifndef KSHELL
++KSHELL = /bin/bash
++endif
+
+ # Commands to install files.
+ ifndef INSTALL_DATA
+diff --git a/timezone/Makefile b/timezone/Makefile
+index c624a189b3..dc8f5277de 100644
+--- a/timezone/Makefile
b/timezone/Makefile
+@@ -127,6 +127,7 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
+ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
+ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
+ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
++ -e 's|#!/bin/bash|#!$(KSHELL)|g' \
+ < $< >
[OE-core] [PATCH] glibc: Redo tzselect bash dependency problem
New patch adds a knob to select needed shell interpreter for tzselect
script, which then we excercise via EXTRA_OEMAKE
Signed-off-by: Khem Raj
Cc: Hongxu Jia
---
meta/recipes-core/glibc/glibc.inc | 4 ++
...erpreter-overridable-in-tzselect.ksh.patch | 50 +++
...zone-re-written-tzselect-as-posix-sh.patch | 34 -
meta/recipes-core/glibc/glibc_2.34.bb | 2 +-
4 files changed, 55 insertions(+), 35 deletions(-)
create mode 100644
meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
delete mode 100644
meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
diff --git a/meta/recipes-core/glibc/glibc.inc
b/meta/recipes-core/glibc/glibc.inc
index 80a3e0b493d..fdd241d973b 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -41,6 +41,10 @@ PARALLEL_MAKE = ""
# ensure make uses /bin/bash
EXTRA_OEMAKE += "SHELL=/bin/bash"
+# We do not need bash to run tzselect script, the default is to use
+# bash but it can be configured by setting KSHELL Makefile variable
+EXTRA_OEMAKE += "KSHELL=/bin/sh"
+
do_configure:prepend() {
sed -e "s#/bin/bash#/bin/sh#" -i ${S}/elf/ldd.bash.in
}
diff --git
a/meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
b/meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
new file mode 100644
index 000..0480c47b498
--- /dev/null
+++
b/meta/recipes-core/glibc/glibc/0001-Make-shell-interpreter-overridable-in-tzselect.ksh.patch
@@ -0,0 +1,50 @@
+From 76d170fbbfd07b26a0288212201e5d15558db36f Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Thu, 9 Dec 2021 15:14:42 -0800
+Subject: [PATCH] Make shell interpreter overridable in tzselect.ksh
+
+define new macro called KSHELL which can be used to define default shell
+use Bash by default
+
+Upstream-Status: Submitted
[https://patchwork.sourceware.org/project/glibc/patch/20211209234015.1554552-1-raj.k...@gmail.com/]
+Signed-off-by: Khem Raj
+---
+ Makeconfig| 9 +
+ timezone/Makefile | 1 +
+ 2 files changed, 10 insertions(+)
+
+diff --git a/Makeconfig b/Makeconfig
+index 3fa2f13003..a1ea5d5571 100644
+--- a/Makeconfig
b/Makeconfig
+@@ -292,6 +292,15 @@ ifndef sysincludedir
+ sysincludedir = /usr/include
+ endif
+
++# The full path name of a Posix-compliant shell, preferably one that supports
++# the Korn shell's 'select' statement as an extension.
++# These days, Bash is the most popular.
++# It should be OK to set this to /bin/sh, on platforms where /bin/sh
++# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# is typically nicer if it works.
++ifndef KSHELL
++KSHELL = /bin/bash
++endif
+
+ # Commands to install files.
+ ifndef INSTALL_DATA
+diff --git a/timezone/Makefile b/timezone/Makefile
+index c624a189b3..dc8f5277de 100644
+--- a/timezone/Makefile
b/timezone/Makefile
+@@ -127,6 +127,7 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
+ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
+ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
+ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
++ -e 's|#!/bin/bash|#!$(KSHELL)|g' \
+ < $< > $@.new
+ chmod 555 $@.new
+ mv -f $@.new $@
+--
+2.34.1
+
diff --git
a/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
b/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
deleted file mode 100644
index 100d08599c9..000
---
a/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2731fa0c7463cd160361a8ac92f3bd7f984d953d Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Wed, 18 Mar 2015 00:33:03 +
-Subject: [PATCH] timezone: re-written tzselect as posix sh
-
-To avoid the bash dependency.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia
-Signed-off-by: Khem Raj
- timezone/tzselect.ksh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
-index 18fce27e24..7705df83d7 100755
a/timezone/tzselect.ksh
-+++ b/timezone/tzselect.ksh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # Ask the user about the time zone, and output the resulting TZ value to
stdout.
- # Interact with the user via stderr and stdin.
-
-@@ -34,7 +34,7 @@ REPORT_BUGS_TO=t...@iana.org
-
- # Specify default values for environment variables if they are unset.
- : ${AWK=awk}
--: ${TZDIR=`pwd`}
-+: ${TZDIR=$(pwd)}
-
- # Output one argument as-is to standard output.
- # Safer than 'echo', which can mishandle '\' or leading '-'.
diff --git a/meta/recipes-core/glibc/glibc_2.34.bb
b/meta/recipes-core/glibc/glibc_2.34.bb
index 09d8b0780f6..faef42fd5e3 100644
--- a/meta/recipes-core/glibc/glibc_2.34.bb
+++ b/meta/recipes-core/glibc/glibc_2.34.bb
@@ -32,7 +32,6
Re: [OE-core] [PATCH 02/29] insane.bbclass: do not hardcode oe-core path in upstream-status check
On Thu, 9 Dec 2021 at 13:12, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:
> > # skip patches not in oe-core
> > - if '/meta/' not in fullpath:
> > + oecore_re = re.compile(d.getVar('BBFILE_PATTERN_core'))
> > + match_oecore = oecore_re.search(fullpath)
> > + if not match_oecore:
> > continue
>
...
> I've realised the sstate tests don't pick this up since the metadata is in
> a
> fixed location for the tests so it doesn't change. As well as fixing this
> patch,
> we should revise the sstate sigs tests to test for changes in metadata path
> changing the sigs.
>
I've sent a patch that adds the test that fails with this change and passes
without it.
The next step would be to fix the above snippet. Taking the path variable
out of the signature is possible, but it would be better to do away with
file paths altogether, and start giving layers unique layer ids that can be
used in recipe context to detect which layer we're in. I can't quite figure
out how to do this - presumably, such id would be set in layer.conf, but
its scope would be limited only to recipes from that layer.
Alex
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159485):
https://lists.openembedded.org/g/openembedded-core/message/159485
Mute This Topic: https://lists.openembedded.org/mt/87599626/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] wayland: upgrade 1.19.0 -> 1.20.0
Wayland 1.20.0 is released!
This release contains the following major changes:
- FreeBSD support has been entirely upstreamed and has been added to
our continuous integration system.
- The autotools build system has been dropped. Meson has replaced it.
- A few protocol additions: wl_surface.offset allows clients to update
a surface's buffer offset independently from the buffer,
wl_output.name and description allow clients to identify outputs
without depending on xdg-output-unstable-v1.
- In protocol definitions, events have a new "type" attribute and can
now be marked as destructors.
- A number of bug fixes, including a race condition when destroying
proxies in multi-threaded clients.
Drop patch to fix strndup detection on MinGW that no longer applies, as
meson claims to had that fixed since version 0.54.2
Signed-off-by: Denys Dmytriyenko
---
...0001-build-Fix-strndup-detection-on-MinGW.patch | 37 --
.../{wayland_1.19.0.bb => wayland_1.20.0.bb} | 3 +-
2 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644
meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
rename meta/recipes-graphics/wayland/{wayland_1.19.0.bb => wayland_1.20.0.bb}
(93%)
diff --git
a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
deleted file mode 100644
index ad1063b..000
---
a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6a6223a8e217664a348835e92d5a602f50e18b2c Mon Sep 17 00:00:00 2001
-From: Joshua Watt
-Date: Thu, 20 Feb 2020 15:20:45 -0600
-Subject: [PATCH] build: Fix strndup detection on MinGW
-
-GCC and meson conspire together to incorrectly detect that strndup()
-exists on MinGW as __builtin_strndup, when no such function exists. As a
-work around, meson will skip looking for __builtin functions if an
-'#include' is in the prefix, so add '#include ' when looking
-for strndup().
-
-See: https://github.com/mesonbuild/meson/issues/3672
-
-Signed-off-by: Joshua Watt
-Upstream-Status: Submitted
[https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63]
-
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 11c35fa..80729d0 100644
a/meson.build
-+++ b/meson.build
-@@ -36,11 +36,11 @@ have_funcs = [
- 'posix_fallocate',
- 'prctl',
- 'memfd_create',
-- 'strndup',
- ]
- foreach f: have_funcs
- config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
- endforeach
-+config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and
cc.has_header_symbol('string.h', 'strndup'))
-
- if get_option('libraries')
- ffi_dep = dependency('libffi')
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
b/meta/recipes-graphics/wayland/wayland_1.20.0.bb
similarity index 93%
rename from meta/recipes-graphics/wayland/wayland_1.19.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.20.0.bb
index 4c9ae0f..e984414 100644
--- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.20.0.bb
@@ -15,9 +15,8 @@ DEPENDS = "expat libffi wayland-native"
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://run-ptest \
file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
- file://0001-build-Fix-strndup-detection-on-MinGW.patch \
"
-SRC_URI[sha256sum] =
"baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15"
+SRC_URI[sha256sum] =
"b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725"
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html;
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159484):
https://lists.openembedded.org/g/openembedded-core/message/159484
Mute This Topic: https://lists.openembedded.org/mt/87623718/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] webkitgtk: Add packageconfig for libsoup2
On Thu, Dec 9, 2021 at 3:55 PM Quentin Schulz wrote:
>
> Hi Joshua,
>
> On December 9, 2021 9:44:17 PM GMT+01:00, Joshua Watt
> wrote:
> >Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
> >Including libsoup2 and libsoup3 in the same process can cause strange
> >runtime failures, and the latest release of each major version will
> >cause the process to exit if either if both are detected on process
> >startup.
> >
> >The default is changed from libsoup3 back to libsoup2. Most GNOME
> >packages are still using libsoup2, and a large number of these pull in
> >webkitgtk either directly or indirectly. If webkitgtk uses libsoup3,
> >this causes all of these packages to fail at startup. It appears that
> >most GNOME packages will have to switch to libsoup3 when they transition
> >to GTK4.
> >
> >Signed-off-by: Joshua Watt
> >---
> > meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 --
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> >diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> >b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> >index 413e0cdf92..279e260441 100644
> >--- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> >+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> >@@ -38,12 +38,12 @@ DEPENDS = " \
> > atk \
> > libwebp \
> > gtk+3 \
> >- libsoup \
> > libxslt \
> > libtasn1 \
> > libnotify \
> > gstreamer1.0 \
> > gstreamer1.0-plugins-base \
> >+ ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
> >"libsoup", d)} \
> > "
> >
> > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland
> > x11', d)} \
> >@@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
> >'systemd wayland x11',
> >${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> > 'opengl-or-es', '', d)} \
> >enchant \
> >libsecret \
> >+ soup2 \
> > "
> >
> > PACKAGECONFIG[wayland] =
> > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
> > wpebackend-fdo wayland-native"
> >@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] =
> >"-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
> > PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
> > PACKAGECONFIG[reduce-size] =
> > "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
> > PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
> >+PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,,"
> >
>
> What about leveraging package conflicts in PACKAGECONFIG?
>
> e.g.:
> PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup"
> PACKAGECONFIG[soup] = ",,libsoup,,,soup2"
> ?
> No need for the check on PACKAGECONFIG in depends then.
Ya, the weird part there is that if you want libsoup3, you *must* put
"soup" in PACKAGECONFIG *and* remove soup2, otherwise libsoup won't be
added to DEPENDS and the build fails.
>
> > # webkitgtk is full of /usr/bin/env python, particular for generating docs
> > do_configure[postfuncs] += "setup_python_link"
> >@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
> > SECURITY_CFLAGS:remove:aarch64 = "-fpie"
> > SECURITY_CFLAGS:append:aarch64 = " -fPIE"
> >
> >-FILES:${PN} +=
> >"${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
> >+FILES:${PN} +=
> >"${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
> >
>
> Was this change suppose to make it in this commit?
Yes. The minor version of the library changes based on libsoup3 (4.1)
vs. libsoup2 (4.0)
>
> Cheers,
> Quentin
>
> > RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159483):
https://lists.openembedded.org/g/openembedded-core/message/159483
Mute This Topic: https://lists.openembedded.org/mt/87621243/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] webkitgtk: Add packageconfig for libsoup2
Hi Joshua,
On December 9, 2021 9:44:17 PM GMT+01:00, Joshua Watt
wrote:
>Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
>Including libsoup2 and libsoup3 in the same process can cause strange
>runtime failures, and the latest release of each major version will
>cause the process to exit if either if both are detected on process
>startup.
>
>The default is changed from libsoup3 back to libsoup2. Most GNOME
>packages are still using libsoup2, and a large number of these pull in
>webkitgtk either directly or indirectly. If webkitgtk uses libsoup3,
>this causes all of these packages to fail at startup. It appears that
>most GNOME packages will have to switch to libsoup3 when they transition
>to GTK4.
>
>Signed-off-by: Joshua Watt
>---
> meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>index 413e0cdf92..279e260441 100644
>--- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
>@@ -38,12 +38,12 @@ DEPENDS = " \
> atk \
> libwebp \
> gtk+3 \
>- libsoup \
> libxslt \
> libtasn1 \
> libnotify \
> gstreamer1.0 \
> gstreamer1.0-plugins-base \
>+ ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
>"libsoup", d)} \
> "
>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland
> x11', d)} \
>@@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
>'systemd wayland x11',
>${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> 'opengl-or-es', '', d)} \
>enchant \
>libsecret \
>+ soup2 \
> "
>
> PACKAGECONFIG[wayland] =
> "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
> wpebackend-fdo wayland-native"
>@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] =
>"-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
> PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
> PACKAGECONFIG[reduce-size] =
> "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
> PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
>+PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,,"
>
What about leveraging package conflicts in PACKAGECONFIG?
e.g.:
PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup"
PACKAGECONFIG[soup] = ",,libsoup,,,soup2"
?
No need for the check on PACKAGECONFIG in depends then.
> # webkitgtk is full of /usr/bin/env python, particular for generating docs
> do_configure[postfuncs] += "setup_python_link"
>@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
> SECURITY_CFLAGS:remove:aarch64 = "-fpie"
> SECURITY_CFLAGS:append:aarch64 = " -fPIE"
>
>-FILES:${PN} +=
>"${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
>+FILES:${PN} +=
>"${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
>
Was this change suppose to make it in this commit?
Cheers,
Quentin
> RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159482):
https://lists.openembedded.org/g/openembedded-core/message/159482
Mute This Topic: https://lists.openembedded.org/mt/87621243/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] webkitgtk: Add packageconfig for libsoup2
On Thu, 9 Dec 2021, Joshua Watt wrote:
> Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
> Including libsoup2 and libsoup3 in the same process can cause strange
> runtime failures, and the latest release of each major version will
> cause the process to exit if either if both are detected on process
I'm guessing the "if either" is a leftover from editing?
> startup.
>
> The default is changed from libsoup3 back to libsoup2. Most GNOME
> packages are still using libsoup2, and a large number of these pull in
> webkitgtk either directly or indirectly. If webkitgtk uses libsoup3,
> this causes all of these packages to fail at startup. It appears that
> most GNOME packages will have to switch to libsoup3 when they transition
> to GTK4.
>
> Signed-off-by: Joshua Watt
> ---
> meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> index 413e0cdf92..279e260441 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> @@ -38,12 +38,12 @@ DEPENDS = " \
>atk \
>libwebp \
>gtk+3 \
> - libsoup \
>libxslt \
>libtasn1 \
>libnotify \
>gstreamer1.0 \
>gstreamer1.0-plugins-base \
> + ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
> "libsoup", d)} \
>"
>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland
> x11', d)} \
> @@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
> 'systemd wayland x11',
> ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> 'opengl-or-es', '', d)} \
> enchant \
> libsecret \
> + soup2 \
>"
>
> PACKAGECONFIG[wayland] =
> "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
> wpebackend-fdo wayland-native"
> @@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] =
> "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
> PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
> PACKAGECONFIG[reduce-size] =
> "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
> PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
> +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,,"
>
> # webkitgtk is full of /usr/bin/env python, particular for generating docs
> do_configure[postfuncs] += "setup_python_link"
> @@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
> SECURITY_CFLAGS:remove:aarch64 = "-fpie"
> SECURITY_CFLAGS:append:aarch64 = " -fPIE"
>
> -FILES:${PN} +=
> "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
> +FILES:${PN} +=
> "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
Is this required for the libsoup2 changes?
> RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
>
>
Cheers,
Scott
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159481):
https://lists.openembedded.org/g/openembedded-core/message/159481
Mute This Topic: https://lists.openembedded.org/mt/87621243/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] webkitgtk: Add packageconfig for libsoup2
On Thu, Dec 9, 2021 at 12:44 PM Joshua Watt wrote:
>
> Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
> Including libsoup2 and libsoup3 in the same process can cause strange
> runtime failures, and the latest release of each major version will
> cause the process to exit if either if both are detected on process
> startup.
>
> The default is changed from libsoup3 back to libsoup2. Most GNOME
> packages are still using libsoup2, and a large number of these pull in
> webkitgtk either directly or indirectly. If webkitgtk uses libsoup3,
> this causes all of these packages to fail at startup. It appears that
> most GNOME packages will have to switch to libsoup3 when they transition
> to GTK4.
>
LGTM thanks for doing this, I was struggling through this as well, I
think having the option to
stay with soup2 for now is the best approach instead of boiling the ocean.
> Signed-off-by: Joshua Watt
> ---
> meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> index 413e0cdf92..279e260441 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> @@ -38,12 +38,12 @@ DEPENDS = " \
>atk \
>libwebp \
>gtk+3 \
> - libsoup \
>libxslt \
>libtasn1 \
>libnotify \
>gstreamer1.0 \
>gstreamer1.0-plugins-base \
> + ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
> "libsoup", d)} \
>"
>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland
> x11', d)} \
> @@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
> 'systemd wayland x11',
> ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> 'opengl-or-es', '', d)} \
> enchant \
> libsecret \
> + soup2 \
>"
>
> PACKAGECONFIG[wayland] =
> "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
> wpebackend-fdo wayland-native"
> @@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] =
> "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
> PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
> PACKAGECONFIG[reduce-size] =
> "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
> PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
> +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,,"
>
> # webkitgtk is full of /usr/bin/env python, particular for generating docs
> do_configure[postfuncs] += "setup_python_link"
> @@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
> SECURITY_CFLAGS:remove:aarch64 = "-fpie"
> SECURITY_CFLAGS:append:aarch64 = " -fPIE"
>
> -FILES:${PN} +=
> "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
> +FILES:${PN} +=
> "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
>
> RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
>
> --
> 2.33.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159480):
https://lists.openembedded.org/g/openembedded-core/message/159480
Mute This Topic: https://lists.openembedded.org/mt/87621243/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] sstatetests: add a test for moving oe-core around in the filesystem
Doing that should not change the task signatures.
Signed-off-by: Alexander Kanavin
---
meta/lib/oeqa/selftest/cases/sstatetests.py | 42 +
1 file changed, 42 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py
b/meta/lib/oeqa/selftest/cases/sstatetests.py
index c5beb4de39..2be96f1781 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -11,6 +11,7 @@ import tempfile
from oeqa.selftest.case import OESelftestTestCase
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer,
create_temp_layer
from oeqa.selftest.cases.sstate import SStateBase
+import oe
import bb.siggen
@@ -573,3 +574,44 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
compare_sigfiles(rest, files1, files2, compare=False)
self.fail("sstate hashes not identical.")
+
+def test_sstate_movelayer_samesigs(self):
+"""
+The sstate checksums of two builds with the same oe-core layer in two
+different locations should be the same.
+"""
+core_layer = os.path.join(
+self.tc.td["COREBASE"], 'meta')
+copy_layer_1 = self.topdir + "/meta-copy1/meta"
+copy_layer_2 = self.topdir + "/meta-copy2/meta"
+
+oe.path.copytree(core_layer, copy_layer_1)
+self.write_config("""
+TMPDIR = "${TOPDIR}/tmp-sstatesamehash"
+""")
+bblayers_conf = 'BBLAYERS += "%s"\nBBLAYERS:remove = "%s"' %
(copy_layer_1, core_layer)
+self.write_bblayers_config(bblayers_conf)
+self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash")
+bitbake("bash -S none")
+
+oe.path.copytree(core_layer, copy_layer_2)
+self.write_config("""
+TMPDIR = "${TOPDIR}/tmp-sstatesamehash2"
+""")
+bblayers_conf = 'BBLAYERS += "%s"\nBBLAYERS:remove = "%s"' %
(copy_layer_2, core_layer)
+self.write_bblayers_config(bblayers_conf)
+self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2")
+bitbake("bash -S none")
+
+def get_files(d):
+f = []
+for root, dirs, files in os.walk(d):
+for name in files:
+f.append(os.path.join(root, name))
+return f
+files1 = get_files(self.topdir + "/tmp-sstatesamehash/stamps")
+files2 = get_files(self.topdir + "/tmp-sstatesamehash2/stamps")
+files2 = [x.replace("tmp-sstatesamehash2", "tmp-sstatesamehash") for x
in files2]
+self.maxDiff = None
+self.assertCountEqual(files1, files2)
+
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159479):
https://lists.openembedded.org/g/openembedded-core/message/159479
Mute This Topic: https://lists.openembedded.org/mt/87621407/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] epiphany: Add packageconfig for libsoup2
Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
Including libsoup2 and libsoup3 in the same process can cause strange
runtime failures, and the latest release of each major version will
cause the process to exit if either if both are detected on process
startup.
The default is changed from libsoup3 back to libsoup2 to follow
webkitgtk.
Signed-off-by: Joshua Watt
---
meta/recipes-gnome/epiphany/epiphany_41.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-gnome/epiphany/epiphany_41.0.bb
b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
index 09210b68aa..bc13f10b35 100644
--- a/meta/recipes-gnome/epiphany/epiphany_41.0.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
@@ -17,6 +17,7 @@ DEPENDS = " \
libhandy \
libportal \
glib-2.0-native \
+ ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
"libsoup", d)} \
"
GNOMEBASEBUILDCLASS = "meson"
@@ -30,10 +31,11 @@ SRC_URI =
"${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
"
SRC_URI[archive.sha256sum] =
"b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0"
-EXTRA_OEMESON += "-Dsoup2=disabled"
+PACKAGECONFIG ??= "soup2"
# Developer mode enables debugging
PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
+PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,,"
FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers
${datadir}/metainfo"
RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--
2.33.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159478):
https://lists.openembedded.org/g/openembedded-core/message/159478
Mute This Topic: https://lists.openembedded.org/mt/87621255/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] webkitgtk: Add packageconfig for libsoup2
Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
Including libsoup2 and libsoup3 in the same process can cause strange
runtime failures, and the latest release of each major version will
cause the process to exit if either if both are detected on process
startup.
The default is changed from libsoup3 back to libsoup2. Most GNOME
packages are still using libsoup2, and a large number of these pull in
webkitgtk either directly or indirectly. If webkitgtk uses libsoup3,
this causes all of these packages to fail at startup. It appears that
most GNOME packages will have to switch to libsoup3 when they transition
to GTK4.
Signed-off-by: Joshua Watt
---
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
index 413e0cdf92..279e260441 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
@@ -38,12 +38,12 @@ DEPENDS = " \
atk \
libwebp \
gtk+3 \
- libsoup \
libxslt \
libtasn1 \
libnotify \
gstreamer1.0 \
gstreamer1.0-plugins-base \
+ ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
"libsoup", d)} \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland
x11', d)} \
@@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
'systemd wayland x11',
${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'opengl-or-es', '', d)} \
enchant \
libsecret \
+ soup2 \
"
PACKAGECONFIG[wayland] =
"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
wpebackend-fdo wayland-native"
@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] =
"-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
PACKAGECONFIG[reduce-size] =
"-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
+PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,,"
# webkitgtk is full of /usr/bin/env python, particular for generating docs
do_configure[postfuncs] += "setup_python_link"
@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
SECURITY_CFLAGS:remove:aarch64 = "-fpie"
SECURITY_CFLAGS:append:aarch64 = " -fPIE"
-FILES:${PN} +=
"${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
+FILES:${PN} +=
"${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
--
2.33.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159477):
https://lists.openembedded.org/g/openembedded-core/message/159477
Mute This Topic: https://lists.openembedded.org/mt/87621243/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: udpate to 3.10.1
Refreshed patches.
Signed-off-by: Oleksandr Kravchuk
---
...ib-termcap-to-linker-flags-to-avoid-.patch | 6 ++---
...hell-version-of-python-config-that-w.patch | 7 +++---
...-search-system-for-headers-libraries.patch | 6 ++---
...e-stdin-I-O-errors-same-way-as-maste.patch | 8 +++
...-use-prefix-value-from-build-configu.patch | 8 +++
...file-do-not-compile-.pyc-in-parallel.patch | 7 +++---
...-qemu-wrapper-when-gathering-profile.patch | 7 +++---
...sts-due-to-load-variability-on-YP-AB.patch | 17 ++---
...FLAG_REF-always-for-interned-strings.patch | 4 ++--
...-detection-of-mips-architecture-for-.patch | 20 +++-
...fig-append-STAGING_LIBDIR-python-sys.patch | 4 ++--
...asename-to-replace-CC-for-checking-c.patch | 24 +--
...g.py-use-platlibdir-also-for-purelib.patch | 8 +++
...pes.test_find-skip-without-tools-sdk.patch | 7 +++---
...le.py-correct-the-test-output-format.patch | 14 +--
...report-missing-dependencies-for-disa.patch | 10
...up.py-do-not-add-a-curses-include-pa.patch | 11 +
...tutils-prefix-is-inside-staging-area.patch | 6 ++---
.../python3/avoid_warning_about_tkinter.patch | 6 ++---
.../python/python3/cgi_py.patch | 4 ++--
.../python/python3/crosspythonpath.patch | 15 +---
.../python/python3/makerace.patch | 6 ++---
.../python/python3/python-config.patch| 10
.../{python3_3.10.0.bb => python3_3.10.1.bb} | 2 +-
24 files changed, 109 insertions(+), 108 deletions(-)
rename meta/recipes-devtools/python/{python3_3.10.0.bb => python3_3.10.1.bb}
(99%)
diff --git
a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
index 59592821d7..62ef6efc28 100644
---
a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
+++
b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
@@ -1,4 +1,4 @@
-From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001
+From 80f872e4573f542d33f9151453877d566f79 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Fri, 25 Jan 2019 19:04:13 +0100
Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py
-index 20d7f35..ab18ff0 100644
+index 43e807f..11b5cf5 100644
--- a/setup.py
+++ b/setup.py
-@@ -957,7 +957,6 @@ class PyBuildExt(build_ext):
+@@ -1149,7 +1149,6 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
self.add(Extension('readline', ['readline.c'],
diff --git
a/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
b/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
index 83fd52d87f..d98f243cb1 100644
---
a/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
+++
b/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
@@ -1,4 +1,4 @@
-From 148861fa16f2aaacd518770f337ea54b5182f981 Mon Sep 17 00:00:00 2001
+From 2406432449784243b7590009d42bd0e871253b2e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Tue, 29 Jan 2019 15:03:01 +0100
Subject: [PATCH] Do not use the shell version of python-config that was
@@ -9,15 +9,16 @@ outputs directories correctly.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Alexander Kanavin
+
---
Makefile.pre.in | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2d2e11f..cc19942 100644
+index ee85f35..f0aedb7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1431,12 +1431,9 @@ python-config: $(srcdir)/Misc/python-config.in
Misc/python-config.sh
+@@ -1640,12 +1640,9 @@ python-config: $(srcdir)/Misc/python-config.in
Misc/python-config.sh
sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," <
$(srcdir)/Misc/python-config.in >python-config.py
@ # Replace makefile compat. variable references with shell script
compat. ones; $(VAR) -> ${VAR}
LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' <
Misc/python-config.sh >python-config
diff --git
a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
index 46179ba1d1..27a5992880 100644
---
a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++
Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library
On Thu, Dec 9, 2021 at 7:38 AM Jasper Orschulko wrote: > > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Hi, > > I can't provide any details yet, but I can say with certainty that this > patch breaks our build (using the parent commit > 746b301d37f9b7333f3d93e6fb7ea2808665df41 as refspec during the build > worksasexpected): > > [...] undefined reference to `testing::* > > Can someone confirm this issue? Feel free to reach out for further > details. I've not seen any issues in either local or autobuilder testing, so I think we need more details! Steve > On Fri, 2021-12-03 at 08:19 -1000, Steve Sakoman wrote: > > From: Eero Aaltonen > > > > `googlemock` has been absorbed into the > > [googletest](https://github.com/google/googletest) project and is > > built > > and installed from the same source tree. > > > > `googletest` has provided a CMake Config-file Package starting with > > GTest 1.8.1. `find_package(GTest ...)` by default dispatches first to > > CMake Find Module. Starting with CMake commit > > 2327b4330cce157d616ff8b611b3e77568d00351 in CMake v3.20.0 the module > > dispatches onward to the Config-file Package so that the same targets > > are available. In pre v3.20.0 versions of CMake however the Find > > Module > > masks the targets provided by the upstream `GTest` package. > > > > Update `Modules/FindGTest.cmake` to provide the same targets as the > > CMake Config-file Package and backwards compatible targets and result > > variables. > > > > Signed-off-by: Eero Aaltonen > > Signed-off-by: Steve Sakoman > > --- > > .../cmake/cmake-native_3.16.5.bb | 1 + > > ...ndGTest-Add-target-for-gmock-library.patch | 255 > > ++ > > 2 files changed, 256 insertions(+) > > create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake- > > FindGTest-Add-target-for-gmock-library.patch > > > > diff --git a/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > > b/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > > index b2952ee5f5..96a7be6770 100644 > > --- a/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > > +++ b/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > > @@ -7,6 +7,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \ > > file://environment.d-cmake.sh \ > > > > file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch > > \ > > > > file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > > \ > > + > > file://0006-cmake-FindGTest-Add-target-for-gmock-library.patch \ > > " > > > > > > diff --git a/meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest- > > Add-target-for-gmock-library.patch b/meta/recipes- > > devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock- > > library.patch > > new file mode 100644 > > index 00..267f586a71 > > --- /dev/null > > +++ b/meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- > > target-for-gmock-library.patch > > @@ -0,0 +1,255 @@ > > +From 39eae0d6c1b398f18761abac7f55944f0290f8a1 Mon Sep 17 00:00:00 > > 2001 > > +From: Eero Aaltonen > > +Date: Sun, 17 Oct 2021 17:13:07 +0300 > > +Subject: [PATCH] FindGTest: Add target for gmock library > > + > > +`googlemock` has been absorbed into the > > +[googletest](https://github.com/google/googletest) project and is > > built > > +and installed from the same source tree. > > + > > +As GTest may be built with or without GMock, skip GMock if it is not > > +present. > > + > > +Do not provide result variables for GMock. They are not provided by > > +upstream GTest's CMake Package Configuration File. > > + > > +Also update the test case to cover linking to `GTest::gmock`. > > + > > +The patch was imported from the Kitware git server > > +(g...@gitlab.kitware.com:cmake/cmake.git) as of commit id > > +50bf457a0dd857cf976b22c5be7d333493233d1e > > + > > +Patch was modified to support upper case variable `GTEST_FOUND`. > > + > > +Upstream-Status: Accepted > > [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6632] > > +Milestone: 3.23.0 > > + > > +Signed-off-by: Eero Aaltonen > > +--- > > + .../dev/FindGTest-target-for-gmock.rst| 4 + > > + Modules/FindGTest.cmake | 133 > > +++--- > > + Tests/FindGTest/Test/CMakeLists.txt | 4 + > > + 3 files changed, 121 insertions(+), 20 deletions(-) > > + create mode 100644 Help/release/dev/FindGTest-target-for-gmock.rst > > + > > +diff --git a/Help/release/dev/FindGTest-target-for-gmock.rst > > b/Help/release/dev/FindGTest-target-for-gmock.rst > > +new file mode 100644 > > +index 00..f78242c80e > > +--- /dev/null > > b/Help/release/dev/FindGTest-target-for-gmock.rst > > +@@ -0,0 +1,4 @@ > > ++FindGTest-target-for-gmock > > ++-- > > ++ > > ++* The :module:`FindGTest` module now provides a target for GMock, > > if found. > > +diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake > > +index e015a9840f..0331049594 100644 > > +---
Re: [OE-core] [PATCH] gcc: Fix tm.h plugin header
On Thu, 9 Dec 2021, at 16:40, Khem Raj wrote: > On Thu, Dec 9, 2021 at 7:40 AM Andrei Gherzan wrote: >> >> From: Andrei Gherzan >> >> On x86-64, tm.h (needed to build gcc plugins) tries to include >> config/i386/linux64.h, which isn't installed. Fortunately it also isn't >> used, so simply removing the include statement is an ok fix. >> > > is it due to multilib support ? if so we might be ok since we may not > be using it > but really it will be good to check it with multilib builds of x86_64/x86 I don't think it is related to multilib but I'll give multilib a try. In my case, the issue was revealed when compiling a kernel plugin config. I can't remember right now which one but I can replicate it for logs. -- Andrei -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159474): https://lists.openembedded.org/g/openembedded-core/message/159474 Mute This Topic: https://lists.openembedded.org/mt/87614108/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][dunfell 16/18] cmake: FindGTest: Add target for gmock library
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi, I can't provide any details yet, but I can say with certainty that this patch breaks our build (using the parent commit 746b301d37f9b7333f3d93e6fb7ea2808665df41 as refspec during the build worksasexpected): [...] undefined reference to `testing::* Can someone confirm this issue? Feel free to reach out for further details. - -- With best regards Jasper Orschulko DevOps Engineer Tel. +49 30 58 58 14 265 Fax +49 30 58 58 14 999 jasper.orschu...@iris-sensing.com • • • • • • • • • • • • • • • • • • • • • • • • • • iris-GmbH infrared & intelligent sensors Schnellerstraße 1-5 | 12439 Berlin https://iris-sensing.com/ On Fri, 2021-12-03 at 08:19 -1000, Steve Sakoman wrote: > From: Eero Aaltonen > > `googlemock` has been absorbed into the > [googletest](https://github.com/google/googletest) project and is > built > and installed from the same source tree. > > `googletest` has provided a CMake Config-file Package starting with > GTest 1.8.1. `find_package(GTest ...)` by default dispatches first to > CMake Find Module. Starting with CMake commit > 2327b4330cce157d616ff8b611b3e77568d00351 in CMake v3.20.0 the module > dispatches onward to the Config-file Package so that the same targets > are available. In pre v3.20.0 versions of CMake however the Find > Module > masks the targets provided by the upstream `GTest` package. > > Update `Modules/FindGTest.cmake` to provide the same targets as the > CMake Config-file Package and backwards compatible targets and result > variables. > > Signed-off-by: Eero Aaltonen > Signed-off-by: Steve Sakoman > --- > .../cmake/cmake-native_3.16.5.bb | 1 + > ...ndGTest-Add-target-for-gmock-library.patch | 255 > ++ > 2 files changed, 256 insertions(+) > create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake- > FindGTest-Add-target-for-gmock-library.patch > > diff --git a/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > b/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > index b2952ee5f5..96a7be6770 100644 > --- a/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > +++ b/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb > @@ -7,6 +7,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \ > file://environment.d-cmake.sh \ > > file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch > \ > > file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > \ > + > file://0006-cmake-FindGTest-Add-target-for-gmock-library.patch \ > " > > > diff --git a/meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest- > Add-target-for-gmock-library.patch b/meta/recipes- > devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock- > library.patch > new file mode 100644 > index 00..267f586a71 > --- /dev/null > +++ b/meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- > target-for-gmock-library.patch > @@ -0,0 +1,255 @@ > +From 39eae0d6c1b398f18761abac7f55944f0290f8a1 Mon Sep 17 00:00:00 > 2001 > +From: Eero Aaltonen > +Date: Sun, 17 Oct 2021 17:13:07 +0300 > +Subject: [PATCH] FindGTest: Add target for gmock library > + > +`googlemock` has been absorbed into the > +[googletest](https://github.com/google/googletest) project and is > built > +and installed from the same source tree. > + > +As GTest may be built with or without GMock, skip GMock if it is not > +present. > + > +Do not provide result variables for GMock. They are not provided by > +upstream GTest's CMake Package Configuration File. > + > +Also update the test case to cover linking to `GTest::gmock`. > + > +The patch was imported from the Kitware git server > +(g...@gitlab.kitware.com:cmake/cmake.git) as of commit id > +50bf457a0dd857cf976b22c5be7d333493233d1e > + > +Patch was modified to support upper case variable `GTEST_FOUND`. > + > +Upstream-Status: Accepted > [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6632] > +Milestone: 3.23.0 > + > +Signed-off-by: Eero Aaltonen > +--- > + .../dev/FindGTest-target-for-gmock.rst | 4 + > + Modules/FindGTest.cmake | 133 > +++--- > + Tests/FindGTest/Test/CMakeLists.txt | 4 + > + 3 files changed, 121 insertions(+), 20 deletions(-) > + create mode 100644 Help/release/dev/FindGTest-target-for-gmock.rst > + > +diff --git a/Help/release/dev/FindGTest-target-for-gmock.rst > b/Help/release/dev/FindGTest-target-for-gmock.rst > +new file mode 100644 > +index 00..f78242c80e > +--- /dev/null > b/Help/release/dev/FindGTest-target-for-gmock.rst > +@@ -0,0 +1,4 @@ > ++FindGTest-target-for-gmock > ++-- > ++ > ++* The :module:`FindGTest` module now provides a target for GMock, > if found. > +diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake > +index e015a9840f..0331049594 100644 > +--- a/Modules/FindGTest.cmake > b/Modules/FindGTest.cmake > +@@ -7,10 +7,23 @@
Re: [OE-core] [PATCH 2/4] binutils: Add more detail to the ppc patch
On Thu, 2021-12-09 at 09:31 -0800, Khem Raj wrote: > On Thu, Dec 9, 2021 at 9:25 AM Richard Purdie > wrote: > > > > This adds useful detail from the orginal commit. > > > > Signed-off-by: Richard Purdie > > --- > > ...1-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch | 4 > > 1 file changed, 4 insertions(+) > > > > diff --git > > a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > > > > b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > > index 389232c1e3e..a271f55ea1a 100644 > > --- > > a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > > +++ > > b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > > @@ -3,6 +3,10 @@ From: Zhenhua Luo > > Date: Sat, 11 Jun 2016 22:08:29 -0500 > > Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic > > > > +The wait mnemonic for ppc targets is incorrectly assembled into 0x7c3c > > due > > +to duplicated address definition with waitasec instruction. The issue > > causes > > +kernel boot calltrace for ppc targets when wait instruction is executed. > > This patch bothers me a bit. This either is upstream bug or it is not. > So it should be perhaps forwarded upstream and if it is still needed > and accepted that will be good. > otherwise we should drop it. Yes, that is why I wanted to add the description as it helps with the context and a specific test. I think we need to clean up a few of the binutils patches and share with upstream, see what is said, this is one of them. I obviously saw others I thought we should remove for various reasons :) Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159472): https://lists.openembedded.org/g/openembedded-core/message/159472 Mute This Topic: https://lists.openembedded.org/mt/87616746/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 2/4] binutils: Add more detail to the ppc patch
On Thu, Dec 9, 2021 at 9:25 AM Richard Purdie wrote: > > This adds useful detail from the orginal commit. > > Signed-off-by: Richard Purdie > --- > ...1-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch | 4 > 1 file changed, 4 insertions(+) > > diff --git > a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > > b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > index 389232c1e3e..a271f55ea1a 100644 > --- > a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > +++ > b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > @@ -3,6 +3,10 @@ From: Zhenhua Luo > Date: Sat, 11 Jun 2016 22:08:29 -0500 > Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic > > +The wait mnemonic for ppc targets is incorrectly assembled into 0x7c3c > due > +to duplicated address definition with waitasec instruction. The issue causes > +kernel boot calltrace for ppc targets when wait instruction is executed. This patch bothers me a bit. This either is upstream bug or it is not. So it should be perhaps forwarded upstream and if it is still needed and accepted that will be good. otherwise we should drop it. > + > Signed-off-by: Zhenhua Luo > > Upstream-Status: Pending > -- > 2.32.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159471): https://lists.openembedded.org/g/openembedded-core/message/159471 Mute This Topic: https://lists.openembedded.org/mt/87616746/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/4] binutils: Drop mips gold patch
looks good. On Thu, Dec 9, 2021 at 9:25 AM Richard Purdie wrote: > > As mentioned in a followup to the patch upstream: > > https://sourceware.org/legacy-ml/binutils/2016-08/msg00215.html > > "With 2.16.1, --enable-gold is just ignored when building on mips" > > so we don't need the patch since 2.16.1. > > Signed-off-by: Richard Purdie > --- > .../binutils/binutils-2.37.inc| 1 - > .../0012-Detect-64-bit-MIPS-targets.patch | 47 --- > 2 files changed, 48 deletions(-) > delete mode 100644 > meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch > > diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc > b/meta/recipes-devtools/binutils/binutils-2.37.inc > index 8f91c6460d7..a3e0fbc769d 100644 > --- a/meta/recipes-devtools/binutils/binutils-2.37.inc > +++ b/meta/recipes-devtools/binutils/binutils-2.37.inc > @@ -29,7 +29,6 @@ SRC_URI = "\ > file://0009-Change-default-emulation-for-mips64-linux.patch \ > file://0010-Add-support-for-Netlogic-XLP.patch \ > file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ > - file://0012-Detect-64-bit-MIPS-targets.patch \ > file://0013-Use-libtool-2.4.patch \ > file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ > file://0015-sync-with-OE-libtool-changes.patch \ > diff --git > a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch > > b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch > deleted file mode 100644 > index 04f81c66718..000 > --- > a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From 02374940dd34fddd2b04624af3f23e01f9cb81cd Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Fri, 31 Mar 2017 11:42:03 -0700 > -Subject: [PATCH] Detect 64-bit MIPS targets > - > -Add mips64 target triplets and default to N64 > - > -Upstream-Status: Submitted > -https://sourceware.org/ml/binutils/2016-08/msg00048.html > - > -Signed-off-by: Khem Raj > > - gold/configure.tgt | 14 ++ > - 1 file changed, 14 insertions(+) > - > -diff --git a/gold/configure.tgt b/gold/configure.tgt > -index cac0866e628..24fbf641456 100644 > a/gold/configure.tgt > -+++ b/gold/configure.tgt > -@@ -153,6 +153,13 @@ aarch64*-*) > - targ_big_endian=false > - targ_extra_big_endian=true > - ;; > -+mips*64*el*-*-*|mips*64*le*-*-*) > -+ targ_obj=mips > -+ targ_machine=EM_MIPS_RS3_LE > -+ targ_size=64 > -+ targ_big_endian=false > -+ targ_extra_big_endian=true > -+ ;; > - mips*el*-*-*|mips*le*-*-*) > - targ_obj=mips > - targ_machine=EM_MIPS_RS3_LE > -@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*) > - targ_big_endian=false > - targ_extra_big_endian=true > - ;; > -+mips*64*-*-*) > -+ targ_obj=mips > -+ targ_machine=EM_MIPS > -+ targ_size=64 > -+ targ_big_endian=true > -+ targ_extra_big_endian=false > -+ ;; > - mips*-*-*) > - targ_obj=mips > - targ_machine=EM_MIPS > -- > 2.32.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159470): https://lists.openembedded.org/g/openembedded-core/message/159470 Mute This Topic: https://lists.openembedded.org/mt/87616747/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 3/4] binutils: Drop mips default target patch
On Thu, Dec 9, 2021 at 9:25 AM Richard Purdie
wrote:
>
> Similarly to the recent gcc change, we make gcc default to the 64 bit target
> through configuration now so we don't need to patch this.
>
LGTM
> Signed-off-by: Richard Purdie
> ---
> .../binutils/binutils-2.37.inc| 1 -
> ...e-default-emulation-for-mips64-linux.patch | 57 ---
> 2 files changed, 58 deletions(-)
> delete mode 100644
> meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc
> b/meta/recipes-devtools/binutils/binutils-2.37.inc
> index a3e0fbc769d..8c6e659e73d 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.37.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
> @@ -26,7 +26,6 @@ SRC_URI = "\
> file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
> file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
> file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
> - file://0009-Change-default-emulation-for-mips64-linux.patch \
> file://0010-Add-support-for-Netlogic-XLP.patch \
> file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
> file://0013-Use-libtool-2.4.patch \
> diff --git
> a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
>
> b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
> deleted file mode 100644
> index fab92d52e68..000
> ---
> a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -From fb6d52dda9c230baf869ed5f981581a7b5094b70 Mon Sep 17 00:00:00 2001
> -From: Khem Raj
> -Date: Mon, 2 Mar 2015 01:44:14 +
> -Subject: [PATCH] Change default emulation for mips64*-*-linux
> -
> -we change the default emulations to be N64 instead of N32
> -
> -Upstream-Status: Inappropriate [ OE configuration Specific]
> -
> -Signed-off-by: Khem Raj
>
> - bfd/config.bfd | 8
> - ld/configure.tgt | 8
> - 2 files changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/bfd/config.bfd b/bfd/config.bfd
> -index 30087e3b8f8..1896e11790c 100644
> a/bfd/config.bfd
> -+++ b/bfd/config.bfd
> -@@ -891,12 +891,12 @@ case "${targ}" in
> - targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec
> mips_ecoff_be_vec mips_ecoff_le_vec"
> - ;;
> - mips64*el-*-linux*)
> --targ_defvec=mips_elf32_ntrad_le_vec
> --targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec
> mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
> -+targ_defvec=mips_elf64_trad_le_vec
> -+targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec
> mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
> - ;;
> - mips64*-*-linux*)
> --targ_defvec=mips_elf32_ntrad_be_vec
> --targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec
> mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
> -+targ_defvec=mips_elf64_trad_be_vec
> -+targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec
> mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
> - ;;
> - mips*el-*-linux*)
> - targ_defvec=mips_elf32_trad_le_vec
> -diff --git a/ld/configure.tgt b/ld/configure.tgt
> -index 6205d7c9872..c08533658e5 100644
> a/ld/configure.tgt
> -+++ b/ld/configure.tgt
> -@@ -530,12 +530,12 @@ mips*-*-vxworks*)targ_emul=elf32ebmipvxworks
> - ;;
> - mips*-*-windiss) targ_emul=elf32mipswindiss
> - ;;
> --mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
> -- targ_extra_emuls="elf32btsmipn32 elf32ltsmip
> elf32btsmip elf64ltsmip elf64btsmip"
> -+mips64*el-*-linux-*) targ_emul=elf64ltsmip
> -+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32
> elf32ltsmip elf32btsmip elf64btsmip"
> - targ_extra_libpath=$targ_extra_emuls
> - ;;
> --mips64*-*-linux-*)targ_emul=elf32btsmipn32
> -- targ_extra_emuls="elf32ltsmipn32 elf32btsmip
> elf32ltsmip elf64btsmip elf64ltsmip"
> -+mips64*-*-linux-*)targ_emul=elf64btsmip
> -+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32
> elf32btsmip elf32ltsmip elf64ltsmip"
> - targ_extra_libpath=$targ_extra_emuls
> - ;;
> - mips*el-*-linux-*)targ_emul=elf32ltsmip
> --
> 2.32.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159469):
https://lists.openembedded.org/g/openembedded-core/message/159469
Mute This Topic: https://lists.openembedded.org/mt/87616748/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe:
Re: [OE-core] [PATCH 4/4] binutils: Drop mips XLP support patch
On Thu, Dec 9, 2021 at 9:25 AM Richard Purdie
wrote:
>
> The kernel has dropped this as of 5.16 and we don't want to carry such patches
> without active maintainers for such targets.
LGTM.
>
> It isn't clear who would even have such hardware and it isn't something we can
> support. It would be best maintained as a separate layer by those who can test
> it if needed.
>
> Signed-off-by: Richard Purdie
> ---
> .../binutils/binutils-2.37.inc| 1 -
> .../0010-Add-support-for-Netlogic-XLP.patch | 415 --
> 2 files changed, 416 deletions(-)
> delete mode 100644
> meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc
> b/meta/recipes-devtools/binutils/binutils-2.37.inc
> index 8c6e659e73d..5ac17c4a650 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.37.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
> @@ -26,7 +26,6 @@ SRC_URI = "\
> file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
> file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
> file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
> - file://0010-Add-support-for-Netlogic-XLP.patch \
> file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
> file://0013-Use-libtool-2.4.patch \
> file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
> diff --git
> a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
>
> b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
> deleted file mode 100644
> index b2f7448a288..000
> ---
> a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
> +++ /dev/null
> @@ -1,415 +0,0 @@
> -From 21920b7a3d10a7dae4c1f18a4bb185de78048e3f Mon Sep 17 00:00:00 2001
> -From: Khem Raj
> -Date: Sun, 14 Feb 2016 17:06:19 +
> -Subject: [PATCH] Add support for Netlogic XLP
> -
> -Patch From: Nebu Philips
> -
> -Using the mipsisa64r2nlm target, add support for XLP from
> -Netlogic. Also, update vendor name to NLM wherever applicable.
> -
> -Use 0x0080 for INSN_XLP, the value 0x0040 has already been
> -assigned to INSN_OCTEON3
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj
> -Signed-off-by: Baoshan Pang
> -Signed-off-by: Mark Hatle
>
> - bfd/aoutx.h | 1 +
> - bfd/archures.c| 1 +
> - bfd/bfd-in2.h | 1 +
> - bfd/config.bfd| 5 +
> - bfd/cpu-mips.c| 6 --
> - bfd/elfxx-mips.c | 8
> - binutils/readelf.c| 1 +
> - gas/config/tc-mips.c | 4 +++-
> - gas/configure | 3 +++
> - gas/configure.ac | 3 +++
> - include/elf/mips.h| 1 +
> - include/opcode/mips.h | 8 +++-
> - ld/configure.tgt | 3 +++
> - opcodes/mips-dis.c| 12 +---
> - opcodes/mips-opc.c| 31 ---
> - 15 files changed, 66 insertions(+), 22 deletions(-)
> -
> -diff --git a/bfd/aoutx.h b/bfd/aoutx.h
> -index 17560bd8f54..10b1cad74e6 100644
> a/bfd/aoutx.h
> -+++ b/bfd/aoutx.h
> -@@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
> - case bfd_mach_mipsisa64r6:
> - case bfd_mach_mips_sb1:
> - case bfd_mach_mips_xlr:
> -+ case bfd_mach_mips_xlp:
> - /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
> - arch_flags = M_MIPS2;
> - break;
> -diff --git a/bfd/archures.c b/bfd/archures.c
> -index 390691bfba1..b0b7a5fa7a0 100644
> a/bfd/archures.c
> -+++ b/bfd/archures.c
> -@@ -185,6 +185,7 @@ DESCRIPTION
> - .#define bfd_mach_mips_octeon36503
> - .#define bfd_mach_mips_xlr887682 {* decimal 'XLR'. *}
> - .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *}
> -+.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP'. *}
> - .#define bfd_mach_mipsisa32 32
> - .#define bfd_mach_mipsisa32r2 33
> - .#define bfd_mach_mipsisa32r3 34
> -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
> -index 57b3c453649..a00b0d44359 100644
> a/bfd/bfd-in2.h
> -+++ b/bfd/bfd-in2.h
> -@@ -1562,6 +1562,7 @@ enum bfd_architecture
> - #define bfd_mach_mips_octeon3 6503
> - #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */
> - #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */
> -+#define bfd_mach_mips_xlp 887680 /* decimal 'XLP'. */
> - #define bfd_mach_mipsisa32 32
> - #define bfd_mach_mipsisa32r2 33
> - #define bfd_mach_mipsisa32r3 34
> -diff --git a/bfd/config.bfd b/bfd/config.bfd
> -index 1896e11790c..8270fd2708d 100644
> a/bfd/config.bfd
> -+++ b/bfd/config.bfd
> -@@ -874,6 +874,11 @@ case "${targ}" in
> - targ_defvec=mips_elf32_le_vec
> - targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec
[OE-core] [PATCH] gawk: remove load-sensitive tests
The time and timeout tests are sensitive to system load, and as we run
these on build machines they fail randomly.
[ YOCTO #14371 ]
Signed-off-by: Ross Burton
---
.../gawk/gawk/test-time.patch | 22 ---
meta/recipes-extended/gawk/gawk_5.1.1.bb | 6 -
2 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 meta/recipes-extended/gawk/gawk/test-time.patch
diff --git a/meta/recipes-extended/gawk/gawk/test-time.patch
b/meta/recipes-extended/gawk/gawk/test-time.patch
deleted file mode 100644
index 05a68c5faf8..000
--- a/meta/recipes-extended/gawk/gawk/test-time.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-The test time.awk does a sleep() and checks that the real sleep duration is
-close to the expected duration.
-
-As currently our tests can run on a heavily loaded system, increase the range
of
-a passing duration.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton
-
-diff --git a/test/time.awk b/test/time.awk
-index 517377e2..ca81d92d 100644
a/test/time.awk
-+++ b/test/time.awk
-@@ -16,7 +16,7 @@ BEGIN {
-printf "sleep(%s) = %s\n",delta,sleep(delta)
-t1 = timecheck()
-slept = t1-t0
-- if ((slept < 0.9*delta) || (slept > 1.3*delta))
-+ if ((slept < 0.5*delta) || (slept > 2*delta))
- printf "Warning: tried to sleep %.2f secs, but slept for %.2f secs\n",
-delta,slept
- }
diff --git a/meta/recipes-extended/gawk/gawk_5.1.1.bb
b/meta/recipes-extended/gawk/gawk_5.1.1.bb
index 215ac8c8607..e3d85c8d539 100644
--- a/meta/recipes-extended/gawk/gawk_5.1.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.1.1.bb
@@ -17,7 +17,6 @@ PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
file://run-ptest \
- file://test-time.patch \
"
SRC_URI[sha256sum] =
"6168d8d1dc8f74bd17d9dc22fa9634c49070f232343b744901da15fb4f06bffd"
@@ -48,6 +47,11 @@ do_install_ptest() {
-e 's|#!${base_bindir}/awk|#!${bindir}/awk|g'
${D}${PTEST_PATH}/test/*.awk
sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests
+
+ # These tests require an unloaded host as otherwise timing sensitive
tests can fail
+ # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371
+ rm -f ${D}${PTEST_PATH}/test/time.*
+ rm -f ${D}${PTEST_PATH}/test/timeout.*
}
RDEPENDS:${PN}-ptest += "make"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159467):
https://lists.openembedded.org/g/openembedded-core/message/159467
Mute This Topic: https://lists.openembedded.org/mt/87616758/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/4] binutils: Drop mips gold patch
As mentioned in a followup to the patch upstream: https://sourceware.org/legacy-ml/binutils/2016-08/msg00215.html "With 2.16.1, --enable-gold is just ignored when building on mips" so we don't need the patch since 2.16.1. Signed-off-by: Richard Purdie --- .../binutils/binutils-2.37.inc| 1 - .../0012-Detect-64-bit-MIPS-targets.patch | 47 --- 2 files changed, 48 deletions(-) delete mode 100644 meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc b/meta/recipes-devtools/binutils/binutils-2.37.inc index 8f91c6460d7..a3e0fbc769d 100644 --- a/meta/recipes-devtools/binutils/binutils-2.37.inc +++ b/meta/recipes-devtools/binutils/binutils-2.37.inc @@ -29,7 +29,6 @@ SRC_URI = "\ file://0009-Change-default-emulation-for-mips64-linux.patch \ file://0010-Add-support-for-Netlogic-XLP.patch \ file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0012-Detect-64-bit-MIPS-targets.patch \ file://0013-Use-libtool-2.4.patch \ file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ file://0015-sync-with-OE-libtool-changes.patch \ diff --git a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch deleted file mode 100644 index 04f81c66718..000 --- a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 02374940dd34fddd2b04624af3f23e01f9cb81cd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 31 Mar 2017 11:42:03 -0700 -Subject: [PATCH] Detect 64-bit MIPS targets - -Add mips64 target triplets and default to N64 - -Upstream-Status: Submitted -https://sourceware.org/ml/binutils/2016-08/msg00048.html - -Signed-off-by: Khem Raj - gold/configure.tgt | 14 ++ - 1 file changed, 14 insertions(+) - -diff --git a/gold/configure.tgt b/gold/configure.tgt -index cac0866e628..24fbf641456 100644 a/gold/configure.tgt -+++ b/gold/configure.tgt -@@ -153,6 +153,13 @@ aarch64*-*) - targ_big_endian=false - targ_extra_big_endian=true - ;; -+mips*64*el*-*-*|mips*64*le*-*-*) -+ targ_obj=mips -+ targ_machine=EM_MIPS_RS3_LE -+ targ_size=64 -+ targ_big_endian=false -+ targ_extra_big_endian=true -+ ;; - mips*el*-*-*|mips*le*-*-*) - targ_obj=mips - targ_machine=EM_MIPS_RS3_LE -@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*) - targ_big_endian=false - targ_extra_big_endian=true - ;; -+mips*64*-*-*) -+ targ_obj=mips -+ targ_machine=EM_MIPS -+ targ_size=64 -+ targ_big_endian=true -+ targ_extra_big_endian=false -+ ;; - mips*-*-*) - targ_obj=mips - targ_machine=EM_MIPS -- 2.32.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159464): https://lists.openembedded.org/g/openembedded-core/message/159464 Mute This Topic: https://lists.openembedded.org/mt/87616747/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 4/4] binutils: Drop mips XLP support patch
The kernel has dropped this as of 5.16 and we don't want to carry such patches
without active maintainers for such targets.
It isn't clear who would even have such hardware and it isn't something we can
support. It would be best maintained as a separate layer by those who can test
it if needed.
Signed-off-by: Richard Purdie
---
.../binutils/binutils-2.37.inc| 1 -
.../0010-Add-support-for-Netlogic-XLP.patch | 415 --
2 files changed, 416 deletions(-)
delete mode 100644
meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc
b/meta/recipes-devtools/binutils/binutils-2.37.inc
index 8c6e659e73d..5ac17c4a650 100644
--- a/meta/recipes-devtools/binutils/binutils-2.37.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
@@ -26,7 +26,6 @@ SRC_URI = "\
file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
- file://0010-Add-support-for-Netlogic-XLP.patch \
file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
file://0013-Use-libtool-2.4.patch \
file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
diff --git
a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
deleted file mode 100644
index b2f7448a288..000
---
a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-From 21920b7a3d10a7dae4c1f18a4bb185de78048e3f Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sun, 14 Feb 2016 17:06:19 +
-Subject: [PATCH] Add support for Netlogic XLP
-
-Patch From: Nebu Philips
-
-Using the mipsisa64r2nlm target, add support for XLP from
-Netlogic. Also, update vendor name to NLM wherever applicable.
-
-Use 0x0080 for INSN_XLP, the value 0x0040 has already been
-assigned to INSN_OCTEON3
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
-Signed-off-by: Baoshan Pang
-Signed-off-by: Mark Hatle
- bfd/aoutx.h | 1 +
- bfd/archures.c| 1 +
- bfd/bfd-in2.h | 1 +
- bfd/config.bfd| 5 +
- bfd/cpu-mips.c| 6 --
- bfd/elfxx-mips.c | 8
- binutils/readelf.c| 1 +
- gas/config/tc-mips.c | 4 +++-
- gas/configure | 3 +++
- gas/configure.ac | 3 +++
- include/elf/mips.h| 1 +
- include/opcode/mips.h | 8 +++-
- ld/configure.tgt | 3 +++
- opcodes/mips-dis.c| 12 +---
- opcodes/mips-opc.c| 31 ---
- 15 files changed, 66 insertions(+), 22 deletions(-)
-
-diff --git a/bfd/aoutx.h b/bfd/aoutx.h
-index 17560bd8f54..10b1cad74e6 100644
a/bfd/aoutx.h
-+++ b/bfd/aoutx.h
-@@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
- case bfd_mach_mipsisa64r6:
- case bfd_mach_mips_sb1:
- case bfd_mach_mips_xlr:
-+ case bfd_mach_mips_xlp:
- /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
- arch_flags = M_MIPS2;
- break;
-diff --git a/bfd/archures.c b/bfd/archures.c
-index 390691bfba1..b0b7a5fa7a0 100644
a/bfd/archures.c
-+++ b/bfd/archures.c
-@@ -185,6 +185,7 @@ DESCRIPTION
- .#define bfd_mach_mips_octeon36503
- .#define bfd_mach_mips_xlr887682 {* decimal 'XLR'. *}
- .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *}
-+.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP'. *}
- .#define bfd_mach_mipsisa32 32
- .#define bfd_mach_mipsisa32r2 33
- .#define bfd_mach_mipsisa32r3 34
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 57b3c453649..a00b0d44359 100644
a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -1562,6 +1562,7 @@ enum bfd_architecture
- #define bfd_mach_mips_octeon3 6503
- #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */
- #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */
-+#define bfd_mach_mips_xlp 887680 /* decimal 'XLP'. */
- #define bfd_mach_mipsisa32 32
- #define bfd_mach_mipsisa32r2 33
- #define bfd_mach_mipsisa32r3 34
-diff --git a/bfd/config.bfd b/bfd/config.bfd
-index 1896e11790c..8270fd2708d 100644
a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -874,6 +874,11 @@ case "${targ}" in
- targ_defvec=mips_elf32_le_vec
- targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
- ;;
-+ mipsisa64*-*-elf*)
-+ targ_defvec=mips_elf32_trad_be_vec
-+ targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec
mips_elf64_trad_le_vec"
-+ want64=true
-+ ;;
- mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none)
-
[OE-core] [PATCH 2/4] binutils: Add more detail to the ppc patch
This adds useful detail from the orginal commit. Signed-off-by: Richard Purdie --- ...1-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index 389232c1e3e..a271f55ea1a 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -3,6 +3,10 @@ From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic +The wait mnemonic for ppc targets is incorrectly assembled into 0x7c3c due +to duplicated address definition with waitasec instruction. The issue causes +kernel boot calltrace for ppc targets when wait instruction is executed. + Signed-off-by: Zhenhua Luo Upstream-Status: Pending -- 2.32.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159463): https://lists.openembedded.org/g/openembedded-core/message/159463 Mute This Topic: https://lists.openembedded.org/mt/87616746/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 3/4] binutils: Drop mips default target patch
Similarly to the recent gcc change, we make gcc default to the 64 bit target
through configuration now so we don't need to patch this.
Signed-off-by: Richard Purdie
---
.../binutils/binutils-2.37.inc| 1 -
...e-default-emulation-for-mips64-linux.patch | 57 ---
2 files changed, 58 deletions(-)
delete mode 100644
meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc
b/meta/recipes-devtools/binutils/binutils-2.37.inc
index a3e0fbc769d..8c6e659e73d 100644
--- a/meta/recipes-devtools/binutils/binutils-2.37.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
@@ -26,7 +26,6 @@ SRC_URI = "\
file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
- file://0009-Change-default-emulation-for-mips64-linux.patch \
file://0010-Add-support-for-Netlogic-XLP.patch \
file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
file://0013-Use-libtool-2.4.patch \
diff --git
a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
deleted file mode 100644
index fab92d52e68..000
---
a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From fb6d52dda9c230baf869ed5f981581a7b5094b70 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Mon, 2 Mar 2015 01:44:14 +
-Subject: [PATCH] Change default emulation for mips64*-*-linux
-
-we change the default emulations to be N64 instead of N32
-
-Upstream-Status: Inappropriate [ OE configuration Specific]
-
-Signed-off-by: Khem Raj
- bfd/config.bfd | 8
- ld/configure.tgt | 8
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/bfd/config.bfd b/bfd/config.bfd
-index 30087e3b8f8..1896e11790c 100644
a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -891,12 +891,12 @@ case "${targ}" in
- targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec
mips_ecoff_be_vec mips_ecoff_le_vec"
- ;;
- mips64*el-*-linux*)
--targ_defvec=mips_elf32_ntrad_le_vec
--targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec
mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
-+targ_defvec=mips_elf64_trad_le_vec
-+targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec
mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
- ;;
- mips64*-*-linux*)
--targ_defvec=mips_elf32_ntrad_be_vec
--targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec
mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
-+targ_defvec=mips_elf64_trad_be_vec
-+targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec
mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
- ;;
- mips*el-*-linux*)
- targ_defvec=mips_elf32_trad_le_vec
-diff --git a/ld/configure.tgt b/ld/configure.tgt
-index 6205d7c9872..c08533658e5 100644
a/ld/configure.tgt
-+++ b/ld/configure.tgt
-@@ -530,12 +530,12 @@ mips*-*-vxworks*)targ_emul=elf32ebmipvxworks
- ;;
- mips*-*-windiss) targ_emul=elf32mipswindiss
- ;;
--mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
-- targ_extra_emuls="elf32btsmipn32 elf32ltsmip
elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*) targ_emul=elf64ltsmip
-+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32
elf32ltsmip elf32btsmip elf64btsmip"
- targ_extra_libpath=$targ_extra_emuls
- ;;
--mips64*-*-linux-*)targ_emul=elf32btsmipn32
-- targ_extra_emuls="elf32ltsmipn32 elf32btsmip
elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)targ_emul=elf64btsmip
-+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32
elf32btsmip elf32ltsmip elf64ltsmip"
- targ_extra_libpath=$targ_extra_emuls
- ;;
- mips*el-*-linux-*)targ_emul=elf32ltsmip
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159465):
https://lists.openembedded.org/g/openembedded-core/message/159465
Mute This Topic: https://lists.openembedded.org/mt/87616748/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/6] overlayfs-etc: mount etc as overlayfs
On Thu, 2021-12-09 at 16:19 +0100, Vyacheslav Yurkov wrote: > On 09.12.2021 12:08, Richard Purdie wrote: > > The second thing which I don't really like is this mix of shell and python, > > it > > is very confusing to read. I'd much rather we put template files into > > meta/lib/files/ and then read them from there for the variable > > substitutions. We > > do this for other scripts. I appreciate the overlayfs class merged without > > that > > but I think we need to fix this there as well. > > Thanks for the feedback, Richard. > I see only meta/files. I guess you meant this directory. I did, yes. Not sure where the lib came from! :) > Will do the same for overlayfs.bbclass too. Thanks! Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159462): https://lists.openembedded.org/g/openembedded-core/message/159462 Mute This Topic: https://lists.openembedded.org/mt/87162487/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] gcc: Fix tm.h plugin header
On Thu, Dec 9, 2021 at 7:40 AM Andrei Gherzan wrote:
>
> From: Andrei Gherzan
>
> On x86-64, tm.h (needed to build gcc plugins) tries to include
> config/i386/linux64.h, which isn't installed. Fortunately it also isn't
> used, so simply removing the include statement is an ok fix.
>
is it due to multilib support ? if so we might be ok since we may not
be using it
but really it will be good to check it with multilib builds of x86_64/x86
> Signed-off-by: Bernhard Rosenkränzer
> Signed-off-by: Andrei Gherzan
> ---
> meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 3 +++
> meta/recipes-devtools/gcc/gcc-cross.inc | 3 +++
> meta/recipes-devtools/gcc/gcc-target.inc | 3 +++
> 3 files changed, 9 insertions(+)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> index 495dd9070b..a64fcc50ce 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> @@ -139,6 +139,9 @@ do_install () {
> cp ${S}/libquadmath/quadmath.h
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
> cp ${S}/libquadmath/quadmath_weak.h
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
>
> + # Fix a plugin header including a nonexistant (and unnecessary) header
> + sed -i -e '/config\/i386\/linux64\.h/d'
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h
> +
> # install LTO linker plugins where binutils tools can find it
> install -d ${D}${libdir}/bfd-plugins
> ln -sf ${LIBRELPATH}/liblto_plugin.so
> ${D}${libdir}/bfd-plugins/liblto_plugin.so
> diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc
> b/meta/recipes-devtools/gcc/gcc-cross.inc
> index 3ffa1f0c46..ac34d5116a 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross.inc
> @@ -119,6 +119,9 @@ do_install () {
> cp ${S}/libquadmath/quadmath.h
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
> cp ${S}/libquadmath/quadmath_weak.h
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
>
> + # Fix a plugin header including a nonexistant (and unnecessary) header
> + sed -i -e '/config\/i386\/linux64\.h/d'
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h
> +
> find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f
> -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
>
> # install LTO linker plugins where binutils tools can find it
> diff --git a/meta/recipes-devtools/gcc/gcc-target.inc
> b/meta/recipes-devtools/gcc/gcc-target.inc
> index bf55e692e6..4d087c5183 100644
> --- a/meta/recipes-devtools/gcc/gcc-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-target.inc
> @@ -187,6 +187,9 @@ do_install () {
> rm -f
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h
> rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h
>
> + # Fix a plugin header including a nonexistant (and unnecessary) header
> + sed -i -e '/config\/i386\/linux64\.h/d'
> ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h
> +
> cd ${D}${bindir}
>
> # We care about g++ not c++
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159461):
https://lists.openembedded.org/g/openembedded-core/message/159461
Mute This Topic: https://lists.openembedded.org/mt/87614108/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] [poky][dunfell][PATCH] busybox: Fix multiple security issues in awk
Could you rebase this patch on current dunfell head (and fix fuzz if necessary)?
Thanks!
Steve
On Wed, Dec 8, 2021 at 7:13 PM sana kazi wrote:
>
> CVE-2021-423xx-awk.patch fixes below listed CVEs for busybox:
> CVE-2021-42378, CVE-2021-42379, CVE-2021-42380, CVE-2021-42381,
> CVE-2021-42382, CVE-2021-42384, CVE-2021-42385, CVE-2021-42386
>
> Signed-off-by: Sana Kazi
> Signed-off-by: Sana Kazi
> ---
> meta/recipes-core/busybox/busybox_1.31.1.bb | 1 +
> .../busybox/files/CVE-2021-423xx-awk.patch| 203 ++
> 2 files changed, 204 insertions(+)
> create mode 100644 meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
>
> diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb
> b/meta/recipes-core/busybox/busybox_1.31.1.bb
> index d9d5f4f96b..1bb0c028ac 100644
> --- a/meta/recipes-core/busybox/busybox_1.31.1.bb
> +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb
> @@ -52,6 +52,7 @@ SRC_URI =
> "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
> file://0001-hwclock-make-glibc-2.31-compatible.patch \
> file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \
> file://0001-mktemp-add-tmpdir-option.patch \
> + file://CVE-2021-423xx-awk.patch \
> "
> SRC_URI_append_libc-musl = " file://musl.cfg "
>
> diff --git a/meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
> b/meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
> new file mode 100644
> index 00..49296354cb
> --- /dev/null
> +++ b/meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
> @@ -0,0 +1,203 @@
> +Description: fix multiple security issues in awk
> +Origin: backported awk.c from busybox 1.34.1
> +
> +CVE: CVE-2021-42378
> +CVE: CVE-2021-42379
> +CVE: CVE-2021-42380
> +CVE: CVE-2021-42381
> +CVE: CVE-2021-42382
> +CVE: CVE-2021-42384
> +CVE: CVE-2021-42385
> +CVE: CVE-2021-42386
> +
> +Upstream-Status: Backport
> [https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/busybox/1:1.30.1-6ubuntu3.1/busybox_1.30.1-6ubuntu3.1.debian.tar.xz]
> +
> +Comment: Refreshed first hunk and removed few hunks as they are already
> present in source.
> +
> +Signed-off-by: Sana Kazi
> +
> +--- a/editors/awk.c
> b/editors/awk.c
> +@@ -272,7 +272,8 @@
> + /* if previous token class is CONCAT1 and next is CONCAT2, concatenation */
> + /* operator is inserted between them */
> + #define TC_CONCAT1 (TC_VARIABLE | TC_ARRTERM | TC_SEQTERM \
> +- | TC_STRING | TC_NUMBER | TC_UOPPOST)
> ++ | TC_STRING | TC_NUMBER | TC_UOPPOST \
> ++ | TC_LENGTH)
> + #define TC_CONCAT2 (TC_OPERAND | TC_UOPPRE)
> +
> + #define OF_RES1 0x01
> +@@ -401,7 +405,7 @@ static const char tokenlist[] ALIGN1 =
> +
> + #define OC_B OC_BUILTINCVE-2021-423xx-awk.patch
> +
> +-static const uint32_t tokeninfo[] = {
> ++static const uint32_t tokeninfo[] ALIGN4 = {
> + 0,
> + 0,
> + OC_REGEXP
> +@@ -1067,8 +1071,10 @@ static uint32_t next_token(uint32_t expe
> + const uint32_t *ti;
> +
> + if (t_rollback) {
> ++ debug_printf_parse("%s: using rolled-back token\n", __func__);
> + t_rollback = FALSE;
> + } else if (concat_inserted) {
> ++ debug_printf_parse("%s: using concat-inserted token\n",
> __func__);
> + concat_inserted = FALSE;
> + t_tclass = save_tclass;
> + t_info = save_info;
> +@@ -1197,7 +1203,11 @@ static uint32_t next_token(uint32_t expe
> + goto readnext;
> +
> + /* insert concatenation operator when needed */
> +- if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected
> & TC_BINOP)) {
> ++ debug_printf_parse("%s: %x %x %x concat_inserted?\n",
> __func__,
> ++ (ltclass & TC_CONCAT1), (tc & TC_CONCAT2), (expected
> & TC_BINOP));
> ++ if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected
> & TC_BINOP)
> ++ && !(ltclass == TC_LENGTH && tc == TC_SEQSTART) /* but not
> for "length(..." */
> ++ ) {
> + concat_inserted = TRUE;
> + save_tclass = tc;
> + save_info = t_info;
> +@@ -1205,6 +1215,7 @@ static uint32_t next_token(uint32_t expe
> + t_info = OC_CONCAT | SS | P(35);
> + }
> +
> ++ debug_printf_parse("%s: t_tclass=tc=%x\n", __func__,
> t_tclass);
> + t_tclass = tc;
> + }
> + ltclass = t_tclass;
> +@@ -1215,6 +1226,7 @@ static uint32_t next_token(uint32_t expe
> + EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN);
> + }
> +
> ++ debug_printf_parse("%s: returning, ltclass:%x t_double:%f\n",
> __func__, ltclass, t_double);
> + return ltclass;
> + #undef concat_inserted
> + #undef save_tclass
> +@@ -1279,7 +1291,7 @@ static node
Re: [OE-core] [PATCH] mesa: Avoid PACKAGECONFIG warning for broadcom entry
Hi, On Thu, 9 Dec 2021, at 15:41, Konrad Weihmann wrote: > On 09.12.21 16:38, Andrei Gherzan wrote: >> From: Andrei Gherzan >> >> Signed-off-by: Andrei Gherzan >> --- >> meta/recipes-graphics/mesa/mesa.inc | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/meta/recipes-graphics/mesa/mesa.inc >> b/meta/recipes-graphics/mesa/mesa.inc >> index c894c2dab5..8db91a7b2e 100644 >> --- a/meta/recipes-graphics/mesa/mesa.inc >> +++ b/meta/recipes-graphics/mesa/mesa.inc >> @@ -128,6 +128,7 @@ PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" >> PACKAGECONFIG[broadcom] = "" > > Isn't that the very same as this one ^^^? It is indeed. Khem was faster and I haven't seen his patch. Can be ignored. It was fixes as part of commit 6add96e4af46eaabb6c70e3ce3a27a4b198d7cb6 Author: Khem Raj Date: Tue Dec 7 12:16:43 2021 -0800 mesa: Define broadcom packageconfig knob -- Andrei -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159459): https://lists.openembedded.org/g/openembedded-core/message/159459 Mute This Topic: https://lists.openembedded.org/mt/87614068/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] mesa: Avoid PACKAGECONFIG warning for broadcom entry
On 09.12.21 16:38, Andrei Gherzan wrote: From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index c894c2dab5..8db91a7b2e 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -128,6 +128,7 @@ PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" PACKAGECONFIG[broadcom] = "" Isn't that the very same as this one ^^^? PACKAGECONFIG[etnaviv] = "" PACKAGECONFIG[freedreno] = "" +PACKAGECONFIG[broadcom] = "" The indent doesn't really match the others PACKAGECONFIG[kmsro] = "" PACKAGECONFIG[vc4] = "" PACKAGECONFIG[v3d] = "" Could you please highlight what kind of warning you're seeing as part of the commit message -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159458): https://lists.openembedded.org/g/openembedded-core/message/159458 Mute This Topic: https://lists.openembedded.org/mt/87614068/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] gcc: Fix tm.h plugin header
From: Andrei Gherzan
On x86-64, tm.h (needed to build gcc plugins) tries to include
config/i386/linux64.h, which isn't installed. Fortunately it also isn't
used, so simply removing the include statement is an ok fix.
Signed-off-by: Bernhard Rosenkränzer
Signed-off-by: Andrei Gherzan
---
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 3 +++
meta/recipes-devtools/gcc/gcc-cross.inc | 3 +++
meta/recipes-devtools/gcc/gcc-target.inc | 3 +++
3 files changed, 9 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 495dd9070b..a64fcc50ce 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -139,6 +139,9 @@ do_install () {
cp ${S}/libquadmath/quadmath.h
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
cp ${S}/libquadmath/quadmath_weak.h
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+ # Fix a plugin header including a nonexistant (and unnecessary) header
+ sed -i -e '/config\/i386\/linux64\.h/d'
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h
+
# install LTO linker plugins where binutils tools can find it
install -d ${D}${libdir}/bfd-plugins
ln -sf ${LIBRELPATH}/liblto_plugin.so
${D}${libdir}/bfd-plugins/liblto_plugin.so
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc
b/meta/recipes-devtools/gcc/gcc-cross.inc
index 3ffa1f0c46..ac34d5116a 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -119,6 +119,9 @@ do_install () {
cp ${S}/libquadmath/quadmath.h
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
cp ${S}/libquadmath/quadmath_weak.h
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+ # Fix a plugin header including a nonexistant (and unnecessary) header
+ sed -i -e '/config\/i386\/linux64\.h/d'
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h
+
find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not
-name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
# install LTO linker plugins where binutils tools can find it
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc
b/meta/recipes-devtools/gcc/gcc-target.inc
index bf55e692e6..4d087c5183 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -187,6 +187,9 @@ do_install () {
rm -f
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h
rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h
+ # Fix a plugin header including a nonexistant (and unnecessary) header
+ sed -i -e '/config\/i386\/linux64\.h/d'
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h
+
cd ${D}${bindir}
# We care about g++ not c++
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159457):
https://lists.openembedded.org/g/openembedded-core/message/159457
Mute This Topic: https://lists.openembedded.org/mt/87614108/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] mesa: Avoid PACKAGECONFIG warning for broadcom entry
From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index c894c2dab5..8db91a7b2e 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -128,6 +128,7 @@ PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = "" PACKAGECONFIG[freedreno] = "" +PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[kmsro] = "" PACKAGECONFIG[vc4] = "" PACKAGECONFIG[v3d] = "" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159456): https://lists.openembedded.org/g/openembedded-core/message/159456 Mute This Topic: https://lists.openembedded.org/mt/87614068/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/6] overlayfs-etc: mount etc as overlayfs
On 09.12.2021 12:08, Richard Purdie wrote: The second thing which I don't really like is this mix of shell and python, it is very confusing to read. I'd much rather we put template files into meta/lib/files/ and then read them from there for the variable substitutions. We do this for other scripts. I appreciate the overlayfs class merged without that but I think we need to fix this there as well. Thanks for the feedback, Richard. I see only meta/files. I guess you meant this directory. Will do the same for overlayfs.bbclass too. Adding the tests in this series is really great through, thanks for that! Cheers, Richard Regards, Vyacheslav -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159455): https://lists.openembedded.org/g/openembedded-core/message/159455 Mute This Topic: https://lists.openembedded.org/mt/87162487/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/6] overlayfs-etc: mount etc as overlayfs
On 09.12.2021 11:59, Ross Burton wrote: On Fri, 19 Nov 2021 at 06:15, Vyacheslav Yurkov wrote: +# Class for setting up /etc in overlayfs +# +# In order to have /etc directory in overlayfs a special handling at early boot stage is required +# The idea is to supply a custom init script that mounts /etc before launching actual init program, +# because the latter already requires /etc to be mounted Can you elaborate on the exact scenario that is being supported here? Is it read-only / with /etc (and potentially more) in an overlayfs? Correct, that's a read-only / with only /etc in an overlayfs. For other directories (not under /etc) there's a systemd based solution in overlayfs.bbclass. +OVERLAYFS_ETC_MOUNT_POINT ?= "/data" +OVERLAYFS_ETC_FSTYPE ?= "ext4" +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p2" I'm guessing these are not universal defaults, but the values that you use. If you can't provide default values which will actually work out of the box, just set them to "" and the class can abort if they're not set. Ross Thanks for the feedback. Will fix that. Vyacheslav -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159454): https://lists.openembedded.org/g/openembedded-core/message/159454 Mute This Topic: https://lists.openembedded.org/mt/87162487/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] [dunfell][PATCH] gcc: Add CVE-2021-37322 to the list of CVEs to ignore
On Thu, 2021-12-09 at 04:43 -1000, Steve Sakoman wrote: > On Thu, Dec 9, 2021 at 4:36 AM Tim Orling wrote: > > > > > > > > On Thu, Dec 9, 2021 at 4:12 AM Marta Rybczynska > > wrote: > > > > > > On Thu, Dec 9, 2021 at 7:53 AM Tim Orling wrote: > > > > > > > > From: Richard Purdie > > > > > > > > The CVE applies to binutils 2.26 and not to gcc so ignore there. > > > > > > > > > > Tim, > > > Have you requested a NVD database change on this one? Or you prefer me to > > > do it? > > > > > I have not. I was simply back-porting the patch from Richard. > > It's always preferable to request a change to the database when it is > wrong. They are usually pretty responsive. > > I'll take the patch for now, and if/when they accept the update we can > remove the exception in master/dunfell. This one is a little fuzzy. There is an entry for binutils there too and I didn't understand why there was an unversioned gcc entry there with it. It could be our CPE parsing isn't quite right. I may also be referring to gcc the project rather than the component. Regardless, I wanted it off our CVE list! Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159453): https://lists.openembedded.org/g/openembedded-core/message/159453 Mute This Topic: https://lists.openembedded.org/mt/87607595/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] [dunfell][PATCH] gcc: Add CVE-2021-37322 to the list of CVEs to ignore
On Thu, Dec 9, 2021 at 4:36 AM Tim Orling wrote: > > > > On Thu, Dec 9, 2021 at 4:12 AM Marta Rybczynska wrote: >> >> On Thu, Dec 9, 2021 at 7:53 AM Tim Orling wrote: >> > >> > From: Richard Purdie >> > >> > The CVE applies to binutils 2.26 and not to gcc so ignore there. >> > >> >> Tim, >> Have you requested a NVD database change on this one? Or you prefer me to do >> it? >> > I have not. I was simply back-porting the patch from Richard. It's always preferable to request a change to the database when it is wrong. They are usually pretty responsive. I'll take the patch for now, and if/when they accept the update we can remove the exception in master/dunfell. Steve -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159452): https://lists.openembedded.org/g/openembedded-core/message/159452 Mute This Topic: https://lists.openembedded.org/mt/87607595/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 05/29] serf: mark patches as inappropriate for upstream submission
I sent a message to oe-architecture. Alex On Thu, 9 Dec 2021 at 15:08, Alexander Kanavin via lists.openembedded.org wrote: > I think we only have a single doc that needs to be updated first: > > > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status > > The question is, how? Presumably, I need to make some kind of official > proposal to OE organization, and not just edit the wiki without asking? > > Alex > > On Thu, 9 Dec 2021 at 14:56, Konrad Weihmann > wrote: > >> >> >> On 09.12.21 14:45, Richard Purdie wrote: >> > On Wed, 2021-12-08 at 22:59 +0100, Alexander Kanavin wrote: >> >> Signed-off-by: Alexander Kanavin >> >> --- >> >> .../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 3 >> ++- >> >> ...p.creating.directories.without.sandbox-install.prefix.patch | 3 >> ++- >> >> 2 files changed, 4 insertions(+), 2 deletions(-) >> >> >> >> diff --git >> a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch >> b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch >> >> index e6172ef5aa..5b8fb70639 100644 >> >> --- >> a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch >> >> +++ >> b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch >> >> @@ -6,7 +6,8 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use >> ERR_GET_FUNC >> >> Upstream removed it in >> >> https://github.com/openssl/openssl/pull/16004 >> >> >> >> -Upstream-Status: Pending >> >> +Upstream is defunct: last release in 2015, last commit in 2019. >> >> +Upstream-Status: Inappropriate [no upstream] >> >> Signed-off-by: Alexander Kanavin >> >> --- >> >>buckets/ssl_buckets.c | 3 +-- >> >> diff --git >> a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch >> b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch >> >> index 91640d6044..cf00dbf5ac 100644 >> >> --- >> a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch >> >> +++ >> b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch >> >> @@ -31,7 +31,8 @@ ERROR: scons install execution failed. >> >> and the installed paths (including the paths inside libserf*.pc) >> >> look correct >> >> >> >> -Upstream-Status: Pending >> >> +Upstream is defunct: last release in 2015, last commit in 2019 >> >> +Upstream-Status: Inappropriate [no upstream] >> >> >> >> Signed-off-by: Martin Jansa >> >> >> > >> > I'm still not convinced this is the right thing to do. I appreciate >> what the >> > docs say but I also think we may need to evolve. >> > >> > Let's imagine we do have an "Inactive-Upstream" status for a minute and >> this >> > patch changes to: >> > >> > Upstream-Status: Inactive-Upstream [last release 2015, last commit 2019] >> > >> > If you now happen to be changing the recipe due to a new release, this >> is going >> > to trigger some kind of thought/action by seeing that status in that we >> might >> > now be able to upstream the patches. If it just says "Inappropriate", >> it won't >> > trigger the response we'd like. >> > >> > We're also going to eventually end up with a whole pile of >> "Inappropriate" >> > patches, it may be useful to keep an open mind on whether any >> subdivision of >> > those would be helpful. >> > >> > Does this make sense to anyone else? >> >> It would makes sense, but then the support and the docs has to >> backported again, otherwise cherry-picking won't be easy for older >> releases. But yeah I'm with you that Inappropriate looks odd in this >> context - still this is stated in the docs, we always refer to, so a doc >> update needs to come in first IMO >> >> > >> > Cheers, >> > >> > Richard >> > >> > >> > >> > >> > >> > >> > >> > >> > >> > >> > >> > >> > >> > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159451): https://lists.openembedded.org/g/openembedded-core/message/159451 Mute This Topic: https://lists.openembedded.org/mt/87599630/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 05/29] serf: mark patches as inappropriate for upstream submission
I think we only have a single doc that needs to be updated first: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status The question is, how? Presumably, I need to make some kind of official proposal to OE organization, and not just edit the wiki without asking? Alex On Thu, 9 Dec 2021 at 14:56, Konrad Weihmann wrote: > > > On 09.12.21 14:45, Richard Purdie wrote: > > On Wed, 2021-12-08 at 22:59 +0100, Alexander Kanavin wrote: > >> Signed-off-by: Alexander Kanavin > >> --- > >> .../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 3 ++- > >> ...p.creating.directories.without.sandbox-install.prefix.patch | 3 ++- > >> 2 files changed, 4 insertions(+), 2 deletions(-) > >> > >> diff --git > a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > >> index e6172ef5aa..5b8fb70639 100644 > >> --- > a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > >> +++ > b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > >> @@ -6,7 +6,8 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use > ERR_GET_FUNC > >> Upstream removed it in > >> https://github.com/openssl/openssl/pull/16004 > >> > >> -Upstream-Status: Pending > >> +Upstream is defunct: last release in 2015, last commit in 2019. > >> +Upstream-Status: Inappropriate [no upstream] > >> Signed-off-by: Alexander Kanavin > >> --- > >>buckets/ssl_buckets.c | 3 +-- > >> diff --git > a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > >> index 91640d6044..cf00dbf5ac 100644 > >> --- > a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > >> +++ > b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > >> @@ -31,7 +31,8 @@ ERROR: scons install execution failed. > >> and the installed paths (including the paths inside libserf*.pc) > >> look correct > >> > >> -Upstream-Status: Pending > >> +Upstream is defunct: last release in 2015, last commit in 2019 > >> +Upstream-Status: Inappropriate [no upstream] > >> > >> Signed-off-by: Martin Jansa > >> > > > > I'm still not convinced this is the right thing to do. I appreciate what > the > > docs say but I also think we may need to evolve. > > > > Let's imagine we do have an "Inactive-Upstream" status for a minute and > this > > patch changes to: > > > > Upstream-Status: Inactive-Upstream [last release 2015, last commit 2019] > > > > If you now happen to be changing the recipe due to a new release, this > is going > > to trigger some kind of thought/action by seeing that status in that we > might > > now be able to upstream the patches. If it just says "Inappropriate", it > won't > > trigger the response we'd like. > > > > We're also going to eventually end up with a whole pile of > "Inappropriate" > > patches, it may be useful to keep an open mind on whether any > subdivision of > > those would be helpful. > > > > Does this make sense to anyone else? > > It would makes sense, but then the support and the docs has to > backported again, otherwise cherry-picking won't be easy for older > releases. But yeah I'm with you that Inappropriate looks odd in this > context - still this is stated in the docs, we always refer to, so a doc > update needs to come in first IMO > > > > > Cheers, > > > > Richard > > > > > > > > > > > > > > > > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159450): https://lists.openembedded.org/g/openembedded-core/message/159450 Mute This Topic: https://lists.openembedded.org/mt/87599630/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 05/29] serf: mark patches as inappropriate for upstream submission
On 09.12.21 14:45, Richard Purdie wrote: On Wed, 2021-12-08 at 22:59 +0100, Alexander Kanavin wrote: Signed-off-by: Alexander Kanavin --- .../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 3 ++- ...p.creating.directories.without.sandbox-install.prefix.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch index e6172ef5aa..5b8fb70639 100644 --- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch +++ b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch @@ -6,7 +6,8 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC Upstream removed it in https://github.com/openssl/openssl/pull/16004 -Upstream-Status: Pending +Upstream is defunct: last release in 2015, last commit in 2019. +Upstream-Status: Inappropriate [no upstream] Signed-off-by: Alexander Kanavin --- buckets/ssl_buckets.c | 3 +-- diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 91640d6044..cf00dbf5ac 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch @@ -31,7 +31,8 @@ ERROR: scons install execution failed. and the installed paths (including the paths inside libserf*.pc) look correct -Upstream-Status: Pending +Upstream is defunct: last release in 2015, last commit in 2019 +Upstream-Status: Inappropriate [no upstream] Signed-off-by: Martin Jansa I'm still not convinced this is the right thing to do. I appreciate what the docs say but I also think we may need to evolve. Let's imagine we do have an "Inactive-Upstream" status for a minute and this patch changes to: Upstream-Status: Inactive-Upstream [last release 2015, last commit 2019] If you now happen to be changing the recipe due to a new release, this is going to trigger some kind of thought/action by seeing that status in that we might now be able to upstream the patches. If it just says "Inappropriate", it won't trigger the response we'd like. We're also going to eventually end up with a whole pile of "Inappropriate" patches, it may be useful to keep an open mind on whether any subdivision of those would be helpful. Does this make sense to anyone else? It would makes sense, but then the support and the docs has to backported again, otherwise cherry-picking won't be easy for older releases. But yeah I'm with you that Inappropriate looks odd in this context - still this is stated in the docs, we always refer to, so a doc update needs to come in first IMO Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159449): https://lists.openembedded.org/g/openembedded-core/message/159449 Mute This Topic: https://lists.openembedded.org/mt/87599630/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 05/29] serf: mark patches as inappropriate for upstream submission
On Wed, 2021-12-08 at 22:59 +0100, Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > .../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 3 ++- > ...p.creating.directories.without.sandbox-install.prefix.patch | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git > a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > > b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > index e6172ef5aa..5b8fb70639 100644 > --- > a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > +++ > b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch > @@ -6,7 +6,8 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use > ERR_GET_FUNC > Upstream removed it in > https://github.com/openssl/openssl/pull/16004 > > -Upstream-Status: Pending > +Upstream is defunct: last release in 2015, last commit in 2019. > +Upstream-Status: Inappropriate [no upstream] > Signed-off-by: Alexander Kanavin > --- > buckets/ssl_buckets.c | 3 +-- > diff --git > a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > > b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > index 91640d6044..cf00dbf5ac 100644 > --- > a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > +++ > b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch > @@ -31,7 +31,8 @@ ERROR: scons install execution failed. >and the installed paths (including the paths inside libserf*.pc) >look correct > > -Upstream-Status: Pending > +Upstream is defunct: last release in 2015, last commit in 2019 > +Upstream-Status: Inappropriate [no upstream] > > Signed-off-by: Martin Jansa > I'm still not convinced this is the right thing to do. I appreciate what the docs say but I also think we may need to evolve. Let's imagine we do have an "Inactive-Upstream" status for a minute and this patch changes to: Upstream-Status: Inactive-Upstream [last release 2015, last commit 2019] If you now happen to be changing the recipe due to a new release, this is going to trigger some kind of thought/action by seeing that status in that we might now be able to upstream the patches. If it just says "Inappropriate", it won't trigger the response we'd like. We're also going to eventually end up with a whole pile of "Inappropriate" patches, it may be useful to keep an open mind on whether any subdivision of those would be helpful. Does this make sense to anyone else? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159448): https://lists.openembedded.org/g/openembedded-core/message/159448 Mute This Topic: https://lists.openembedded.org/mt/87599630/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] [dunfell][PATCH] gcc: Add CVE-2021-37322 to the list of CVEs to ignore
On Thu, Dec 9, 2021 at 7:53 AM Tim Orling wrote: > > From: Richard Purdie > > The CVE applies to binutils 2.26 and not to gcc so ignore there. > Tim, Have you requested a NVD database change on this one? Or you prefer me to do it? Kind regards, Marta -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159447): https://lists.openembedded.org/g/openembedded-core/message/159447 Mute This Topic: https://lists.openembedded.org/mt/87607595/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 02/29] insane.bbclass: do not hardcode oe-core path in upstream-status check
On Wed, 2021-12-08 at 22:59 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin
> ---
> meta/classes/insane.bbclass | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> index 240f3aad62..8a47da5a09 100644
> --- a/meta/classes/insane.bbclass
> +++ b/meta/classes/insane.bbclass
> @@ -1176,7 +1176,9 @@ python do_qa_patch() {
> (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
>
> # skip patches not in oe-core
> - if '/meta/' not in fullpath:
> + oecore_re = re.compile(d.getVar('BBFILE_PATTERN_core'))
> + match_oecore = oecore_re.search(fullpath)
> + if not match_oecore:
> continue
>
> content = open(fullpath, encoding='utf-8', errors='ignore').read()
Sorry about the miscommunication on this. I believed this patch would break
things and that the sstate tests should have spotted it. They didn't as the test
case doesn't quite cover this issue but there is a real problem here even though
they pass.
You can see the problem if you run:
$ bitbake bash -c patch
then
$ bitbake-dumpsig tmp/stamps/XXX-poky-linux/bash/5.1.8-r0.do_patch.sigdata.XXX*
| grep BBFILE_PATTERN
and you see your build path to the metadata exposed:
Variable BBFILE_PATTERN_core value is ^/media/build1/poky/meta/
which means the hashes just became metadata path specific. We can't do that.
I've realised the sstate tests don't pick this up since the metadata is in a
fixed location for the tests so it doesn't change. As well as fixing this patch,
we should revise the sstate sigs tests to test for changes in metadata path
changing the sigs.
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159446):
https://lists.openembedded.org/g/openembedded-core/message/159446
Mute This Topic: https://lists.openembedded.org/mt/87599626/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/6] overlayfs-etc: mount etc as overlayfs
On Fri, 2021-11-19 at 07:15 +0100, Vyacheslav Yurkov wrote:
> This class provides an image feature that mounts /etc as an overlayfs
> file system. This is an extension for existing overlayfs class, which
> doesn't support /etc
>
> Signed-off-by: Alfred Schapansky
> Signed-off-by: Vyacheslav Yurkov
> ---
> meta/classes/overlayfs-etc.bbclass | 93 ++
> 1 file changed, 93 insertions(+)
> create mode 100644 meta/classes/overlayfs-etc.bbclass
>
> diff --git a/meta/classes/overlayfs-etc.bbclass
> b/meta/classes/overlayfs-etc.bbclass
> new file mode 100644
> index 00..78caf0211b
> --- /dev/null
> +++ b/meta/classes/overlayfs-etc.bbclass
> @@ -0,0 +1,93 @@
> +# Class for setting up /etc in overlayfs
> +#
> +# In order to have /etc directory in overlayfs a special handling at early
> boot stage is required
> +# The idea is to supply a custom init script that mounts /etc before
> launching actual init program,
> +# because the latter already requires /etc to be mounted
> +#
> +# The configuration must be machine specific. You should at least set these
> two variables if you
> +# are not happy with default values:
> +# OVERLAYFS_ETC_MOUNT_POINT ?= "/data"
> +# OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p2"
> +#
> +# To control more mount options you should consider also setting file system
> type and mount options:
> +# OVERLAYFS_ETC_FSTYPE ?= "ext4"
> +# OVERLAYFS_ETC_MOUNT_OPTIONS ?= "defaults"
> +#
> +# The class provides two options for /sbin/init generation
> +# 1. Default option is to rename original /sbin/init to /sbin/init.orig and
> place generated init under
> +#original name, i.e. /sbin/init. It has an advantage that you won't need
> to change any kernel
> +#parameters in order to make it work, but it poses a restriction that
> package-management can't
> +#be used, becaause updating init manager would remove generated script
> +# 2. If you are would like to keep original init as is, you can set
> +#OVERLAYFS_ETC_USE_ORIG_INIT_NAME = "0"
> +#Then generated init will be named /sbin/preinit and you would need to
> extend you kernel parameters
> +#manually in your bootloader configuration.
> +#
> +# Regardless which mode you choose, update and migration strategy of
> configuration files under /etc
> +# 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"
> +
> +OVERLAYFS_ETC_MOUNT_POINT ?= "/data"
> +OVERLAYFS_ETC_FSTYPE ?= "ext4"
> +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p2"
> +OVERLAYFS_ETC_USE_ORIG_INIT_NAME ?= "1"
> +OVERLAYFS_ETC_MOUNT_OPTIONS ?= "defaults"
> +
> +python create_overlayfs_etc_preinit() {
> +PreinitTemplate = """#!/bin/sh
> +
> +echo "PREINIT: Start"
> +
> +PATH=/sbin:/bin:/usr/sbin:/usr/bin
> +mount -o remount,rw /
> +
> +mkdir -p /proc
> +mkdir -p /sys
> +mkdir -p /run
Sorry about the delay replying on this. Something has been bothering me about
the code and I haven't been able to articulate it. I think Ross is right about
part of it, the defaults are very device specific and need to be invalid by
default which checks to ensure they're set.
The second thing which I don't really like is this mix of shell and python, it
is very confusing to read. I'd much rather we put template files into
meta/lib/files/ and then read them from there for the variable substitutions. We
do this for other scripts. I appreciate the overlayfs class merged without that
but I think we need to fix this there as well.
Adding the tests in this series is really great through, thanks for that!
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159445):
https://lists.openembedded.org/g/openembedded-core/message/159445
Mute This Topic: https://lists.openembedded.org/mt/87162487/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/6] overlayfs-etc: mount etc as overlayfs
On Fri, 19 Nov 2021 at 06:15, Vyacheslav Yurkov wrote: > +# Class for setting up /etc in overlayfs > +# > +# In order to have /etc directory in overlayfs a special handling at early > boot stage is required > +# The idea is to supply a custom init script that mounts /etc before > launching actual init program, > +# because the latter already requires /etc to be mounted Can you elaborate on the exact scenario that is being supported here? Is it read-only / with /etc (and potentially more) in an overlayfs? > +OVERLAYFS_ETC_MOUNT_POINT ?= "/data" > +OVERLAYFS_ETC_FSTYPE ?= "ext4" > +OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p2" I'm guessing these are not universal defaults, but the values that you use. If you can't provide default values which will actually work out of the box, just set them to "" and the class can abort if they're not set. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159444): https://lists.openembedded.org/g/openembedded-core/message/159444 Mute This Topic: https://lists.openembedded.org/mt/87162487/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 04/29] libid3tag: move to meta-oe
It has already landed there a few days ago :)
Alex
On Thu, 9 Dec 2021 at 00:02, Khem Raj wrote:
> yeah perhaps meta-multimedia is better for it.
>
> On Wed, Dec 8, 2021 at 2:00 PM Alexander Kanavin
> wrote:
> >
> > There are no consumers in oe-core; years ago it used to be gstreamer.
> >
> > Signed-off-by: Alexander Kanavin
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 -
> > .../0001-Fix-gperf-3.1-incompatibility.patch | 40 -
> > .../libid3tag/libid3tag/10_utf16.patch| 34 ---
> > .../libid3tag/libid3tag/addpkgconfig.patch| 43 ---
> > .../libid3tag/libid3tag/cflags_filter.patch | 19
> > .../libid3tag/obsolete_automake_macros.patch | 15 ---
> > .../libid3tag/unknown-encoding.patch | 39 -
> > .../libid3tag/libid3tag_0.15.1b.bb| 28
> > 8 files changed, 219 deletions(-)
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
> > delete mode 100644 meta/recipes-multimedia/libid3tag/
> libid3tag_0.15.1b.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> > index cedf1ef937..8e86ea45d2 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -344,7 +344,6 @@ RECIPE_MAINTAINER:pn-libgudev = "Ross Burton <
> ross.bur...@arm.com>"
> > RECIPE_MAINTAINER:pn-libhandy = "Alexander Kanavin <
> alex.kana...@gmail.com>"
> > RECIPE_MAINTAINER:pn-libical = "Ross Burton "
> > RECIPE_MAINTAINER:pn-libice = "Unassigned >"
> > -RECIPE_MAINTAINER:pn-libid3tag = "Unassigned <
> unassig...@yoctoproject.org>"
> > RECIPE_MAINTAINER:pn-libidn2 = "Ross Burton "
> > RECIPE_MAINTAINER:pn-libinput = "Ross Burton "
> > RECIPE_MAINTAINER:pn-libjitterentropy = "Ross Burton <
> ross.bur...@arm.com>"
> > diff --git
> a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> b/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> > deleted file mode 100644
> > index 54f49f6f23..00
> > ---
> a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> > +++ /dev/null
> > @@ -1,40 +0,0 @@
> > -From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001
> > -From: Alexander Kanavin
> > -Date: Wed, 2 Aug 2017 16:27:52 +0300
> > -Subject: [PATCH] Fix gperf 3.1 incompatibility.
> > -
> > -Upstream-Status: Pending
> > -Signed-off-by: Alexander Kanavin
> >
> > - compat.h| 2 +-
> > - frametype.h | 2 +-
> > - 2 files changed, 2 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/compat.h b/compat.h
> > -index 8af71ec..b3d80d9 100644
> > a/compat.h
> > -+++ b/compat.h
> > -@@ -34,7 +34,7 @@ struct id3_compat {
> > - };
> > -
> > - struct id3_compat const *id3_compat_lookup(register char const *,
> > -- register unsigned int);
> > -+ register size_t);
> > -
> > - int id3_compat_fixup(struct id3_tag *);
> > -
> > -diff --git a/frametype.h b/frametype.h
> > -index dd064b2..b5b7593 100644
> > a/frametype.h
> > -+++ b/frametype.h
> > -@@ -37,6 +37,6 @@ extern struct id3_frametype const
> id3_frametype_unknown;
> > - extern struct id3_frametype const id3_frametype_obsolete;
> > -
> > - struct id3_frametype const *id3_frametype_lookup(register char const *,
> > -- register unsigned int);
> > -+ register size_t);
> > -
> > - # endif
> > ---
> > -2.13.2
> > -
> > diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> > deleted file mode 100644
> > index 10e089018c..00
> > --- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> > +++ /dev/null
> > @@ -1,34 +0,0 @@
> > -libid3tag: patch for CVE-2004-2779
> > -
> > -The patch comes from
> > -https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch
> > -
> > -Upstream-Status: Pending
> > -
> > -CVE: CVE-2004-2779
> > -CVE: CVE-2017-11551
> > -
> > -Signed-off-by: Changqing Li
> > -
> > -diff -urNad libid3tag-0.15.1b/utf16.c
> /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c
> > libid3tag-0.15.1b/utf16.c 2006-01-13 15:26:29.0 +0100
> > -+++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13
> 15:27:19.0
Re: [OE-core] [PATCH 06/29] ruby: update 3.0.2 -> 3.0.3
On Thu, 9 Dec 2021 at 00:01, Khem Raj wrote: > > +set -x > > perhaps not needed ? > Yes, there's a followup patch in the set. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159442): https://lists.openembedded.org/g/openembedded-core/message/159442 Mute This Topic: https://lists.openembedded.org/mt/87599632/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
