* [PATCH 02/19] package_rpm: remove support for DIRFILES
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 16:38 ` [OE-core] " Ross Burton
2024-04-19 12:19 ` [PATCH 03/19] serf: mark patch as inappropriate for upstream submission Alexander Kanavin
` (16 subsequent siblings)
17 siblings, 1 reply; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
This was added here:
https://git.yoctoproject.org/poky/commit/?id=2f42ef8d8fb1febf28252b98884cebabc931f720
It's undocumented, untested, rpm-specific, and currently
broken, and to begin with looks like a workaround for
Tizen/smack security label conflicts elsewhere.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/classes-global/package_rpm.bbclass | 31 +++++++------------------
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass
index 2e3e4e8c790..790ccbfaf0c 100644
--- a/meta/classes-global/package_rpm.bbclass
+++ b/meta/classes-global/package_rpm.bbclass
@@ -191,7 +191,7 @@ python write_specfile () {
if not len(depends_dict[dep]):
array.append("%s: %s" % (tag, dep))
- def walk_files(walkpath, target, conffiles, dirfiles):
+ def walk_files(walkpath, target, conffiles):
# We can race against the ipk/deb backends which create CONTROL or DEBIAN directories
# when packaging. We just ignore these files which are created in
# packages-split/ and not package/
@@ -233,22 +233,12 @@ python write_specfile () {
return False
dirs[:] = [dir for dir in dirs if not move_to_files(dir)]
- # Directory handling can happen in two ways, either DIRFILES is not set at all
- # in which case we fall back to the older behaviour of packages owning all their
- # directories
- if dirfiles is None:
- for dir in dirs:
- if dir == "CONTROL" or dir == "DEBIAN":
- continue
- p = path + '/' + dir
- # All packages own the directories their files are in...
- target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"')
- elif path:
- # packages own only empty directories or explict directory.
- # This will prevent the overlapping of security permission.
- attr = get_attr(path)
- if (not files and not dirs) or path in dirfiles:
- target.append(attr + '%dir "' + escape_chars(path) + '"')
+ for dir in dirs:
+ if dir == "CONTROL" or dir == "DEBIAN":
+ continue
+ p = path + '/' + dir
+ # All packages own the directories their files are in...
+ target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"')
for file in files:
if file == "CONTROL" or file == "DEBIAN":
@@ -363,9 +353,6 @@ python write_specfile () {
localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
conffiles = oe.package.get_conffiles(pkg, d)
- dirfiles = localdata.getVar('DIRFILES')
- if dirfiles is not None:
- dirfiles = dirfiles.split()
splitname = pkgname
@@ -430,7 +417,7 @@ python write_specfile () {
srcrpostrm = splitrpostrm
file_list = []
- walk_files(root, file_list, conffiles, dirfiles)
+ walk_files(root, file_list, conffiles)
if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1":
bb.note("Not creating empty RPM package for %s" % splitname)
else:
@@ -522,7 +509,7 @@ python write_specfile () {
# Now process files
file_list = []
- walk_files(root, file_list, conffiles, dirfiles)
+ walk_files(root, file_list, conffiles)
if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1":
bb.note("Not creating empty RPM package for %s" % splitname)
else:
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [OE-core] [PATCH 02/19] package_rpm: remove support for DIRFILES
2024-04-19 12:19 ` [PATCH 02/19] package_rpm: remove support for DIRFILES Alexander Kanavin
@ 2024-04-19 16:38 ` Ross Burton
2024-04-19 16:40 ` Ross Burton
0 siblings, 1 reply; 28+ messages in thread
From: Ross Burton @ 2024-04-19 16:38 UTC (permalink / raw)
To: alex.kanavin; +Cc: openembedded-core, Alexander Kanavin
On 19 Apr 2024, at 13:19, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
>
> This was added here:
> https://git.yoctoproject.org/poky/commit/?id=2f42ef8d8fb1febf28252b98884cebabc931f720
>
> It's undocumented, untested, rpm-specific, and currently
> broken, and to begin with looks like a workaround for
> Tizen/smack security label conflicts elsewhere.
Thanks, this finishes a task that I started poking at long ago that culminated with the majestic commit https://git.openembedded.org/meta-openembedded/commit/?id=4d921bb5144b653c2f195fb2e8694a31dbd539f1.
Ross
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [OE-core] [PATCH 02/19] package_rpm: remove support for DIRFILES
2024-04-19 16:38 ` [OE-core] " Ross Burton
@ 2024-04-19 16:40 ` Ross Burton
0 siblings, 0 replies; 28+ messages in thread
From: Ross Burton @ 2024-04-19 16:40 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core, Alexander Kanavin
> On 19 Apr 2024, at 17:38, Ross Burton <Ross.Burton@arm.com> wrote:
>
> On 19 Apr 2024, at 13:19, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
>>
>> This was added here:
>> https://git.yoctoproject.org/poky/commit/?id=2f42ef8d8fb1febf28252b98884cebabc931f720
>>
>> It's undocumented, untested, rpm-specific, and currently
>> broken, and to begin with looks like a workaround for
>> Tizen/smack security label conflicts elsewhere.
>
Hit sent to early…
We should also set BB_RENAMED_VARIABLE so that users of it get told to stop using it.
Ross
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 03/19] serf: mark patch as inappropriate for upstream submission
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
2024-04-19 12:19 ` [PATCH 02/19] package_rpm: remove support for DIRFILES Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 04/19] swig: merge .inc into .bb Alexander Kanavin
` (15 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
What the patch does is not suitable, as upstream would surely
want the issue with the code fixed, not removal of that code altogether.
I'd also note that serf is still semi-ummaintained, and the only consumer
of it is subversion, which is slowly but steadily fading away in favor of
git and artifact-specific solutions.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...op.creating.directories.without.sandbox-install.prefix.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 91640d60443..c8e6eddfeca 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,7 @@ ERROR: scons install execution failed.
and the installed paths (including the paths inside libserf*.pc)
look correct
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 04/19] swig: merge .inc into .bb
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
2024-04-19 12:19 ` [PATCH 02/19] package_rpm: remove support for DIRFILES Alexander Kanavin
2024-04-19 12:19 ` [PATCH 03/19] serf: mark patch as inappropriate for upstream submission Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-20 12:11 ` [OE-core] " Richard Purdie
2024-04-19 12:19 ` [PATCH 05/19] swig: convert from autotools to cmake Alexander Kanavin
` (14 subsequent siblings)
17 siblings, 1 reply; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-devtools/swig/swig.inc | 67 -----------------------
meta/recipes-devtools/swig/swig_4.2.1.bb | 69 +++++++++++++++++++++++-
2 files changed, 67 insertions(+), 69 deletions(-)
delete mode 100644 meta/recipes-devtools/swig/swig.inc
diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc
deleted file mode 100644
index 7a6c4d7359c..00000000000
--- a/meta/recipes-devtools/swig/swig.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-SUMMARY = "SWIG - Simplified Wrapper and Interface Generator"
-DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \
-code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \
-Mzscheme, Chicken, OCaml, Pike, and C#."
-HOMEPAGE = "http://swig.sourceforge.net/"
-LICENSE = "BSD-3-Clause & GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
- file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
-
-SECTION = "devel"
-
-DEPENDS = "libpcre2 bison-native"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/"
-UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)"
-
-inherit autotools python3native pkgconfig
-
-EXTRA_OECONF = " \
- --with-python3=${PYTHON} \
- --without-allegrocl \
- --without-android \
- --without-boost \
- --without-chicken \
- --without-clisp \
- --without-csharp \
- --without-d \
- --without-gcj \
- --without-go \
- --without-guile \
- --without-java \
- --without-lua \
- --without-mzscheme \
- --without-ocaml \
- --without-octave \
- --without-perl5 \
- --without-pike \
- --without-php \
- --without-r \
- --without-ruby \
- --without-tcl \
-"
-
-EXTRA_AUTORECONF += "-I Tools/config"
-
-BBCLASSEXTEND = "native nativesdk"
-
-# necessary together with bison dependency until a new upstream version after
-# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch
-do_configure:append() {
- mkdir -p ${B}/Source/CParse
-}
-
-do_install:append:class-nativesdk() {
- cd ${D}${bindir}
- ln -s swig swig2.0
-}
-
-def swiglib_relpath(d):
- swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV')
- return os.path.relpath(swiglib, d.getVar('bindir'))
-
-do_install:append:class-native() {
- create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
-}
diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.2.1.bb
index 4b438a72982..7062d4e9aa3 100644
--- a/meta/recipes-devtools/swig/swig_4.2.1.bb
+++ b/meta/recipes-devtools/swig/swig_4.2.1.bb
@@ -1,7 +1,72 @@
-require ${BPN}.inc
+SUMMARY = "SWIG - Simplified Wrapper and Interface Generator"
+DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \
+code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \
+Mzscheme, Chicken, OCaml, Pike, and C#."
+HOMEPAGE = "http://swig.sourceforge.net/"
+LICENSE = "BSD-3-Clause & GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
+ file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
-SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
+SECTION = "devel"
+
+DEPENDS = "libpcre2 bison-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
+ file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
file://0001-configure-use-pkg-config-for-pcre-detection.patch \
file://determinism.patch \
"
SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/"
+UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)"
+
+inherit autotools python3native pkgconfig
+
+EXTRA_OECONF = " \
+ --with-python3=${PYTHON} \
+ --without-allegrocl \
+ --without-android \
+ --without-boost \
+ --without-chicken \
+ --without-clisp \
+ --without-csharp \
+ --without-d \
+ --without-gcj \
+ --without-go \
+ --without-guile \
+ --without-java \
+ --without-lua \
+ --without-mzscheme \
+ --without-ocaml \
+ --without-octave \
+ --without-perl5 \
+ --without-pike \
+ --without-php \
+ --without-r \
+ --without-ruby \
+ --without-tcl \
+"
+
+EXTRA_AUTORECONF += "-I Tools/config"
+
+BBCLASSEXTEND = "native nativesdk"
+
+# necessary together with bison dependency until a new upstream version after
+# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch
+do_configure:append() {
+ mkdir -p ${B}/Source/CParse
+}
+
+do_install:append:class-nativesdk() {
+ cd ${D}${bindir}
+ ln -s swig swig2.0
+}
+
+def swiglib_relpath(d):
+ swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV')
+ return os.path.relpath(swiglib, d.getVar('bindir'))
+
+do_install:append:class-native() {
+ create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
+}
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [OE-core] [PATCH 04/19] swig: merge .inc into .bb
2024-04-19 12:19 ` [PATCH 04/19] swig: merge .inc into .bb Alexander Kanavin
@ 2024-04-20 12:11 ` Richard Purdie
2024-04-20 17:58 ` Alexander Kanavin
2024-04-22 10:46 ` Alexander Kanavin
0 siblings, 2 replies; 28+ messages in thread
From: Richard Purdie @ 2024-04-20 12:11 UTC (permalink / raw)
To: alex.kanavin, openembedded-core; +Cc: Alexander Kanavin
On Fri, 2024-04-19 at 14:19 +0200, Alexander Kanavin via lists.openembedded.org wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> meta/recipes-devtools/swig/swig.inc | 67 -----------------------
> meta/recipes-devtools/swig/swig_4.2.1.bb | 69 +++++++++++++++++++++++-
> 2 files changed, 67 insertions(+), 69 deletions(-)
> delete mode 100644 meta/recipes-devtools/swig/swig.inc
>
> diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc
> deleted file mode 100644
> index 7a6c4d7359c..00000000000
This seems to have a reproducibility issue:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4685/steps/12/logs/stdio
Also, your patch From address is now getting corrupted on the mailing
list, you probably need to add the From: lines to your patches when
sending.
Cheers,
Richard
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [OE-core] [PATCH 04/19] swig: merge .inc into .bb
2024-04-20 12:11 ` [OE-core] " Richard Purdie
@ 2024-04-20 17:58 ` Alexander Kanavin
2024-04-22 10:46 ` Alexander Kanavin
1 sibling, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-20 17:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core, Alexander Kanavin
On Sat, 20 Apr 2024 at 14:11, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Also, your patch From address is now getting corrupted on the mailing
> list, you probably need to add the From: lines to your patches when
> sending.
I think this has actually been happening for a while (I write patches
using linutronix email but send them over gmail smtp):
From: "Alexander Kanavin via lists.openembedded.org"
<alex.kanavin=gmail.com@lists.openembedded.org>
X-Google-Original-From: Alexander Kanavin <alex@linutronix.de>
git format-patch has an option to force a From: at the start of the
patch which I'll enable.
Alex
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [OE-core] [PATCH 04/19] swig: merge .inc into .bb
2024-04-20 12:11 ` [OE-core] " Richard Purdie
2024-04-20 17:58 ` Alexander Kanavin
@ 2024-04-22 10:46 ` Alexander Kanavin
1 sibling, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-22 10:46 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core, Alexander Kanavin
On Sat, 20 Apr 2024 at 14:11, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> This seems to have a reproducibility issue:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4685/steps/12/logs/stdio
I have to show you the issue, as it's a face-meet-palm-ish new way to
thwart the build path checker:
#ifndef YY_YY_HOME_POKYBUILD_YOCTO_WORKER_REPRODUCIBLE_BUILD_BUILD_ST_REPRODUCIBLEB_TMP_WORK_CORE2_64_POKY_LINUX_SWIG_4_2_1_BUILD_SOURCE_CPARSE_PARSER_H_INCLUDED
#define YY_YY_HOME_POKYBUILD_YOCTO_WORKER_NO_X11_BUILD_BUILD_TMP_WORK_CORE2_64_POKY_LINUX_SWIG_4_2_1_BUILD_SOURCE_CPARSE_PARSER_H_INCLUDED
http://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20240420-_5niux5i/packages/diff-html/
Alex
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 05/19] swig: convert from autotools to cmake
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (2 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 04/19] swig: merge .inc into .bb Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 06/19] kea: remove unnecessary reproducibility patch Alexander Kanavin
` (13 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop patches:
0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
(superseded long time ago by native wrapper)
0001-configure-use-pkg-config-for-pcre-detection.patch
(autotools-specific)
Drop all autoconf options and native python dependency as cmake configuration doesn't contain those.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...e-for-swig-swiglib-on-non-Win32-plat.patch | 65 -------------------
...re-use-pkg-config-for-pcre-detection.patch | 63 ------------------
meta/recipes-devtools/swig/swig_4.2.1.bb | 44 +++----------
3 files changed, 8 insertions(+), 164 deletions(-)
delete mode 100644 meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
delete mode 100644 meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
deleted file mode 100644
index 5e83e92725e..00000000000
--- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b88a98348b3841f0b702e314631883d46f9f362d Mon Sep 17 00:00:00 2001
-From: "NODA, Kai" <nodakai@gmail.com>
-Date: Sun, 22 Apr 2012 17:01:02 +0900
-Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
- platforms.
-
-If it wasn't found, then fall back to a fixed string just as before.
-
-Upstream-Status: Submitted
-http://sourceforge.net/mailarchive/message.php?msg_id=29179733
----
- Source/Modules/main.cxx | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
-index 76b4f9d..de0a512 100644
---- a/Source/Modules/main.cxx
-+++ b/Source/Modules/main.cxx
-@@ -25,6 +25,11 @@
- #include <ctype.h>
- #include <errno.h>
- #include <limits.h> // for INT_MAX
-+#ifndef _WIN32
-+#include <cstddef>
-+#include <unistd.h> // for readlink
-+#include <sys/stat.h> // for stat
-+#endif
-
- // Global variables
-
-@@ -895,9 +900,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
-
- // Check for SWIG_LIB environment variable
- if ((c = getenv("SWIG_LIB")) == (char *) 0) {
-+ char *p;
- #if defined(_WIN32)
- char buf[MAX_PATH];
-- char *p;
- if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
- *(p + 1) = '\0';
- SwigLib = NewStringf("%sLib", buf); // Native windows installation path
-@@ -907,7 +912,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
- if (Len(SWIG_LIB_WIN_UNIX) > 0)
- SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
- #else
-- SwigLib = NewString(SWIG_LIB);
-+ char buf[PATH_MAX];
-+ if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
-+ (p = ::strstr(buf, "/bin/swig"))) {
-+ int major, minor, patch;
-+ const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
-+ if (3 == ret) {
-+ const ::ptrdiff_t dir_part_len = p - buf;
-+ ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
-+ struct ::stat stat_res;
-+ if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
-+ SwigLib = NewString(buf);
-+ }
-+ }
-+ }
-+ if (NULL == SwigLib)
-+ SwigLib = NewString(SWIG_LIB);
- #endif
- } else {
- SwigLib = NewString(c);
diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
deleted file mode 100644
index 9e16caecca1..00000000000
--- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen.kooi@linaro.org>
-Date: Tue, 17 Jun 2014 08:18:17 +0200
-Subject: [PATCH] configure: use pkg-config for pcre detection
-
-Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-Upstream-Status: Pending
-
----
- configure.ac | 39 +++++++--------------------------------
- 1 file changed, 7 insertions(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c060028..a330266 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,39 +49,14 @@ AC_MSG_RESULT([$with_pcre])
-
- dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
- if test x"${with_pcre}" = xyes ; then
-- AC_MSG_CHECKING([whether to use local PCRE2])
-- local_pcre_config=no
-- if test -z "$PCRE2_CONFIG"; then
-- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then
-- PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config
-- local_pcre_config=$PCRE2_CONFIG
-- fi
-- fi
-- AC_MSG_RESULT([$local_pcre_config])
--fi
--AS_IF([test "x$with_pcre" != xno],
-- [AX_PATH_GENERIC([pcre2],
-- [], dnl Minimal version of PCRE we need -- accept any
-- [], dnl custom sed script for version parsing is not needed
-- [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library])
-- LIBS="$LIBS $PCRE2_LIBS"
-- CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS"
-- ],
-- [AC_MSG_FAILURE([
-- Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions)
-- library package. This dependency is needed for configure to complete,
-- Either:
-- - Install the PCRE2 developer package on your system (preferred approach).
-- - Download the PCRE2 source tarball, build and install on your system
-- as you would for any package built from source distribution.
-- - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically
-- link against. Run 'Tools/pcre-build.sh --help' for instructions.
-- (quite easy and does not require privileges to install PCRE2 on your system)
-- - Use configure --without-pcre to disable regular expressions support in SWIG
-- (not recommended).])
-- ],
-- [],[],[--libs8])
-+ PKG_CHECK_MODULES([PCRE], [libpcre2], [
-+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
-+ LIBS="$LIBS $PCRE_LIBS"
-+ CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
-+ ], [
-+ AC_MSG_WARN([$PCRE_PKG_ERRORS])
- ])
-+fi
-
-
- dnl CCache
diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.2.1.bb
index 7062d4e9aa3..5f9c1fe10be 100644
--- a/meta/recipes-devtools/swig/swig_4.2.1.bb
+++ b/meta/recipes-devtools/swig/swig_4.2.1.bb
@@ -13,51 +13,16 @@ SECTION = "devel"
DEPENDS = "libpcre2 bison-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
- file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
- file://0001-configure-use-pkg-config-for-pcre-detection.patch \
file://determinism.patch \
"
SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/"
UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)"
-inherit autotools python3native pkgconfig
-
-EXTRA_OECONF = " \
- --with-python3=${PYTHON} \
- --without-allegrocl \
- --without-android \
- --without-boost \
- --without-chicken \
- --without-clisp \
- --without-csharp \
- --without-d \
- --without-gcj \
- --without-go \
- --without-guile \
- --without-java \
- --without-lua \
- --without-mzscheme \
- --without-ocaml \
- --without-octave \
- --without-perl5 \
- --without-pike \
- --without-php \
- --without-r \
- --without-ruby \
- --without-tcl \
-"
-
-EXTRA_AUTORECONF += "-I Tools/config"
+inherit cmake pkgconfig
BBCLASSEXTEND = "native nativesdk"
-# necessary together with bison dependency until a new upstream version after
-# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch
-do_configure:append() {
- mkdir -p ${B}/Source/CParse
-}
-
do_install:append:class-nativesdk() {
cd ${D}${bindir}
ln -s swig swig2.0
@@ -70,3 +35,10 @@ def swiglib_relpath(d):
do_install:append:class-native() {
create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
}
+
+PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess"
+src_package_preprocess () {
+ # Trim build paths from comments in generated sources to ensure reproducibility
+ sed -i -e "s,${WORKDIR},,g" \
+ ${B}/Source/CParse/parser.*
+}
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 06/19] kea: remove unnecessary reproducibility patch
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (3 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 05/19] swig: convert from autotools to cmake Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 07/19] expect: mark patches as Inactive-Upstream Alexander Kanavin
` (12 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Rather, adjust the sed invocation to do the correct thing directly.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...1-kea-fix-reproducible-build-failure.patch | 62 -------------------
meta/recipes-connectivity/kea/kea_2.4.1.bb | 3 +-
2 files changed, 1 insertion(+), 64 deletions(-)
delete mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch
diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch
deleted file mode 100644
index 8a5bd00302a..00000000000
--- a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001
-From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Date: Tue, 8 Aug 2023 19:03:13 +0100
-Subject: [PATCH] kea: fix reproducible build failure
-
-New version of Kea has started using path of build-dir instead of
-src-dir which results in reproducible builds failure.
-Use src-dir as is used in v2.2.0
-
-Upstream-Status: Pending
-https://gitlab.isc.org/isc-projects/kea/-/issues/3007
-
-Upstream has confirmed the patch will not be accepted but discussions
-with upstream is still going on, we might have a proper solution later.
-
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
----
- src/bin/admin/kea-admin.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
-index 034a0ee..8ab11ab 100644
---- a/src/bin/admin/kea-admin.in
-+++ b/src/bin/admin/kea-admin.in
-@@ -51,14 +51,14 @@ dump_qry=""
- if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
- . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
- else
-- . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
-+ . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
- fi
-
- # Find the installed kea-lfc if available. Fallback to sources otherwise.
- if test -x "@sbindir@/kea-lfc"; then
- kea_lfc="@sbindir@/kea-lfc"
- else
-- kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc"
-+ kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc"
- fi
-
- # Prints out usage version.
-@@ -355,7 +355,7 @@ mysql_upgrade() {
- # Check if there are any files in it
- num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
- if [ "$num_files" -eq 0 ]; then
-- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
-+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql
-
- # Check if the scripts directory exists at all.
- if [ ! -d ${upgrade_scripts_dir} ]; then
-@@ -405,7 +405,7 @@ pgsql_upgrade() {
- # Check if there are any files in it
- num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
- if [ "$num_files" -eq 0 ]; then
-- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql
-+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql
-
- # Check if the scripts directory exists at all.
- if [ ! -d ${upgrade_scripts_dir} ]; then
---
-2.39.2
-
diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb
index c3aa4dc8f06..9f8758f3791 100644
--- a/meta/recipes-connectivity/kea/kea_2.4.1.bb
+++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb
@@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
file://fix-multilib-conflict.patch \
file://fix_pid_keactrl.patch \
file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
- file://0001-kea-fix-reproducible-build-failure.patch \
"
SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
@@ -47,7 +46,7 @@ do_configure:prepend() {
# replace abs_top_builddir to avoid introducing the build path
# don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target
find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g"
- sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
+ sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
}
# patch out build host paths for reproducibility
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 07/19] expect: mark patches as Inactive-Upstream
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (4 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 06/19] kea: remove unnecessary reproducibility patch Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 08/19] apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch upstream Alexander Kanavin
` (11 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
There's every indication that this is an ex-expect:
last release in 2018, stale tickets, cvs server gone.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../expect/expect/0001-Resolve-string-formatting-issues.patch | 2 +-
meta/recipes-devtools/expect/expect/0001-configure.in.patch | 2 +-
.../expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch | 2 +-
...1-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch | 2 +-
meta/recipes-devtools/expect/expect/0002-tcl.m4.patch | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
index af1d8c626c2..bfb6dcd89ae 100644
--- a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
+++ b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 23 Mar 2017 13:44:41 +0200
Subject: [PATCH] Resolve string formatting issues.
-Upstream-Status: Inappropriate [upstream seems dead]
+Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
exp_clib.c | 4 ++--
diff --git a/meta/recipes-devtools/expect/expect/0001-configure.in.patch b/meta/recipes-devtools/expect/expect/0001-configure.in.patch
index 7595a254a8f..618c4bee8eb 100644
--- a/meta/recipes-devtools/expect/expect/0001-configure.in.patch
+++ b/meta/recipes-devtools/expect/expect/0001-configure.in.patch
@@ -1,7 +1,7 @@
Allow cross compiling.
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only]
---
diff -uNr a/configure.in b/configure.in
--- a/configure.in 2012-12-14 15:31:32.623180450 +0100
diff --git a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch
index 37512fb9bc8..d73f4c34215 100644
--- a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch
+++ b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch
@@ -10,7 +10,7 @@ Aborted (core dumped)
Use PATH_MAX to fix the problem.
-Upstream-Status: Pending [Upstream seems dead]
+Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
diff --git a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch
index b1d322d5c95..40f7f3bd85a 100644
--- a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch
+++ b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch
@@ -42,7 +42,7 @@ Example:
}
Author: Sergei Golovan <sgolovan@debian.org>
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only]
This patch is backported from fedora changes for expect:
http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/
?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3
diff --git a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
index dc4c6ba4066..eb178f462ac 100644
--- a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
+++ b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
@@ -1,7 +1,7 @@
Use proper -L path when cross compiling.
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only]
---
diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
--- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 08/19] apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch upstream
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (5 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 07/19] expect: mark patches as Inactive-Upstream Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 09/19] busybox: submit CVE-2022-28391 patches upstream Alexander Kanavin
` (10 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../apr/0001-Add-option-to-disable-timed-dependant-tests.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch
index a274f3a16e3..b46dc76a863 100644
--- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch
+++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch
@@ -7,7 +7,7 @@ The disabled tests rely on timing to pass correctly. On a virtualized
system under heavy load, these tests randomly fail because they miss
a timer or other timing related issues.
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/apache/apr/pull/54]
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 09/19] busybox: submit CVE-2022-28391 patches upstream
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (6 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 08/19] apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch upstream Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 10/19] busybox: remove busybox-udhcpc-no_deconfig.patch Alexander Kanavin
` (9 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...1-libbb-sockaddr2str-ensure-only-printable-characters-.patch | 2 +-
...2-nslookup-sanitize-all-printed-strings-with-printable.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
index 46352501707..ceb3ad7250f 100644
--- a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
+++ b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are
returned for the hostname part
CVE: CVE-2022-28391
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001]
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
diff --git a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch
index 0d7409ddc3c..1dbc3388a46 100644
--- a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch
+++ b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch
@@ -8,7 +8,7 @@ Otherwise, terminal sequences can be injected, which enables various terminal in
attacks from DNS results.
CVE: CVE-2022-28391
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001]
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 10/19] busybox: remove busybox-udhcpc-no_deconfig.patch
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (7 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 09/19] busybox: submit CVE-2022-28391 patches upstream Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 11/19] icu: add upstream submission links for fix-install-manx.patch Alexander Kanavin
` (8 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
The option was introduced in:
https://git.yoctoproject.org/poky/commit/?h=master&id=427472e980cd6254a5e4ef37209b327e15af259b
for the purpose of a standalone udhcpc service.
18 months later the service was removed as it was clashing with the
broader networking service, and the option isn't used
anywhere else:
https://git.yoctoproject.org/poky/commit/?h=master&id=a4b1e348484b74d055b8906413892789d3452f4a
There's a slight chance the option still survives
somewhere private, and is important in that context,
but I'd rather drop the patch so it can be maintained
where it's useful, and maybe even proposed upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../busybox/busybox-udhcpc-no_deconfig.patch | 87 -------------------
meta/recipes-core/busybox/busybox_1.36.1.bb | 1 -
2 files changed, 88 deletions(-)
delete mode 100644 meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
deleted file mode 100644
index 948932a3e89..00000000000
--- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 53626cd06a3ef05ed847daea802ef0aa9661caa7 Mon Sep 17 00:00:00 2001
-From: Anders Darander <anders@chargestorm.se>
-Date: Thu, 3 Nov 2011 08:51:31 +0100
-Subject: [PATCH] busybox-udhcpc-no_deconfig.patch
-
-Upstream-Status: Pending
-
-Add a new option -D to the udhcpc client that allows for
-dhcp renewal to occur without having to down the interface
-in the process.
-
-Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com>
-
-Updated to latest Busybox 1.17.3
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Updated to Busybox 1.18.4
-option spec is changed
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-Updated to Busybox 1.19.3
-
-Signed-off-by: Anders Darander <anders@chargestorm.se>
-
-Fixed options -b, -a and -P.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- networking/udhcp/dhcpc.c | 29 ++++++++++++++++------
- 1 file changed, 21 insertions(+), 8 deletions(-)
-
-Index: busybox-1.34.0/networking/udhcp/dhcpc.c
-===================================================================
---- busybox-1.34.0.orig/networking/udhcp/dhcpc.c
-+++ busybox-1.34.0/networking/udhcp/dhcpc.c
-@@ -48,6 +48,8 @@
- };
- #endif
-
-+/* option whether to down the interface when reconfiguring */
-+static int allow_deconfig = 1;
-
- /* "struct client_data_t client_data" is in bb_common_bufsiz1 */
-
-@@ -100,8 +102,10 @@
- OPT_x = 1 << 16,
- OPT_f = 1 << 17,
- OPT_B = 1 << 18,
-+ OPT_D = 1 << 19,
- /* The rest has variable bit positions, need to be clever */
- OPTBIT_B = 18,
-+ OPTBIT_D = 19,
- USE_FOR_MMU( OPTBIT_b,)
- IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
- IF_FEATURE_UDHCP_PORT( OPTBIT_P,)
-@@ -587,7 +591,8 @@
-
- static void d4_run_script_deconfig(void)
- {
-- d4_run_script(NULL, "deconfig");
-+ if (allow_deconfig)
-+ d4_run_script(NULL, "deconfig");
- }
-
- /*** Sending/receiving packets ***/
-@@ -1244,7 +1249,7 @@
- /* Parse command line */
- opt = getopt32long(argv, "^"
- /* O,x: list; -T,-t,-A take numeric param */
-- "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
-+ "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD"
- USE_FOR_MMU("b")
- IF_FEATURE_UDHCPC_ARPING("a::")
- IF_FEATURE_UDHCP_PORT("P:")
-@@ -1361,6 +1366,10 @@
- logmode |= LOGMODE_SYSLOG;
- }
-
-+ if (opt & OPT_D) {
-+ allow_deconfig = 0;
-+ }
-+
- /* Create pidfile */
- write_pidfile(client_data.pidfile);
- /* Goes to stdout (unless NOMMU) and possibly syslog */
diff --git a/meta/recipes-core/busybox/busybox_1.36.1.bb b/meta/recipes-core/busybox/busybox_1.36.1.bb
index 06eb9eb9996..373a6b7781b 100644
--- a/meta/recipes-core/busybox/busybox_1.36.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.36.1.bb
@@ -2,7 +2,6 @@ require busybox.inc
SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-depmod-Ignore-.debug-directories.patch \
- file://busybox-udhcpc-no_deconfig.patch \
file://find-touchscreen.sh \
file://busybox-cron \
file://busybox-httpd \
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 11/19] icu: add upstream submission links for fix-install-manx.patch
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (8 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 10/19] busybox: remove busybox-udhcpc-no_deconfig.patch Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 12/19] mpeg2dec: remove the recipe Alexander Kanavin
` (7 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-support/icu/icu/fix-install-manx.patch | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch
index 7526bde3702..16cabc82643 100644
--- a/meta/recipes-support/icu/icu/fix-install-manx.patch
+++ b/meta/recipes-support/icu/icu/fix-install-manx.patch
@@ -11,7 +11,9 @@ and one process tries to chown a file that the other process has just deleted.
Also install-manx should be a phony target, and for clarity use $^ instead of $?
in the install command.
-Upstream-Status: Pending
+Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172
+
+Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966]
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
Makefile.in | 8 ++++----
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 12/19] mpeg2dec: remove the recipe
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (9 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 11/19] icu: add upstream submission links for fix-install-manx.patch Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-21 17:49 ` [OE-core] " Khem Raj
2024-04-19 12:19 ` [PATCH 13/19] apr: drop 0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch Alexander Kanavin
` (6 subsequent siblings)
17 siblings, 1 reply; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
This is as well inactive for over 10 years, and has been superseded by ffmpeg long time ago.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/conf/distro/include/maintainers.inc | 1 -
.../gstreamer1.0-plugins-ugly_1.22.11.bb | 1 -
...-1206-from-upstream-to-fix-PIE-build.patch | 156 ------------------
...heck-for-available-arm-optimizations.patch | 55 ------
...f-global-symbols-used-in-ARM-specifi.patch | 63 -------
.../files/61_global-symbol-test.patch | 70 --------
.../mpeg2dec/files/altivec_h_needed.patch | 43 -----
.../mpeg2dec/mpeg2dec_0.5.1.bb | 51 ------
8 files changed, 440 deletions(-)
delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
delete mode 100644 meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 52bb542483d..a11859890e5 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -523,7 +523,6 @@ RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>"
-RECIPE_MAINTAINER:pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
index d89442d7893..99f41d4f3dc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
@@ -25,7 +25,6 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0"
PACKAGECONFIG ??= " \
${GSTREAMER_ORC} \
- mpeg2dec \
"
PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
deleted file mode 100644
index b2544cb44d8..00000000000
--- a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 0cafb99b57f43cf6ac2c6208718e49ad2dbe462d Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <thaytan@noraisin.net>
-Date: Sun, 10 Nov 2013 00:49:52 +1100
-Subject: [PATCH] Import revision 1206 from upstream to fix PIE build.
-
-Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm
-in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad
-for shared libraries. Some environments demand that .text actually be
-read-only all the time, yet MC_put_o_16_arm etc require that the addresses
-be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.)
-Even in those environments which permit the dynamic linker to modify the
-.text segment, the runtime cost of doing the relocation can be noticeable.
-
-This commit rewrites the linkage, discarding the tables of addresses
-in favor of tables of offsets. All transfers are local within each individual
-function, so there can be no interference by processing that occurs
-after assembly, such as link-time re-ordering (even of individual functions.)
-
-Patch by John Reiser <jreiser@bitwagon.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport [https://code.videolan.org/videolan/libmpeg2/commit/946bf4b518aacc224f845e73708f99e394744499]
----
- libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++-------------------
- 1 file changed, 33 insertions(+), 37 deletions(-)
-
-diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
-index c921f7c..82143f8 100644
---- a/libmpeg2/motion_comp_arm_s.S
-+++ b/libmpeg2/motion_comp_arm_s.S
-@@ -30,9 +30,13 @@ MC_put_o_16_arm:
- pld [r1]
- stmfd sp!, {r4-r11, lr} @ R14 is also called LR
- and r4, r1, #3
-- adr r5, MC_put_o_16_arm_align_jt
-- add r5, r5, r4, lsl #2
-- ldr pc, [r5]
-+ ldrb r4, [pc, r4]
-+ add pc, pc, r4, lsl #2
-+ .byte (MC_put_o_16_arm_align0 - 0f)>>2
-+ .byte (MC_put_o_16_arm_align1 - 0f)>>2
-+ .byte (MC_put_o_16_arm_align2 - 0f)>>2
-+ .byte (MC_put_o_16_arm_align3 - 0f)>>2
-+0:
-
- MC_put_o_16_arm_align0:
- ldmia r1, {r4-r7}
-@@ -76,11 +80,6 @@ MC_put_o_16_arm_align3:
- 1: PROC(24)
- bne 1b
- ldmfd sp!, {r4-r11, pc} @@ update PC with LR content.
--MC_put_o_16_arm_align_jt:
-- .word MC_put_o_16_arm_align0
-- .word MC_put_o_16_arm_align1
-- .word MC_put_o_16_arm_align2
-- .word MC_put_o_16_arm_align3
-
- @ ----------------------------------------------------------------
- .align
-@@ -91,9 +90,14 @@ MC_put_o_8_arm:
- pld [r1]
- stmfd sp!, {r4-r10, lr} @ R14 is also called LR
- and r4, r1, #3
-- adr r5, MC_put_o_8_arm_align_jt
-- add r5, r5, r4, lsl #2
-- ldr pc, [r5]
-+ ldrb r4, [pc, r4]
-+ add pc, pc, r4, lsl #2
-+ .byte (MC_put_o_8_arm_align0 - 0f)>>2
-+ .byte (MC_put_o_8_arm_align1 - 0f)>>2
-+ .byte (MC_put_o_8_arm_align2 - 0f)>>2
-+ .byte (MC_put_o_8_arm_align3 - 0f)>>2
-+0:
-+
- MC_put_o_8_arm_align0:
- ldmia r1, {r4-r5}
- add r1, r1, r2
-@@ -135,12 +139,6 @@ MC_put_o_8_arm_align3:
- bne 1b
- ldmfd sp!, {r4-r10, pc} @@ update PC with LR content.
-
--MC_put_o_8_arm_align_jt:
-- .word MC_put_o_8_arm_align0
-- .word MC_put_o_8_arm_align1
-- .word MC_put_o_8_arm_align2
-- .word MC_put_o_8_arm_align3
--
- @ ----------------------------------------------------------------
- .macro AVG_PW rW1, rW2
- mov \rW2, \rW2, lsl #24
-@@ -160,12 +158,17 @@ MC_put_x_16_arm:
- @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
- stmfd sp!, {r4-r11,lr} @ R14 is also called LR
-+ ldr r11, 0f
- and r4, r1, #3
-- adr r5, MC_put_x_16_arm_align_jt
-- ldr r11, [r5]
- mvn r12, r11
-- add r5, r5, r4, lsl #2
-- ldr pc, [r5, #4]
-+ ldrb r4, [pc, r4]
-+ add pc, pc, r4, lsl #2
-+ .byte (MC_put_x_16_arm_align0 - 0f)>>2
-+ .byte (MC_put_x_16_arm_align1 - 0f)>>2
-+ .byte (MC_put_x_16_arm_align2 - 0f)>>2
-+ .byte (MC_put_x_16_arm_align3 - 0f)>>2
-+0:
-+ .word 0x01010101
-
- .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4
- mov \R0, \R0, lsr #(\shift)
-@@ -238,12 +241,6 @@ MC_put_x_16_arm_align3:
- add r0, r0, r2
- bne 1b
- ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
--MC_put_x_16_arm_align_jt:
-- .word 0x01010101
-- .word MC_put_x_16_arm_align0
-- .word MC_put_x_16_arm_align1
-- .word MC_put_x_16_arm_align2
-- .word MC_put_x_16_arm_align3
-
- @ ----------------------------------------------------------------
- .align
-@@ -253,12 +250,17 @@ MC_put_x_8_arm:
- @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
- stmfd sp!, {r4-r11,lr} @ R14 is also called LR
-+ ldr r11, 0f
- and r4, r1, #3
-- adr r5, MC_put_x_8_arm_align_jt
-- ldr r11, [r5]
- mvn r12, r11
-- add r5, r5, r4, lsl #2
-- ldr pc, [r5, #4]
-+ ldrb r4, [pc, r4]
-+ add pc, pc, r4, lsl #2
-+ .byte (MC_put_x_8_arm_align0 - 0f)>>2
-+ .byte (MC_put_x_8_arm_align1 - 0f)>>2
-+ .byte (MC_put_x_8_arm_align2 - 0f)>>2
-+ .byte (MC_put_x_8_arm_align3 - 0f)>>2
-+0:
-+ .word 0x01010101
-
- .macro ADJ_ALIGN_DW shift, R0, R1, R2
- mov \R0, \R0, lsr #(\shift)
-@@ -319,9 +321,3 @@ MC_put_x_8_arm_align3:
- add r0, r0, r2
- bne 1b
- ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
--MC_put_x_8_arm_align_jt:
-- .word 0x01010101
-- .word MC_put_x_8_arm_align0
-- .word MC_put_x_8_arm_align1
-- .word MC_put_x_8_arm_align2
-- .word MC_put_x_8_arm_align3
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
deleted file mode 100644
index 5bf68b39ee6..00000000000
--- a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From cbcff58ed670c8edc0be1004384cbe0fd07d8d26 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 5 Jul 2017 18:49:21 -0700
-Subject: [PATCH 1/2] check for available arm optimizations
-
-Taken From
-http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/65_arm-test-with-compiler.patch/
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index acdcb1e..2c0a721 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,7 +59,7 @@ elif test x"$GCC" = x"yes"; then
- AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
-
- dnl arch-specific flags
-- arm_conditional=false
-+ build_arm_opt=false
- case "$host" in
- i?86-* | k?-* | x86_64-* | amd64-*)
- AC_DEFINE([ARCH_X86],,[x86 architecture])
-@@ -102,8 +102,12 @@ elif test x"$GCC" = x"yes"; then
- alpha*)
- AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);;
- arm*)
-- arm_conditional=:
-- AC_DEFINE([ARCH_ARM],,[ARM architecture]);;
-+ AC_LANG(C)
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_SOURCE([[
-+ void foo(void) { __asm__ volatile("pld [r1]"); }]])],
-+ build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]),
-+ build_arm_opt=false);;
- esac
- elif test x"$CC" = x"tendracc"; then
- dnl TenDRA portability checking compiler
-@@ -123,7 +127,7 @@ else
- esac
- fi
-
--AM_CONDITIONAL(ARCH_ARM, ${arm_conditional})
-+AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue)
-
- dnl Checks for libtool - this must be done after we set cflags
- AC_LIBTOOL_WIN32_DLL
---
-2.13.2
-
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
deleted file mode 100644
index 83016923685..00000000000
--- a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f9d9dc92d75f8910e3cd5fdcbea72e505cdf3493 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 5 Jul 2017 19:03:36 -0700
-Subject: [PATCH 2/2] Set visibility of global symbols used in ARM specific
- assembly file to internal
-
-Taken from
-http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/60_arm-private-symbols.patch/
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libmpeg2/motion_comp_arm_s.S | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
-index f6c3d7d..c921f7c 100644
---- a/libmpeg2/motion_comp_arm_s.S
-+++ b/libmpeg2/motion_comp_arm_s.S
-@@ -23,7 +23,8 @@
-
- @ ----------------------------------------------------------------
- .align
-- .global MC_put_o_16_arm
-+ .global MC_put_o_16_arm
-+ .internal MC_put_o_16_arm
- MC_put_o_16_arm:
- @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
-@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt:
-
- @ ----------------------------------------------------------------
- .align
-- .global MC_put_o_8_arm
-+ .global MC_put_o_8_arm
-+ .internal MC_put_o_8_arm
- MC_put_o_8_arm:
- @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
-@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt:
- .endm
-
- .align
-- .global MC_put_x_16_arm
-+ .global MC_put_x_16_arm
-+ .internal MC_put_x_16_arm
- MC_put_x_16_arm:
- @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
-@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt:
-
- @ ----------------------------------------------------------------
- .align
-- .global MC_put_x_8_arm
-+ .global MC_put_x_8_arm
-+ .internal MC_put_x_8_arm
- MC_put_x_8_arm:
- @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
---
-2.13.2
-
diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
deleted file mode 100644
index 00b667d3365..00000000000
--- a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Rewrite the public symbol check to verify the shared libraries, to check for
-more things, and to avoid duplication; fixes make check on ARM
-
-Taken From
-https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/globals | 42 +++++++++++++++++++++++++++---------------
- 1 file changed, 27 insertions(+), 15 deletions(-)
-
---- mpeg2dec.orig/test/globals
-+++ mpeg2dec/test/globals
-@@ -1,4 +1,8 @@
- #!/bin/sh
-+# TODO
-+# - fix checking of .a libs; problem is that "nm -g --defined-only" lists
-+# internal symbols; this can be solved by using objdump, but it's probably
-+# good enough to just run the tests on the shared lib
-
- if test x"$srcdir" != x""; then
- builddir="." # running from make check, but it does not define that
-@@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd`
-
- error=0
-
--bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\
-- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'`
--
--if test x"$bad_globals" != x""; then
-- echo BAD GLOBAL SYMBOLS:
-- for s in $bad_globals; do echo $s; done
-+# check_bad_public_symbols <symbol prefix> <lib file> [<lib file>...]
-+#
-+# checks public symbols in shared libs:
-+# - allow prefix_anything
-+# - reject _prefixanything
-+# - allow _anything
-+# - reject anything else
-+#
-+# NB: skips missing files
-+check_bad_public_symbols() {
-+ symbols_prefix="$1"
-+ shift
-+ lib_files=`ls "$@" 2>/dev/null`
-+ [ -z "$lib_files" ] && return
-+ bad_globals=`nm -g --defined-only $lib_files |
-+ awk '{if ($3) print $3}' |
-+ sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"`
-+ [ -z "$bad_globals" ] && return
- error=1
--fi
--
--bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\
-- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'`
-+ echo BAD GLOBAL SYMBOLS in $lib_files:
-+ echo "$bad_globals"
-+}
-
--if test x"$bad_globals" != x""; then
-- echo BAD GLOBAL SYMBOLS:
-- for s in $bad_globals; do echo $s; done
-- error=1
--fi
-+check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so
-+check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so
-
- exit $error
diff --git a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
deleted file mode 100644
index 5113ad44fe4..00000000000
--- a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add new method to judge whether <altivec.h> is needed
-
-The original logic will use "typedef vector int t;" to judge
-whether <altivec.h> is needed. altivec.h contains the following
-statement:
-
- #if !defined(__APPLE_ALTIVEC__)
- #define vector __vector
- #define pixel __pixel
- #define bool
- #endif
-
-In gcc-4.3.3, __APPLE_ALTIVEC__ is not defined by compiler, neither
-as vector, pixel, and bool. In order to make "typedef vector int t;"
-pass the compilation, we need to include altivec.h.
-
-However in gcc-4.5.0, __APPLE_ALTIVEC__ is defined by compiler,
-so as vector, pixel, and bool. We could not judge whether
-altivec.h is needed by "typedef vector int t;".
-Here we include another statement "int tmp = __CR6_EQ;", in
-which __CR6_EQ is defined in altivec.h.
-
-Upstream-Status: Pending
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-diff -ruN a/configure.in b/configure.in
---- a/configure.ac 2010-09-14 20:55:42.399687663 +0800
-+++ b/configure.ac 2010-09-14 20:56:43.403204648 +0800
-@@ -79,11 +79,11 @@
- CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
- AC_MSG_CHECKING([if <altivec.h> is needed])
- AC_TRY_COMPILE([],
-- [typedef vector int t;
-+ [typedef vector int t; int tmp = __CR6_EQ;
- vec_ld(0, (unsigned char *)0);],
- [have_altivec=yes; AC_MSG_RESULT(no)],
- [AC_TRY_COMPILE([#include <altivec.h>],
-- [typedef vector int t; vec_ld(0, (unsigned char *)0);],
-+ [typedef vector int t; int tmp = __CR6_EQ; vec_ld(0, (unsigned char *)0);],
- [AC_DEFINE([HAVE_ALTIVEC_H],,
- [Define to 1 if you have the <altivec.h> header.])
- have_altivec=yes; AC_MSG_RESULT(yes)],
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
deleted file mode 100644
index fd8b561657d..00000000000
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams"
-DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \
-mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \
-for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \
-is to have a simple test bed for libmpeg2."
-HOMEPAGE = "https://libmpeg2.sourceforge.io/"
-SECTION = "libs"
-LICENSE = "GPL-2.0-or-later"
-LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://include/mpeg2.h;beginline=1;endline=22;md5=7766f4fcb58f0f8413c49a746f2ab89b"
-
-SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \
- file://altivec_h_needed.patch \
- file://0001-check-for-available-arm-optimizations.patch \
- file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \
- file://61_global-symbol-test.patch \
- file://0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch \
- "
-
-S = "${WORKDIR}/libmpeg2-${PV}"
-
-SRC_URI[md5sum] = "0f92c7454e58379b4a5a378485bbd8ef"
-SRC_URI[sha256sum] = "dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
-
-UPSTREAM_CHECK_URI = "http://libmpeg2.sourceforge.net/downloads.html"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-shared --disable-sdl"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv"
-
-PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev"
-
-FILES:${PN} = "${bindir}/*"
-FILES:libmpeg2 = "${libdir}/libmpeg2.so.*"
-FILES:libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
-FILES:libmpeg2-dev = "${libdir}/libmpeg2.so \
- ${libdir}/libmpeg2.la \
- ${libdir}/libmpeg2arch.la \
- ${libdir}/pkgconfig/libmpeg2.pc \
- ${includedir}/mpeg2dec/mpeg2.h"
-FILES:libmpeg2-staticdev = "${libdir}/libmpeg2.a"
-FILES:libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
- ${libdir}/libmpeg2convert.la \
- ${libdir}/libmpeg2convertarch.la \
- ${libdir}/pkgconfig/libmpeg2convert.pc \
- ${includedir}/mpeg2dec/mpeg2convert.h"
-FILES:libmpeg2convert-staticdev = "${libdir}/libmpeg2convert.a"
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [OE-core] [PATCH 12/19] mpeg2dec: remove the recipe
2024-04-19 12:19 ` [PATCH 12/19] mpeg2dec: remove the recipe Alexander Kanavin
@ 2024-04-21 17:49 ` Khem Raj
2024-04-21 18:18 ` Alexander Kanavin
0 siblings, 1 reply; 28+ messages in thread
From: Khem Raj @ 2024-04-21 17:49 UTC (permalink / raw)
To: alex.kanavin; +Cc: openembedded-core, Alexander Kanavin
vlc has a dependency on it, perhaps vlc needs tweaking too.
On Fri, Apr 19, 2024 at 5:20 AM Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> This is as well inactive for over 10 years, and has been superseded by ffmpeg long time ago.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> meta/conf/distro/include/maintainers.inc | 1 -
> .../gstreamer1.0-plugins-ugly_1.22.11.bb | 1 -
> ...-1206-from-upstream-to-fix-PIE-build.patch | 156 ------------------
> ...heck-for-available-arm-optimizations.patch | 55 ------
> ...f-global-symbols-used-in-ARM-specifi.patch | 63 -------
> .../files/61_global-symbol-test.patch | 70 --------
> .../mpeg2dec/files/altivec_h_needed.patch | 43 -----
> .../mpeg2dec/mpeg2dec_0.5.1.bb | 51 ------
> 8 files changed, 440 deletions(-)
> delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
> delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
> delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
> delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
> delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
> delete mode 100644 meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index 52bb542483d..a11859890e5 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -523,7 +523,6 @@ RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>"
> RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>"
> RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>"
> RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>"
> -RECIPE_MAINTAINER:pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>"
> RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>"
> RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>"
> RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>"
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
> index d89442d7893..99f41d4f3dc 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
> @@ -25,7 +25,6 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0"
>
> PACKAGECONFIG ??= " \
> ${GSTREAMER_ORC} \
> - mpeg2dec \
> "
>
> PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
> diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
> deleted file mode 100644
> index b2544cb44d8..00000000000
> --- a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
> +++ /dev/null
> @@ -1,156 +0,0 @@
> -From 0cafb99b57f43cf6ac2c6208718e49ad2dbe462d Mon Sep 17 00:00:00 2001
> -From: Jan Schmidt <thaytan@noraisin.net>
> -Date: Sun, 10 Nov 2013 00:49:52 +1100
> -Subject: [PATCH] Import revision 1206 from upstream to fix PIE build.
> -
> -Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm
> -in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad
> -for shared libraries. Some environments demand that .text actually be
> -read-only all the time, yet MC_put_o_16_arm etc require that the addresses
> -be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.)
> -Even in those environments which permit the dynamic linker to modify the
> -.text segment, the runtime cost of doing the relocation can be noticeable.
> -
> -This commit rewrites the linkage, discarding the tables of addresses
> -in favor of tables of offsets. All transfers are local within each individual
> -function, so there can be no interference by processing that occurs
> -after assembly, such as link-time re-ordering (even of individual functions.)
> -
> -Patch by John Reiser <jreiser@bitwagon.com>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Backport [https://code.videolan.org/videolan/libmpeg2/commit/946bf4b518aacc224f845e73708f99e394744499]
> ----
> - libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++-------------------
> - 1 file changed, 33 insertions(+), 37 deletions(-)
> -
> -diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
> -index c921f7c..82143f8 100644
> ---- a/libmpeg2/motion_comp_arm_s.S
> -+++ b/libmpeg2/motion_comp_arm_s.S
> -@@ -30,9 +30,13 @@ MC_put_o_16_arm:
> - pld [r1]
> - stmfd sp!, {r4-r11, lr} @ R14 is also called LR
> - and r4, r1, #3
> -- adr r5, MC_put_o_16_arm_align_jt
> -- add r5, r5, r4, lsl #2
> -- ldr pc, [r5]
> -+ ldrb r4, [pc, r4]
> -+ add pc, pc, r4, lsl #2
> -+ .byte (MC_put_o_16_arm_align0 - 0f)>>2
> -+ .byte (MC_put_o_16_arm_align1 - 0f)>>2
> -+ .byte (MC_put_o_16_arm_align2 - 0f)>>2
> -+ .byte (MC_put_o_16_arm_align3 - 0f)>>2
> -+0:
> -
> - MC_put_o_16_arm_align0:
> - ldmia r1, {r4-r7}
> -@@ -76,11 +80,6 @@ MC_put_o_16_arm_align3:
> - 1: PROC(24)
> - bne 1b
> - ldmfd sp!, {r4-r11, pc} @@ update PC with LR content.
> --MC_put_o_16_arm_align_jt:
> -- .word MC_put_o_16_arm_align0
> -- .word MC_put_o_16_arm_align1
> -- .word MC_put_o_16_arm_align2
> -- .word MC_put_o_16_arm_align3
> -
> - @ ----------------------------------------------------------------
> - .align
> -@@ -91,9 +90,14 @@ MC_put_o_8_arm:
> - pld [r1]
> - stmfd sp!, {r4-r10, lr} @ R14 is also called LR
> - and r4, r1, #3
> -- adr r5, MC_put_o_8_arm_align_jt
> -- add r5, r5, r4, lsl #2
> -- ldr pc, [r5]
> -+ ldrb r4, [pc, r4]
> -+ add pc, pc, r4, lsl #2
> -+ .byte (MC_put_o_8_arm_align0 - 0f)>>2
> -+ .byte (MC_put_o_8_arm_align1 - 0f)>>2
> -+ .byte (MC_put_o_8_arm_align2 - 0f)>>2
> -+ .byte (MC_put_o_8_arm_align3 - 0f)>>2
> -+0:
> -+
> - MC_put_o_8_arm_align0:
> - ldmia r1, {r4-r5}
> - add r1, r1, r2
> -@@ -135,12 +139,6 @@ MC_put_o_8_arm_align3:
> - bne 1b
> - ldmfd sp!, {r4-r10, pc} @@ update PC with LR content.
> -
> --MC_put_o_8_arm_align_jt:
> -- .word MC_put_o_8_arm_align0
> -- .word MC_put_o_8_arm_align1
> -- .word MC_put_o_8_arm_align2
> -- .word MC_put_o_8_arm_align3
> --
> - @ ----------------------------------------------------------------
> - .macro AVG_PW rW1, rW2
> - mov \rW2, \rW2, lsl #24
> -@@ -160,12 +158,17 @@ MC_put_x_16_arm:
> - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> - pld [r1]
> - stmfd sp!, {r4-r11,lr} @ R14 is also called LR
> -+ ldr r11, 0f
> - and r4, r1, #3
> -- adr r5, MC_put_x_16_arm_align_jt
> -- ldr r11, [r5]
> - mvn r12, r11
> -- add r5, r5, r4, lsl #2
> -- ldr pc, [r5, #4]
> -+ ldrb r4, [pc, r4]
> -+ add pc, pc, r4, lsl #2
> -+ .byte (MC_put_x_16_arm_align0 - 0f)>>2
> -+ .byte (MC_put_x_16_arm_align1 - 0f)>>2
> -+ .byte (MC_put_x_16_arm_align2 - 0f)>>2
> -+ .byte (MC_put_x_16_arm_align3 - 0f)>>2
> -+0:
> -+ .word 0x01010101
> -
> - .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4
> - mov \R0, \R0, lsr #(\shift)
> -@@ -238,12 +241,6 @@ MC_put_x_16_arm_align3:
> - add r0, r0, r2
> - bne 1b
> - ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
> --MC_put_x_16_arm_align_jt:
> -- .word 0x01010101
> -- .word MC_put_x_16_arm_align0
> -- .word MC_put_x_16_arm_align1
> -- .word MC_put_x_16_arm_align2
> -- .word MC_put_x_16_arm_align3
> -
> - @ ----------------------------------------------------------------
> - .align
> -@@ -253,12 +250,17 @@ MC_put_x_8_arm:
> - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> - pld [r1]
> - stmfd sp!, {r4-r11,lr} @ R14 is also called LR
> -+ ldr r11, 0f
> - and r4, r1, #3
> -- adr r5, MC_put_x_8_arm_align_jt
> -- ldr r11, [r5]
> - mvn r12, r11
> -- add r5, r5, r4, lsl #2
> -- ldr pc, [r5, #4]
> -+ ldrb r4, [pc, r4]
> -+ add pc, pc, r4, lsl #2
> -+ .byte (MC_put_x_8_arm_align0 - 0f)>>2
> -+ .byte (MC_put_x_8_arm_align1 - 0f)>>2
> -+ .byte (MC_put_x_8_arm_align2 - 0f)>>2
> -+ .byte (MC_put_x_8_arm_align3 - 0f)>>2
> -+0:
> -+ .word 0x01010101
> -
> - .macro ADJ_ALIGN_DW shift, R0, R1, R2
> - mov \R0, \R0, lsr #(\shift)
> -@@ -319,9 +321,3 @@ MC_put_x_8_arm_align3:
> - add r0, r0, r2
> - bne 1b
> - ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
> --MC_put_x_8_arm_align_jt:
> -- .word 0x01010101
> -- .word MC_put_x_8_arm_align0
> -- .word MC_put_x_8_arm_align1
> -- .word MC_put_x_8_arm_align2
> -- .word MC_put_x_8_arm_align3
> diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
> deleted file mode 100644
> index 5bf68b39ee6..00000000000
> --- a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From cbcff58ed670c8edc0be1004384cbe0fd07d8d26 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Wed, 5 Jul 2017 18:49:21 -0700
> -Subject: [PATCH 1/2] check for available arm optimizations
> -
> -Taken From
> -http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/65_arm-test-with-compiler.patch/
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - configure.ac | 12 ++++++++----
> - 1 file changed, 8 insertions(+), 4 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index acdcb1e..2c0a721 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -59,7 +59,7 @@ elif test x"$GCC" = x"yes"; then
> - AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
> -
> - dnl arch-specific flags
> -- arm_conditional=false
> -+ build_arm_opt=false
> - case "$host" in
> - i?86-* | k?-* | x86_64-* | amd64-*)
> - AC_DEFINE([ARCH_X86],,[x86 architecture])
> -@@ -102,8 +102,12 @@ elif test x"$GCC" = x"yes"; then
> - alpha*)
> - AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);;
> - arm*)
> -- arm_conditional=:
> -- AC_DEFINE([ARCH_ARM],,[ARM architecture]);;
> -+ AC_LANG(C)
> -+ AC_COMPILE_IFELSE(
> -+ [AC_LANG_SOURCE([[
> -+ void foo(void) { __asm__ volatile("pld [r1]"); }]])],
> -+ build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]),
> -+ build_arm_opt=false);;
> - esac
> - elif test x"$CC" = x"tendracc"; then
> - dnl TenDRA portability checking compiler
> -@@ -123,7 +127,7 @@ else
> - esac
> - fi
> -
> --AM_CONDITIONAL(ARCH_ARM, ${arm_conditional})
> -+AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue)
> -
> - dnl Checks for libtool - this must be done after we set cflags
> - AC_LIBTOOL_WIN32_DLL
> ---
> -2.13.2
> -
> diff --git a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
> deleted file mode 100644
> index 83016923685..00000000000
> --- a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From f9d9dc92d75f8910e3cd5fdcbea72e505cdf3493 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Wed, 5 Jul 2017 19:03:36 -0700
> -Subject: [PATCH 2/2] Set visibility of global symbols used in ARM specific
> - assembly file to internal
> -
> -Taken from
> -http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/60_arm-private-symbols.patch/
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - libmpeg2/motion_comp_arm_s.S | 12 ++++++++----
> - 1 file changed, 8 insertions(+), 4 deletions(-)
> -
> -diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
> -index f6c3d7d..c921f7c 100644
> ---- a/libmpeg2/motion_comp_arm_s.S
> -+++ b/libmpeg2/motion_comp_arm_s.S
> -@@ -23,7 +23,8 @@
> -
> - @ ----------------------------------------------------------------
> - .align
> -- .global MC_put_o_16_arm
> -+ .global MC_put_o_16_arm
> -+ .internal MC_put_o_16_arm
> - MC_put_o_16_arm:
> - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> - pld [r1]
> -@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt:
> -
> - @ ----------------------------------------------------------------
> - .align
> -- .global MC_put_o_8_arm
> -+ .global MC_put_o_8_arm
> -+ .internal MC_put_o_8_arm
> - MC_put_o_8_arm:
> - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> - pld [r1]
> -@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt:
> - .endm
> -
> - .align
> -- .global MC_put_x_16_arm
> -+ .global MC_put_x_16_arm
> -+ .internal MC_put_x_16_arm
> - MC_put_x_16_arm:
> - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> - pld [r1]
> -@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt:
> -
> - @ ----------------------------------------------------------------
> - .align
> -- .global MC_put_x_8_arm
> -+ .global MC_put_x_8_arm
> -+ .internal MC_put_x_8_arm
> - MC_put_x_8_arm:
> - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> - pld [r1]
> ---
> -2.13.2
> -
> diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
> deleted file mode 100644
> index 00b667d3365..00000000000
> --- a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -Rewrite the public symbol check to verify the shared libraries, to check for
> -more things, and to avoid duplication; fixes make check on ARM
> -
> -Taken From
> -https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - test/globals | 42 +++++++++++++++++++++++++++---------------
> - 1 file changed, 27 insertions(+), 15 deletions(-)
> -
> ---- mpeg2dec.orig/test/globals
> -+++ mpeg2dec/test/globals
> -@@ -1,4 +1,8 @@
> - #!/bin/sh
> -+# TODO
> -+# - fix checking of .a libs; problem is that "nm -g --defined-only" lists
> -+# internal symbols; this can be solved by using objdump, but it's probably
> -+# good enough to just run the tests on the shared lib
> -
> - if test x"$srcdir" != x""; then
> - builddir="." # running from make check, but it does not define that
> -@@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd`
> -
> - error=0
> -
> --bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\
> -- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'`
> --
> --if test x"$bad_globals" != x""; then
> -- echo BAD GLOBAL SYMBOLS:
> -- for s in $bad_globals; do echo $s; done
> -+# check_bad_public_symbols <symbol prefix> <lib file> [<lib file>...]
> -+#
> -+# checks public symbols in shared libs:
> -+# - allow prefix_anything
> -+# - reject _prefixanything
> -+# - allow _anything
> -+# - reject anything else
> -+#
> -+# NB: skips missing files
> -+check_bad_public_symbols() {
> -+ symbols_prefix="$1"
> -+ shift
> -+ lib_files=`ls "$@" 2>/dev/null`
> -+ [ -z "$lib_files" ] && return
> -+ bad_globals=`nm -g --defined-only $lib_files |
> -+ awk '{if ($3) print $3}' |
> -+ sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"`
> -+ [ -z "$bad_globals" ] && return
> - error=1
> --fi
> --
> --bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\
> -- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'`
> -+ echo BAD GLOBAL SYMBOLS in $lib_files:
> -+ echo "$bad_globals"
> -+}
> -
> --if test x"$bad_globals" != x""; then
> -- echo BAD GLOBAL SYMBOLS:
> -- for s in $bad_globals; do echo $s; done
> -- error=1
> --fi
> -+check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so
> -+check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so
> -
> - exit $error
> diff --git a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
> deleted file mode 100644
> index 5113ad44fe4..00000000000
> --- a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -Add new method to judge whether <altivec.h> is needed
> -
> -The original logic will use "typedef vector int t;" to judge
> -whether <altivec.h> is needed. altivec.h contains the following
> -statement:
> -
> - #if !defined(__APPLE_ALTIVEC__)
> - #define vector __vector
> - #define pixel __pixel
> - #define bool
> - #endif
> -
> -In gcc-4.3.3, __APPLE_ALTIVEC__ is not defined by compiler, neither
> -as vector, pixel, and bool. In order to make "typedef vector int t;"
> -pass the compilation, we need to include altivec.h.
> -
> -However in gcc-4.5.0, __APPLE_ALTIVEC__ is defined by compiler,
> -so as vector, pixel, and bool. We could not judge whether
> -altivec.h is needed by "typedef vector int t;".
> -Here we include another statement "int tmp = __CR6_EQ;", in
> -which __CR6_EQ is defined in altivec.h.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> -
> -diff -ruN a/configure.in b/configure.in
> ---- a/configure.ac 2010-09-14 20:55:42.399687663 +0800
> -+++ b/configure.ac 2010-09-14 20:56:43.403204648 +0800
> -@@ -79,11 +79,11 @@
> - CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
> - AC_MSG_CHECKING([if <altivec.h> is needed])
> - AC_TRY_COMPILE([],
> -- [typedef vector int t;
> -+ [typedef vector int t; int tmp = __CR6_EQ;
> - vec_ld(0, (unsigned char *)0);],
> - [have_altivec=yes; AC_MSG_RESULT(no)],
> - [AC_TRY_COMPILE([#include <altivec.h>],
> -- [typedef vector int t; vec_ld(0, (unsigned char *)0);],
> -+ [typedef vector int t; int tmp = __CR6_EQ; vec_ld(0, (unsigned char *)0);],
> - [AC_DEFINE([HAVE_ALTIVEC_H],,
> - [Define to 1 if you have the <altivec.h> header.])
> - have_altivec=yes; AC_MSG_RESULT(yes)],
> diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
> deleted file mode 100644
> index fd8b561657d..00000000000
> --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams"
> -DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \
> -mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \
> -for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \
> -is to have a simple test bed for libmpeg2."
> -HOMEPAGE = "https://libmpeg2.sourceforge.io/"
> -SECTION = "libs"
> -LICENSE = "GPL-2.0-or-later"
> -LICENSE_FLAGS = "commercial"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> - file://include/mpeg2.h;beginline=1;endline=22;md5=7766f4fcb58f0f8413c49a746f2ab89b"
> -
> -SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \
> - file://altivec_h_needed.patch \
> - file://0001-check-for-available-arm-optimizations.patch \
> - file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \
> - file://61_global-symbol-test.patch \
> - file://0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch \
> - "
> -
> -S = "${WORKDIR}/libmpeg2-${PV}"
> -
> -SRC_URI[md5sum] = "0f92c7454e58379b4a5a378485bbd8ef"
> -SRC_URI[sha256sum] = "dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
> -
> -UPSTREAM_CHECK_URI = "http://libmpeg2.sourceforge.net/downloads.html"
> -
> -inherit autotools pkgconfig
> -
> -EXTRA_OECONF = "--enable-shared --disable-sdl"
> -
> -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
> -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv"
> -
> -PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev"
> -
> -FILES:${PN} = "${bindir}/*"
> -FILES:libmpeg2 = "${libdir}/libmpeg2.so.*"
> -FILES:libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
> -FILES:libmpeg2-dev = "${libdir}/libmpeg2.so \
> - ${libdir}/libmpeg2.la \
> - ${libdir}/libmpeg2arch.la \
> - ${libdir}/pkgconfig/libmpeg2.pc \
> - ${includedir}/mpeg2dec/mpeg2.h"
> -FILES:libmpeg2-staticdev = "${libdir}/libmpeg2.a"
> -FILES:libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
> - ${libdir}/libmpeg2convert.la \
> - ${libdir}/libmpeg2convertarch.la \
> - ${libdir}/pkgconfig/libmpeg2convert.pc \
> - ${includedir}/mpeg2dec/mpeg2convert.h"
> -FILES:libmpeg2convert-staticdev = "${libdir}/libmpeg2convert.a"
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#198540): https://lists.openembedded.org/g/openembedded-core/message/198540
> Mute This Topic: https://lists.openembedded.org/mt/105616504/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [OE-core] [PATCH 12/19] mpeg2dec: remove the recipe
2024-04-21 17:49 ` [OE-core] " Khem Raj
@ 2024-04-21 18:18 ` Alexander Kanavin
0 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-21 18:18 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core, Alexander Kanavin
Right, I forgot that patch. Sending now.
Alex
On Sun, 21 Apr 2024 at 19:50, Khem Raj <raj.khem@gmail.com> wrote:
>
> vlc has a dependency on it, perhaps vlc needs tweaking too.
>
> On Fri, Apr 19, 2024 at 5:20 AM Alexander Kanavin via
> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
> wrote:
> >
> > This is as well inactive for over 10 years, and has been superseded by ffmpeg long time ago.
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 -
> > .../gstreamer1.0-plugins-ugly_1.22.11.bb | 1 -
> > ...-1206-from-upstream-to-fix-PIE-build.patch | 156 ------------------
> > ...heck-for-available-arm-optimizations.patch | 55 ------
> > ...f-global-symbols-used-in-ARM-specifi.patch | 63 -------
> > .../files/61_global-symbol-test.patch | 70 --------
> > .../mpeg2dec/files/altivec_h_needed.patch | 43 -----
> > .../mpeg2dec/mpeg2dec_0.5.1.bb | 51 ------
> > 8 files changed, 440 deletions(-)
> > delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
> > delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
> > delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
> > delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
> > delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
> > delete mode 100644 meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> > index 52bb542483d..a11859890e5 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -523,7 +523,6 @@ RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>"
> > RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>"
> > RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>"
> > RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>"
> > -RECIPE_MAINTAINER:pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>"
> > RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>"
> > RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>"
> > RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>"
> > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
> > index d89442d7893..99f41d4f3dc 100644
> > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
> > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
> > @@ -25,7 +25,6 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0"
> >
> > PACKAGECONFIG ??= " \
> > ${GSTREAMER_ORC} \
> > - mpeg2dec \
> > "
> >
> > PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
> > diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
> > deleted file mode 100644
> > index b2544cb44d8..00000000000
> > --- a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
> > +++ /dev/null
> > @@ -1,156 +0,0 @@
> > -From 0cafb99b57f43cf6ac2c6208718e49ad2dbe462d Mon Sep 17 00:00:00 2001
> > -From: Jan Schmidt <thaytan@noraisin.net>
> > -Date: Sun, 10 Nov 2013 00:49:52 +1100
> > -Subject: [PATCH] Import revision 1206 from upstream to fix PIE build.
> > -
> > -Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm
> > -in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad
> > -for shared libraries. Some environments demand that .text actually be
> > -read-only all the time, yet MC_put_o_16_arm etc require that the addresses
> > -be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.)
> > -Even in those environments which permit the dynamic linker to modify the
> > -.text segment, the runtime cost of doing the relocation can be noticeable.
> > -
> > -This commit rewrites the linkage, discarding the tables of addresses
> > -in favor of tables of offsets. All transfers are local within each individual
> > -function, so there can be no interference by processing that occurs
> > -after assembly, such as link-time re-ordering (even of individual functions.)
> > -
> > -Patch by John Reiser <jreiser@bitwagon.com>
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > -Upstream-Status: Backport [https://code.videolan.org/videolan/libmpeg2/commit/946bf4b518aacc224f845e73708f99e394744499]
> > ----
> > - libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++-------------------
> > - 1 file changed, 33 insertions(+), 37 deletions(-)
> > -
> > -diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
> > -index c921f7c..82143f8 100644
> > ---- a/libmpeg2/motion_comp_arm_s.S
> > -+++ b/libmpeg2/motion_comp_arm_s.S
> > -@@ -30,9 +30,13 @@ MC_put_o_16_arm:
> > - pld [r1]
> > - stmfd sp!, {r4-r11, lr} @ R14 is also called LR
> > - and r4, r1, #3
> > -- adr r5, MC_put_o_16_arm_align_jt
> > -- add r5, r5, r4, lsl #2
> > -- ldr pc, [r5]
> > -+ ldrb r4, [pc, r4]
> > -+ add pc, pc, r4, lsl #2
> > -+ .byte (MC_put_o_16_arm_align0 - 0f)>>2
> > -+ .byte (MC_put_o_16_arm_align1 - 0f)>>2
> > -+ .byte (MC_put_o_16_arm_align2 - 0f)>>2
> > -+ .byte (MC_put_o_16_arm_align3 - 0f)>>2
> > -+0:
> > -
> > - MC_put_o_16_arm_align0:
> > - ldmia r1, {r4-r7}
> > -@@ -76,11 +80,6 @@ MC_put_o_16_arm_align3:
> > - 1: PROC(24)
> > - bne 1b
> > - ldmfd sp!, {r4-r11, pc} @@ update PC with LR content.
> > --MC_put_o_16_arm_align_jt:
> > -- .word MC_put_o_16_arm_align0
> > -- .word MC_put_o_16_arm_align1
> > -- .word MC_put_o_16_arm_align2
> > -- .word MC_put_o_16_arm_align3
> > -
> > - @ ----------------------------------------------------------------
> > - .align
> > -@@ -91,9 +90,14 @@ MC_put_o_8_arm:
> > - pld [r1]
> > - stmfd sp!, {r4-r10, lr} @ R14 is also called LR
> > - and r4, r1, #3
> > -- adr r5, MC_put_o_8_arm_align_jt
> > -- add r5, r5, r4, lsl #2
> > -- ldr pc, [r5]
> > -+ ldrb r4, [pc, r4]
> > -+ add pc, pc, r4, lsl #2
> > -+ .byte (MC_put_o_8_arm_align0 - 0f)>>2
> > -+ .byte (MC_put_o_8_arm_align1 - 0f)>>2
> > -+ .byte (MC_put_o_8_arm_align2 - 0f)>>2
> > -+ .byte (MC_put_o_8_arm_align3 - 0f)>>2
> > -+0:
> > -+
> > - MC_put_o_8_arm_align0:
> > - ldmia r1, {r4-r5}
> > - add r1, r1, r2
> > -@@ -135,12 +139,6 @@ MC_put_o_8_arm_align3:
> > - bne 1b
> > - ldmfd sp!, {r4-r10, pc} @@ update PC with LR content.
> > -
> > --MC_put_o_8_arm_align_jt:
> > -- .word MC_put_o_8_arm_align0
> > -- .word MC_put_o_8_arm_align1
> > -- .word MC_put_o_8_arm_align2
> > -- .word MC_put_o_8_arm_align3
> > --
> > - @ ----------------------------------------------------------------
> > - .macro AVG_PW rW1, rW2
> > - mov \rW2, \rW2, lsl #24
> > -@@ -160,12 +158,17 @@ MC_put_x_16_arm:
> > - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> > - pld [r1]
> > - stmfd sp!, {r4-r11,lr} @ R14 is also called LR
> > -+ ldr r11, 0f
> > - and r4, r1, #3
> > -- adr r5, MC_put_x_16_arm_align_jt
> > -- ldr r11, [r5]
> > - mvn r12, r11
> > -- add r5, r5, r4, lsl #2
> > -- ldr pc, [r5, #4]
> > -+ ldrb r4, [pc, r4]
> > -+ add pc, pc, r4, lsl #2
> > -+ .byte (MC_put_x_16_arm_align0 - 0f)>>2
> > -+ .byte (MC_put_x_16_arm_align1 - 0f)>>2
> > -+ .byte (MC_put_x_16_arm_align2 - 0f)>>2
> > -+ .byte (MC_put_x_16_arm_align3 - 0f)>>2
> > -+0:
> > -+ .word 0x01010101
> > -
> > - .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4
> > - mov \R0, \R0, lsr #(\shift)
> > -@@ -238,12 +241,6 @@ MC_put_x_16_arm_align3:
> > - add r0, r0, r2
> > - bne 1b
> > - ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
> > --MC_put_x_16_arm_align_jt:
> > -- .word 0x01010101
> > -- .word MC_put_x_16_arm_align0
> > -- .word MC_put_x_16_arm_align1
> > -- .word MC_put_x_16_arm_align2
> > -- .word MC_put_x_16_arm_align3
> > -
> > - @ ----------------------------------------------------------------
> > - .align
> > -@@ -253,12 +250,17 @@ MC_put_x_8_arm:
> > - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> > - pld [r1]
> > - stmfd sp!, {r4-r11,lr} @ R14 is also called LR
> > -+ ldr r11, 0f
> > - and r4, r1, #3
> > -- adr r5, MC_put_x_8_arm_align_jt
> > -- ldr r11, [r5]
> > - mvn r12, r11
> > -- add r5, r5, r4, lsl #2
> > -- ldr pc, [r5, #4]
> > -+ ldrb r4, [pc, r4]
> > -+ add pc, pc, r4, lsl #2
> > -+ .byte (MC_put_x_8_arm_align0 - 0f)>>2
> > -+ .byte (MC_put_x_8_arm_align1 - 0f)>>2
> > -+ .byte (MC_put_x_8_arm_align2 - 0f)>>2
> > -+ .byte (MC_put_x_8_arm_align3 - 0f)>>2
> > -+0:
> > -+ .word 0x01010101
> > -
> > - .macro ADJ_ALIGN_DW shift, R0, R1, R2
> > - mov \R0, \R0, lsr #(\shift)
> > -@@ -319,9 +321,3 @@ MC_put_x_8_arm_align3:
> > - add r0, r0, r2
> > - bne 1b
> > - ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
> > --MC_put_x_8_arm_align_jt:
> > -- .word 0x01010101
> > -- .word MC_put_x_8_arm_align0
> > -- .word MC_put_x_8_arm_align1
> > -- .word MC_put_x_8_arm_align2
> > -- .word MC_put_x_8_arm_align3
> > diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
> > deleted file mode 100644
> > index 5bf68b39ee6..00000000000
> > --- a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
> > +++ /dev/null
> > @@ -1,55 +0,0 @@
> > -From cbcff58ed670c8edc0be1004384cbe0fd07d8d26 Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Wed, 5 Jul 2017 18:49:21 -0700
> > -Subject: [PATCH 1/2] check for available arm optimizations
> > -
> > -Taken From
> > -http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/65_arm-test-with-compiler.patch/
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - configure.ac | 12 ++++++++----
> > - 1 file changed, 8 insertions(+), 4 deletions(-)
> > -
> > -diff --git a/configure.ac b/configure.ac
> > -index acdcb1e..2c0a721 100644
> > ---- a/configure.ac
> > -+++ b/configure.ac
> > -@@ -59,7 +59,7 @@ elif test x"$GCC" = x"yes"; then
> > - AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
> > -
> > - dnl arch-specific flags
> > -- arm_conditional=false
> > -+ build_arm_opt=false
> > - case "$host" in
> > - i?86-* | k?-* | x86_64-* | amd64-*)
> > - AC_DEFINE([ARCH_X86],,[x86 architecture])
> > -@@ -102,8 +102,12 @@ elif test x"$GCC" = x"yes"; then
> > - alpha*)
> > - AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);;
> > - arm*)
> > -- arm_conditional=:
> > -- AC_DEFINE([ARCH_ARM],,[ARM architecture]);;
> > -+ AC_LANG(C)
> > -+ AC_COMPILE_IFELSE(
> > -+ [AC_LANG_SOURCE([[
> > -+ void foo(void) { __asm__ volatile("pld [r1]"); }]])],
> > -+ build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]),
> > -+ build_arm_opt=false);;
> > - esac
> > - elif test x"$CC" = x"tendracc"; then
> > - dnl TenDRA portability checking compiler
> > -@@ -123,7 +127,7 @@ else
> > - esac
> > - fi
> > -
> > --AM_CONDITIONAL(ARCH_ARM, ${arm_conditional})
> > -+AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue)
> > -
> > - dnl Checks for libtool - this must be done after we set cflags
> > - AC_LIBTOOL_WIN32_DLL
> > ---
> > -2.13.2
> > -
> > diff --git a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
> > deleted file mode 100644
> > index 83016923685..00000000000
> > --- a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
> > +++ /dev/null
> > @@ -1,63 +0,0 @@
> > -From f9d9dc92d75f8910e3cd5fdcbea72e505cdf3493 Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Wed, 5 Jul 2017 19:03:36 -0700
> > -Subject: [PATCH 2/2] Set visibility of global symbols used in ARM specific
> > - assembly file to internal
> > -
> > -Taken from
> > -http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/60_arm-private-symbols.patch/
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - libmpeg2/motion_comp_arm_s.S | 12 ++++++++----
> > - 1 file changed, 8 insertions(+), 4 deletions(-)
> > -
> > -diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
> > -index f6c3d7d..c921f7c 100644
> > ---- a/libmpeg2/motion_comp_arm_s.S
> > -+++ b/libmpeg2/motion_comp_arm_s.S
> > -@@ -23,7 +23,8 @@
> > -
> > - @ ----------------------------------------------------------------
> > - .align
> > -- .global MC_put_o_16_arm
> > -+ .global MC_put_o_16_arm
> > -+ .internal MC_put_o_16_arm
> > - MC_put_o_16_arm:
> > - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> > - pld [r1]
> > -@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt:
> > -
> > - @ ----------------------------------------------------------------
> > - .align
> > -- .global MC_put_o_8_arm
> > -+ .global MC_put_o_8_arm
> > -+ .internal MC_put_o_8_arm
> > - MC_put_o_8_arm:
> > - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> > - pld [r1]
> > -@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt:
> > - .endm
> > -
> > - .align
> > -- .global MC_put_x_16_arm
> > -+ .global MC_put_x_16_arm
> > -+ .internal MC_put_x_16_arm
> > - MC_put_x_16_arm:
> > - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> > - pld [r1]
> > -@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt:
> > -
> > - @ ----------------------------------------------------------------
> > - .align
> > -- .global MC_put_x_8_arm
> > -+ .global MC_put_x_8_arm
> > -+ .internal MC_put_x_8_arm
> > - MC_put_x_8_arm:
> > - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
> > - pld [r1]
> > ---
> > -2.13.2
> > -
> > diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
> > deleted file mode 100644
> > index 00b667d3365..00000000000
> > --- a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch
> > +++ /dev/null
> > @@ -1,70 +0,0 @@
> > -Rewrite the public symbol check to verify the shared libraries, to check for
> > -more things, and to avoid duplication; fixes make check on ARM
> > -
> > -Taken From
> > -https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - test/globals | 42 +++++++++++++++++++++++++++---------------
> > - 1 file changed, 27 insertions(+), 15 deletions(-)
> > -
> > ---- mpeg2dec.orig/test/globals
> > -+++ mpeg2dec/test/globals
> > -@@ -1,4 +1,8 @@
> > - #!/bin/sh
> > -+# TODO
> > -+# - fix checking of .a libs; problem is that "nm -g --defined-only" lists
> > -+# internal symbols; this can be solved by using objdump, but it's probably
> > -+# good enough to just run the tests on the shared lib
> > -
> > - if test x"$srcdir" != x""; then
> > - builddir="." # running from make check, but it does not define that
> > -@@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd`
> > -
> > - error=0
> > -
> > --bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\
> > -- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'`
> > --
> > --if test x"$bad_globals" != x""; then
> > -- echo BAD GLOBAL SYMBOLS:
> > -- for s in $bad_globals; do echo $s; done
> > -+# check_bad_public_symbols <symbol prefix> <lib file> [<lib file>...]
> > -+#
> > -+# checks public symbols in shared libs:
> > -+# - allow prefix_anything
> > -+# - reject _prefixanything
> > -+# - allow _anything
> > -+# - reject anything else
> > -+#
> > -+# NB: skips missing files
> > -+check_bad_public_symbols() {
> > -+ symbols_prefix="$1"
> > -+ shift
> > -+ lib_files=`ls "$@" 2>/dev/null`
> > -+ [ -z "$lib_files" ] && return
> > -+ bad_globals=`nm -g --defined-only $lib_files |
> > -+ awk '{if ($3) print $3}' |
> > -+ sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"`
> > -+ [ -z "$bad_globals" ] && return
> > - error=1
> > --fi
> > --
> > --bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\
> > -- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'`
> > -+ echo BAD GLOBAL SYMBOLS in $lib_files:
> > -+ echo "$bad_globals"
> > -+}
> > -
> > --if test x"$bad_globals" != x""; then
> > -- echo BAD GLOBAL SYMBOLS:
> > -- for s in $bad_globals; do echo $s; done
> > -- error=1
> > --fi
> > -+check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so
> > -+check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so
> > -
> > - exit $error
> > diff --git a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
> > deleted file mode 100644
> > index 5113ad44fe4..00000000000
> > --- a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
> > +++ /dev/null
> > @@ -1,43 +0,0 @@
> > -Add new method to judge whether <altivec.h> is needed
> > -
> > -The original logic will use "typedef vector int t;" to judge
> > -whether <altivec.h> is needed. altivec.h contains the following
> > -statement:
> > -
> > - #if !defined(__APPLE_ALTIVEC__)
> > - #define vector __vector
> > - #define pixel __pixel
> > - #define bool
> > - #endif
> > -
> > -In gcc-4.3.3, __APPLE_ALTIVEC__ is not defined by compiler, neither
> > -as vector, pixel, and bool. In order to make "typedef vector int t;"
> > -pass the compilation, we need to include altivec.h.
> > -
> > -However in gcc-4.5.0, __APPLE_ALTIVEC__ is defined by compiler,
> > -so as vector, pixel, and bool. We could not judge whether
> > -altivec.h is needed by "typedef vector int t;".
> > -Here we include another statement "int tmp = __CR6_EQ;", in
> > -which __CR6_EQ is defined in altivec.h.
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> > -
> > -diff -ruN a/configure.in b/configure.in
> > ---- a/configure.ac 2010-09-14 20:55:42.399687663 +0800
> > -+++ b/configure.ac 2010-09-14 20:56:43.403204648 +0800
> > -@@ -79,11 +79,11 @@
> > - CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
> > - AC_MSG_CHECKING([if <altivec.h> is needed])
> > - AC_TRY_COMPILE([],
> > -- [typedef vector int t;
> > -+ [typedef vector int t; int tmp = __CR6_EQ;
> > - vec_ld(0, (unsigned char *)0);],
> > - [have_altivec=yes; AC_MSG_RESULT(no)],
> > - [AC_TRY_COMPILE([#include <altivec.h>],
> > -- [typedef vector int t; vec_ld(0, (unsigned char *)0);],
> > -+ [typedef vector int t; int tmp = __CR6_EQ; vec_ld(0, (unsigned char *)0);],
> > - [AC_DEFINE([HAVE_ALTIVEC_H],,
> > - [Define to 1 if you have the <altivec.h> header.])
> > - have_altivec=yes; AC_MSG_RESULT(yes)],
> > diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
> > deleted file mode 100644
> > index fd8b561657d..00000000000
> > --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
> > +++ /dev/null
> > @@ -1,51 +0,0 @@
> > -SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams"
> > -DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \
> > -mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \
> > -for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \
> > -is to have a simple test bed for libmpeg2."
> > -HOMEPAGE = "https://libmpeg2.sourceforge.io/"
> > -SECTION = "libs"
> > -LICENSE = "GPL-2.0-or-later"
> > -LICENSE_FLAGS = "commercial"
> > -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > - file://include/mpeg2.h;beginline=1;endline=22;md5=7766f4fcb58f0f8413c49a746f2ab89b"
> > -
> > -SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \
> > - file://altivec_h_needed.patch \
> > - file://0001-check-for-available-arm-optimizations.patch \
> > - file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \
> > - file://61_global-symbol-test.patch \
> > - file://0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch \
> > - "
> > -
> > -S = "${WORKDIR}/libmpeg2-${PV}"
> > -
> > -SRC_URI[md5sum] = "0f92c7454e58379b4a5a378485bbd8ef"
> > -SRC_URI[sha256sum] = "dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
> > -
> > -UPSTREAM_CHECK_URI = "http://libmpeg2.sourceforge.net/downloads.html"
> > -
> > -inherit autotools pkgconfig
> > -
> > -EXTRA_OECONF = "--enable-shared --disable-sdl"
> > -
> > -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
> > -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv"
> > -
> > -PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev"
> > -
> > -FILES:${PN} = "${bindir}/*"
> > -FILES:libmpeg2 = "${libdir}/libmpeg2.so.*"
> > -FILES:libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
> > -FILES:libmpeg2-dev = "${libdir}/libmpeg2.so \
> > - ${libdir}/libmpeg2.la \
> > - ${libdir}/libmpeg2arch.la \
> > - ${libdir}/pkgconfig/libmpeg2.pc \
> > - ${includedir}/mpeg2dec/mpeg2.h"
> > -FILES:libmpeg2-staticdev = "${libdir}/libmpeg2.a"
> > -FILES:libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
> > - ${libdir}/libmpeg2convert.la \
> > - ${libdir}/libmpeg2convertarch.la \
> > - ${libdir}/pkgconfig/libmpeg2convert.pc \
> > - ${includedir}/mpeg2dec/mpeg2convert.h"
> > -FILES:libmpeg2convert-staticdev = "${libdir}/libmpeg2convert.a"
> > --
> > 2.39.2
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#198540): https://lists.openembedded.org/g/openembedded-core/message/198540
> > Mute This Topic: https://lists.openembedded.org/mt/105616504/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 13/19] apr: drop 0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (10 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 12/19] mpeg2dec: remove the recipe Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 14/19] libtraceevent: submit meson.patch upstream Alexander Kanavin
` (5 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
At some point this became unnecessary, as tested by building apr
with DISTRO_FEATURES:append = " ld-is-gold"
The logs do confirm that (previously) problematic binary links without errors.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...libapr-against-phtread-to-make-gold-.patch | 50 -------------------
meta/recipes-support/apr/apr_1.7.4.bb | 1 -
2 files changed, 51 deletions(-)
delete mode 100644 meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
deleted file mode 100644
index 8760b0140ca..00000000000
--- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 3 Mar 2017 22:24:17 +0100
-Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy
- on test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_create'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_join'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_once'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete'
-| ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific'
-| collect2: error: ld returned 1 exit status
-| Makefile:114: recipe for target 'globalmutexchild' failed
-| make[1]: *** [globalmutexchild] Error 1
-| make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test'
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.in b/configure.in
-index a227e72..cbc0f90 100644
---- a/configure.in
-+++ b/configure.in
-@@ -784,6 +784,7 @@ else
- APR_PTHREADS_CHECK_RESTORE ] )
- fi
- if test "$pthreadh" = "1"; then
-+ APR_ADDTO(LIBS,[-lpthread])
- APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
- APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
- APR_CHECK_PTHREAD_RECURSIVE_MUTEX
---
-1.8.3.1
-
diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.4.bb
index d322629b66f..4df741c7668 100644
--- a/meta/recipes-support/apr/apr_1.7.4.bb
+++ b/meta/recipes-support/apr/apr_1.7.4.bb
@@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \
file://0004-Fix-packet-discards-HTTP-redirect.patch \
file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
- file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
file://libtoolize_check.patch \
file://0001-Add-option-to-disable-timed-dependant-tests.patch \
file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 14/19] libtraceevent: submit meson.patch upstream
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (11 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 13/19] apr: drop 0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-23 11:02 ` [OE-core] " Ross Burton
2024-04-19 12:19 ` [PATCH 15/19] gstreamer1.0-plugins-good: remove 0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch Alexander Kanavin
` (4 subsequent siblings)
17 siblings, 1 reply; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
index 0c21b2347a1..fb831719cb6 100644
--- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
+++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fixes for the Meson build of libtraceevent:
- Make the plugin directory the same as the Makefiles
- Install the plugins as modules not static and versioned shared libraries
-Upstream-Status: Pending
+Upstream-Status: Submitted [via email to linux-trace-devel@vger.kernel.org,rostedt@goodmis.org]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meson.build | 2 +-
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 15/19] gstreamer1.0-plugins-good: remove 0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (12 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 14/19] libtraceevent: submit meson.patch upstream Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 16/19] xinput-calibrator: mark upstream as inactive in a patch Alexander Kanavin
` (3 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
At some point this patch became unnecessary as the respective qt5 plugin is building without issues
without it (checked on qemuarm/qemuarm64).
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 54 -------------------
.../gstreamer1.0-plugins-good_1.22.11.bb | 1 -
2 files changed, 55 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
deleted file mode 100644
index 9703a3a8894..00000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 31 Mar 2020 21:23:28 -0700
-Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h
-
-gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to
-prefer qt headers definitions for GLsync
-
-This helps in fixing build errors like below
-
-/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: error: conflicting declaration 'typedef struct __GLsync* GLsync'
- 24 | typedef struct __GLsync *GLsync;
- | ^~~~~~
-In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:84,
- from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30:
-/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: note: previous declaration as 'typedef void* GLsync
-'
- 40 | typedef gpointer GLsync;
- | ^~~~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- ext/qt/gstqsgtexture.cc | 2 +-
- ext/qt/qtwindow.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
-index 663696b..36b17d4 100644
---- a/ext/qt/gstqsgtexture.cc
-+++ b/ext/qt/gstqsgtexture.cc
-@@ -27,7 +27,7 @@
-
- #include <gst/video/video.h>
- #include <gst/gl/gl.h>
--#include <gst/gl/gstglfuncs.h>
-+#include <ext/qt/gstqtgl.h>
- #include "gstqsgtexture.h"
-
- #define GST_CAT_DEFAULT gst_qsg_texture_debug
-diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
-index 2872cb5..5a36be9 100644
---- a/ext/qt/qtwindow.cc
-+++ b/ext/qt/qtwindow.cc
-@@ -25,7 +25,7 @@
- #include <stdio.h>
-
- #include <gst/video/video.h>
--#include <gst/gl/gstglfuncs.h>
-+#include <ext/qt/gstqtgl.h>
- #include "qtwindow.h"
- #include "gstqsgtexture.h"
- #include "gstqtglutility.h"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
index edd8609b7cd..57924d5c9fc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
@@ -5,7 +5,6 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/"
BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues"
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
- file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch"
SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2"
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 16/19] xinput-calibrator: mark upstream as inactive in a patch
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (13 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 15/19] gstreamer1.0-plugins-good: remove 0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 17/19] bash: mark build-tests.patch as Inappropriate Alexander Kanavin
` (2 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
index 86982924a81..de0862599d7 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [last commits over a decade ago]
From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 17/19] bash: mark build-tests.patch as Inappropriate
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (14 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 16/19] xinput-calibrator: mark upstream as inactive in a patch Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 18/19] connman: make 0002-resolve-musl-does-not-implement-res_ninit.patch libc-agnostic Alexander Kanavin
2024-04-19 12:19 ` [PATCH 19/19] connman: submit 0002-resolve-musl-does-not-implement-res_ninit.patch upstream Alexander Kanavin
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-extended/bash/bash/build-tests.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch
index ea38bace9b7..c1b9b8261f0 100644
--- a/meta/recipes-extended/bash/bash/build-tests.patch
+++ b/meta/recipes-extended/bash/bash/build-tests.patch
@@ -4,7 +4,7 @@ Date: Wed, 19 Dec 2012 17:18:31 +0100
Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking
dependencies.
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [ptest specific]
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Rebase to 5.0
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 18/19] connman: make 0002-resolve-musl-does-not-implement-res_ninit.patch libc-agnostic
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (15 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 17/19] bash: mark build-tests.patch as Inappropriate Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 19/19] connman: submit 0002-resolve-musl-does-not-implement-res_ninit.patch upstream Alexander Kanavin
17 siblings, 0 replies; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
The patch is reworked to take musl-specific path only if the functions are
undefined by libc (which can be checked via __RES, as explained in
https://www.openwall.com/lists/musl/2020/10/23/16 ).
This should make it more suitable for upstream submission.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...ve-musl-does-not-implement-res_ninit.patch | 105 ++++++++++--------
.../connman/connman_1.42.bb | 2 +-
2 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index aefdd3aa065..71efd9035e9 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,75 +1,88 @@
-From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001
+From 60783f0d885c9a0db8b6f1d528786321e53f1512 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 6 Apr 2015 23:02:21 -0700
-Subject: [PATCH] resolve: musl does not implement res_ninit
+Subject: [PATCH] gweb/gresolv.c: make use of res_ninit optional and subject to
+ __RES
-ported from
+Not all libc implementation have those functions, and the way to determine
+if they do is to check __RES which is explained in resolv.h thusly:
+
+/*
+ * Revision information. This is the release date in YYYYMMDD format.
+ * It can change every day so the right thing to do with it is use it
+ * in preprocessor commands such as "#if (__RES > 19931104)". Do not
+ * compare for equality; rather, use it to determine whether your resolver
+ * is new enough to contain a certain feature.
+ */
+
+Indeed, it needs to be at least 19991006.
+
+The portion of the patch that implements a fallback is ported from
+Alpine Linux:
http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
- gweb/gresolv.c | 34 +++++++++++++---------------------
- 1 file changed, 13 insertions(+), 21 deletions(-)
+ gweb/gresolv.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
diff --git a/gweb/gresolv.c b/gweb/gresolv.c
-index 954e7cf..2a9bc51 100644
+index 8101d71..9f1477c 100644
--- a/gweb/gresolv.c
+++ b/gweb/gresolv.c
-@@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index)
+@@ -879,7 +879,9 @@ GResolv *g_resolv_new(int index)
resolv->index = index;
resolv->nameserver_list = NULL;
-- res_ninit(&resolv->res);
--
++#if (__RES >= 19991006)
+ res_ninit(&resolv->res);
++#endif
+
return resolv;
}
-
-@@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv)
+@@ -920,7 +922,9 @@ void g_resolv_unref(GResolv *resolv)
flush_nameservers(resolv);
-- res_nclose(&resolv->res);
--
++#if (__RES >= 19991006)
+ res_nclose(&resolv->res);
++#endif
+
g_free(resolv);
}
-
-@@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
+@@ -1024,6 +1028,7 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
debug(resolv, "hostname %s", hostname);
if (!resolv->nameserver_list) {
-- int i;
--
-- for (i = 0; i < resolv->res.nscount; i++) {
-- char buf[100];
-- int family = resolv->res.nsaddr_list[i].sin_family;
-- void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr;
--
-- if (family != AF_INET &&
-- resolv->res._u._ext.nsaddrs[i]) {
-- family = AF_INET6;
-- sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr;
-+ FILE *f = fopen("/etc/resolv.conf", "r");
-+ if (f) {
-+ char line[256], *s;
-+ int i;
-+ while (fgets(line, sizeof(line), f)) {
-+ if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
-+ continue;
-+ for (s = &line[11]; isspace(s[0]); s++);
-+ for (i = 0; s[i] && !isspace(s[i]); i++);
-+ s[i] = 0;
-+ g_resolv_add_nameserver(resolv, s, 53, 0);
- }
--
-- if (family != AF_INET && family != AF_INET6)
-- continue;
--
-- if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
-- g_resolv_add_nameserver(resolv, buf, 53, 0);
-+ fclose(f);
++#if (__RES >= 19991006)
+ int i;
+
+ for (i = 0; i < resolv->res.nscount; i++) {
+@@ -1043,6 +1048,22 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
+ if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
+ g_resolv_add_nameserver(resolv, buf, 53, 0);
}
++#else
++ FILE *f = fopen("/etc/resolv.conf", "r");
++ if (f) {
++ char line[256], *s;
++ int i;
++ while (fgets(line, sizeof(line), f)) {
++ if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
++ continue;
++ for (s = &line[11]; isspace(s[0]); s++);
++ for (i = 0; s[i] && !isspace(s[i]); i++);
++ s[i] = 0;
++ g_resolv_add_nameserver(resolv, s, 53, 0);
++ }
++ fclose(f);
++ }
++#endif
if (!resolv->nameserver_list)
+ g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0);
+--
+2.39.2
+
diff --git a/meta/recipes-connectivity/connman/connman_1.42.bb b/meta/recipes-connectivity/connman/connman_1.42.bb
index 91ab9895ac8..5c60b9cb83a 100644
--- a/meta/recipes-connectivity/connman/connman_1.42.bb
+++ b/meta/recipes-connectivity/connman/connman_1.42.bb
@@ -7,9 +7,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://no-version-scripts.patch \
file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \
file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \
+ file://0002-resolve-musl-does-not-implement-res_ninit.patch \
"
-SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa"
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 19/19] connman: submit 0002-resolve-musl-does-not-implement-res_ninit.patch upstream
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
` (16 preceding siblings ...)
2024-04-19 12:19 ` [PATCH 18/19] connman: make 0002-resolve-musl-does-not-implement-res_ninit.patch libc-agnostic Alexander Kanavin
@ 2024-04-19 12:19 ` Alexander Kanavin
2024-04-23 11:03 ` [OE-core] " Ross Burton
17 siblings, 1 reply; 28+ messages in thread
From: Alexander Kanavin @ 2024-04-19 12:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../0002-resolve-musl-does-not-implement-res_ninit.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 71efd9035e9..9e2cc34995a 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -21,7 +21,7 @@ The portion of the patch that implements a fallback is ported from
Alpine Linux:
http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
-Upstream-Status: Pending
+Upstream-Status: Submitted [to connman@lists.linux.dev,marcel@holtmann.org]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread