Skip to contentSkip to conversation

mesa: remove obsolete 0001-meson.build-check-for-all-linux-host_os-combinations.patch

PATCH In review Alexander Kanavin 2 participants 14 messages May 16, 2024 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/13 mesa: remove obsolete 0001-meson.build-check-for-all-linux-host_os-combinations.patch

From: Alexander Kanavin <[email protected]>

The patch was submitted upstream
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28895
but further investigation revealed that the problem had been solved properly in meson.class:
https://git.yoctoproject.org/poky/commit/?id=6bf674374d568b2419a4c6eef00d893028878881

---
 ...k-for-all-linux-host_os-combinations.patch | 42 -------------------
 meta/recipes-graphics/mesa/mesa.inc           |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted +0 -42
deleted file mode 100644
index 7be7d81eeb7..00000000000
@@ -1,42 +0,0 @@
-From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <[email protected]>
-Date: Thu, 14 Nov 2019 13:04:49 -0800
-Subject: [PATCH] meson.build: check for all linux host_os combinations
-
-Make sure that we are also looking for our host_os combinations like
-linux-musl etc. when assuming support for DRM/KMS.
-
-Also delete a duplicate line.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <[email protected]>
-Signed-off-by: Fabio Berton <[email protected]>
-Signed-off-by: Otavio Salvador <[email protected]>
-Signed-off-by: Alistair Francis <[email protected]>
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 133fd9a..817861e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
- # Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = with_shared_glapi and with_any_opengl
- 
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
- 
- gallium_drivers = get_option('gallium-drivers')
- if gallium_drivers.contains('auto')
-@@ -997,7 +997,7 @@ if cc.has_function('fmemopen')
- endif
- 
- # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system())
-+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
-   pre_args += '-D_GNU_SOURCE'
- elif host_machine.system() == 'sunos'
-   pre_args += '-D__EXTENSIONS__'
meta/recipes-graphics/mesa/mesa.inc +0 -1
index 77e9c80fcb6..a8f3397e04a 100644
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10
 PE = "2"
 
 SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-drisw-fix-build-without-dri3.patch \
            file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/13 glib-2.0: remove obsolete 0001-Set-host_machine-correctly-when-building-with-mingw3.patch

From: Alexander Kanavin <[email protected]>

This as well has been solved via
https://git.yoctoproject.org/poky/commit/?id=f6a35934540e910794b8729ecc278189a39b710f

---
 ...-correctly-when-building-with-mingw3.patch | 80 -------------------
 meta/recipes-core/glib-2.0/glib.inc           |  1 -
 2 files changed, 81 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch deleted +0 -80
deleted file mode 100644
index a2f9dd9672f..00000000000
@@ -1,80 +0,0 @@
-From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 13 Feb 2019 15:32:05 +0100
-Subject: [PATCH] Set host_machine correctly when building with mingw32
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- gio/tests/meson.build  | 8 ++++----
- glib/tests/meson.build | 2 +-
- meson.build            | 3 +++
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 232ecca..563298b 100644
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -29,7 +29,7 @@ endif
- 
- test_cpp_args = test_c_args
- 
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
-   common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
- endif
- 
-@@ -244,7 +244,7 @@ if have_dbus_daemon
- endif
- 
- #  Test programs buildable on UNIX only
--if host_machine.system() != 'windows'
-+if host_system != 'windows'
-   gio_tests += {
-     'file' : {
-       # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
-@@ -593,7 +593,7 @@ if host_machine.system() != 'windows'
- endif # unix
- 
- #  Test programs buildable on Windows only
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
-   gio_tests += {'win32-streams' : {}}
- endif
- 
-@@ -663,7 +663,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
-   }
- endif
- 
--if host_machine.system() != 'windows'
-+if host_system != 'windows'
-   test_extra_programs += {
-     'gdbus-example-unix-fd-client' : {
-       'install' : false,
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index f6efc59..83eb5a5 100644
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -226,7 +226,7 @@ if glib_conf.has('HAVE_EVENTFD')
-   }
- endif
- 
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
-   if winsock2.found()
-     glib_tests += {
-       'gpoll' : {
-diff --git a/meson.build b/meson.build
-index 7534542..2560686 100644
---- a/meson.build
-+++ b/meson.build
-@@ -54,6 +54,9 @@ else
- endif
- 
- host_system = host_machine.system()
-+if host_system == 'mingw32'
-+  host_system = 'windows'
-+endif
- 
- if host_system == 'darwin'
-   ios_test_code = '''#include <TargetConditionals.h>
meta/recipes-core/glib-2.0/glib.inc +0 -1
index 1a97a0d02a6..2de50dd9af3 100644
@@ -222,7 +222,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
            file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
-           file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
            file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
            file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
            file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
Signature · 1 line
2.39.2
#2 lore raw

PATCH 3/13 kexec-tools: submit 0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch upstream

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch +1 -1
index e874a8b4f16..489b1092850 100644
@@ -8,7 +8,7 @@ is used by MMU, the "SECTION_SIZE" is defined with
 (1 << 21), but 'add_buffer_phys_virt()' hardcode this
 to (1 << 20).
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [via email to [email protected],http://lists.infradead.org/pipermail/kexec/2024-April/029903.html]
 
 Suggested-By:[email protected]
 Signed-off-by: Haiqing Bai <[email protected]>
Signature · 1 line
2.39.2
#3 lore raw

PATCH 4/13 vorbis: mark patch as Inactive-Upstream

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../libvorbis/libvorbis/0001-configure-Check-for-clang.patch    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch +1 -1
index b06029b98b7..d4fac605b66 100644
@@ -5,9 +5,9 @@ Subject: [PATCH] configure: Check for clang
 
 Disable gcc specific options if using clang
 
+Upstream-Status: Inactive-Upstream [https://gitlab.xiph.org/xiph/vorbis,https://github.com/xiph/vorbis]
 Signed-off-by: Khem Raj <[email protected]>
 ---
-Upstream-Status: Pending
 
  configure.ac | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
Signature · 1 line
2.39.2
#4 lore raw

PATCH 5/13 grub: mark grub-module-explicitly-keeps-symbole-.module_license.patch as a workaround

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../grub-module-explicitly-keeps-symbole-.module_license.patch  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch +1 -1
index d9012d1dd63..7c8770ce8bd 100644
@@ -37,7 +37,7 @@ SYMBOL TABLE:
 0000000000000000 l    d  .modname       0000000000000000 .modname
 --------------
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [workaround that needs investigation into @TARGET_STRIP@ behaviour in oe-core vs toolchain used by upstream]
 
 Signed-off-by: Hongxu Jia <[email protected]>
 
Signature · 1 line
2.39.2
#5 lore raw

PATCH 6/13 grub: remove unneeded 0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Verified on qemux86 and qemux86-64 with grub and grub-efi.

---
 ...ath-sse-as-well-when-SSE-is-disabled.patch | 44 -------------------
 meta/recipes-bsp/grub/grub2.inc               |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch deleted +0 -44
deleted file mode 100644
index 05a4697a734..00000000000
@@ -1,44 +0,0 @@
-From 006799e9c4babe8a8340a24501b253e759614a2d Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 13 Jan 2016 19:17:31 +0000
-Subject: [PATCH] Disable -mfpmath=sse as well when SSE is disabled
-
-Fixes
-
-configure:20574: i586-poky-linux-gcc  -m32    -march=core2 -msse3
--mtune=generic -mfpmath=sse
---sysroot=/usr/local/dev/yocto/grubtest2/build/tmp/sysroots/emenlow -o
-conftest -O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wshadow
--Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g
--falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse
--mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -m32 -fno-stack-protector
--mno-stack-arg-probe -Werror -nostdlib -Wl,--defsym,___main=0x8100
--Wall -W -I$(top_srcdir)/include -I$(top_builddir)/include
--DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed conftest.c  >&5
-conftest.c:1:0: error: SSE instruction set disabled, using 387
-arithmetics [-Werror]
-cc1: all warnings being treated as errors
-
-Signed-off-by: Nitin A Kamble <[email protected]>
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cd667a2..8263876 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -846,7 +846,7 @@ fi
- if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$platform" != xemu; then
-   # Some toolchains enable these features by default, but they need
-   # registers that aren't set up properly in GRUB.
--  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
-+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -mfpmath=387"
- fi
- 
- if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
meta/recipes-bsp/grub/grub2.inc +0 -1
index bb9aacb478a..e2a2a842773 100644
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 CVE_PRODUCT = "grub2"
 
 SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
-           file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \
            file://autogen.sh-exclude-pc.patch \
            file://grub-module-explicitly-keeps-symbole-.module_license.patch \
            file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \
Signature · 1 line
2.39.2
#6 lore raw

PATCH 7/13 gdb: remove unneeded 0006-resolve-restrict-keyword-conflict.patch

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Somewhere on the way the issue solved itself.

---
 meta/recipes-devtools/gdb/gdb.inc             |  1 -
 ...06-resolve-restrict-keyword-conflict.patch | 45 -------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch
meta/recipes-devtools/gdb/gdb.inc +0 -1
index 81ac441462a..c2fbcb2ac6b 100644
@@ -10,7 +10,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
            file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \
            file://0004-use-asm-sgidefs.h.patch \
            file://0005-Change-order-of-CFLAGS.patch \
-           file://0006-resolve-restrict-keyword-conflict.patch \
            file://0007-Fix-invalid-sigprocmask-call.patch \
            file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
            "
meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch deleted +0 -45

45 lines not on this page · raw message

Signature · 1 line
2.39.2
#7 lore raw

PATCH 8/13 perl: submit the rest of determinism.patch upstream

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 meta/recipes-devtools/perl/files/determinism.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/perl/files/determinism.patch +3 -3
index aa85ccef100..f2b11115524 100644
@@ -8,9 +8,9 @@ b) Sort the order of the module lists from configure_mods.sh since otherwise
    the result isn't the same leading to makefile differences.
    Reported upstream: https://github.com/arsv/perl-cross/issues/88
 
-c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst 
+c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst
    there for good measure)
-   This needs to go to upstream perl (not done)
+   Submitted to upstream perl: https://github.com/dankogai/p5-encode/pull/179
 
 d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash
    and "" with dash
@@ -18,7 +18,7 @@ d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with
 
 RP 2020/2/7
 
-Upstream-Status: Pending [75% submitted]
+Upstream-Status: Submitted [see links above]
 Signed-off-by: Richard Purdie <[email protected]
 
 Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
Signature · 1 line
2.39.2
#8 lore raw

PATCH 9/13 iptables: submit 0001-configure-Add-option-to-enable-disable-libnfnetlink.patch upstream

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...ption-to-enable-disable-libnfnetlink.patch | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)
meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +26 -18
index 8824bf2af7e..0fe22615119 100644
@@ -1,22 +1,24 @@
-From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001
+From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001
 From: "Maxin B. John" <[email protected]>
-Date: Tue, 21 Feb 2017 11:16:31 +0200
+Date: Thu, 25 Apr 2024 10:51:02 +0200
 Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
 
-This changes the configure behaviour from autodetecting
-for libnfnetlink to having an option to disable it explicitly
-
-Upstream-Status: Pending
+Default behavior (autodetecting) does not change, but specifying
+either option would explicitly disable or enable libnfnetlink support,
+and if the library is not found in the latter case, ./configure will error
+out.
 
+Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30]
 Signed-off-by: Khem Raj <[email protected]>
 Signed-off-by: Maxin B. John <[email protected]>
-
+Signed-off-by: Alexander Kanavin <[email protected]>
+Signed-off-by: Phil Sutter <[email protected]>
 ---
- configure.ac | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ configure.ac | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d99fa3b..d607772 100644
+index d99fa3b9..2293702b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
@@ -25,21 +27,27 @@ index d99fa3b..d607772 100644
  	[enable_nftables="$enableval"], [enable_nftables="yes"])
 +AC_ARG_ENABLE([libnfnetlink],
 +    AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
-+    [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
++    [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"])
  AC_ARG_ENABLE([connlabel],
  	AS_HELP_STRING([--disable-connlabel],
  	[Do not build libnetfilter_conntrack]),
-@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
+@@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
  AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
  AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
  
 -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
 -	[nfnetlink=1], [nfnetlink=0])
--AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
-+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
-+    PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
-+    ])
-+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
++# If specified explicitly on the command line, error out when library was not found
++# Otherwise, disable and continue
++AS_IF([test "x$enable_libnfnetlink" = "xyes"],
++	[PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
++			   [nfnetlink=1])],
++      [test "x$enable_libnfnetlink" = "xauto"],
++	[PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
++			   [nfnetlink=1], [nfnetlink=0])])
+ AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
  
  if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
- 	PKG_CHECK_MODULES([libpcap], [libpcap], [], [
+-- 
+2.39.2
+
Signature · 1 line
2.39.2
#9 lore raw

PATCH 10/13 iptables: remove unneeded 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Somewhere on the way it ceased to be necessary.

---
 ...ed.h-add-missing-sys.types.h-include.patch | 31 -------------------
 .../iptables/iptables_1.8.10.bb               |  1 -
 2 files changed, 32 deletions(-)
 delete mode 100644 meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch deleted +0 -31
deleted file mode 100644
index a190c7e8ae2..00000000000
@@ -1,31 +0,0 @@
-From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 17 May 2022 10:56:59 +0200
-Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
-
-This resolves the build error under musl:
-
-| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
-|    83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
-|       |                                                        ^~~~~~~~~
-|       |                                                        uint16_t
-
-Upstream-Status: Submitted [via email to [email protected]]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- iptables/xshared.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iptables/xshared.h b/iptables/xshared.h
-index a200e0d..f543dbf 100644
---- a/iptables/xshared.h
-+++ b/iptables/xshared.h
-@@ -6,6 +6,7 @@
- #include <stdint.h>
- #include <netinet/in.h>
- #include <net/if.h>
-+#include <sys/types.h>
- #include <linux/netfilter_arp/arp_tables.h>
- #include <linux/netfilter_ipv4/ip_tables.h>
- #include <linux/netfilter_ipv6/ip6_tables.h>
meta/recipes-extended/iptables/iptables_1.8.10.bb +0 -1
index 5a878977425..cbd727b75df 100644
@@ -14,7 +14,6 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
            file://ip6tables.service \
            file://ip6tables.rules \
            file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
-           file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
            file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
            "
 SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
Signature · 1 line
2.39.2
#10 lore raw

Re: [OE-core] [PATCH 10/13] iptables: remove unneeded 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch

Quoted 4 lines · Alexander Kanavin via lists.openembedded.org

From: Alexander Kanavin <[email protected]>

Somewhere on the way it ceased to be necessary.

Thats due it being applied upstream [1] so mentioning that is perhaps going to qualify this a bit more.

[1] https://git.netfilter.org/iptables/commit/iptables/xshared.h?id=f319389525b066b7dc6d389c88f16a0df3b8f189

Quoted 69 lines
---
 ...ed.h-add-missing-sys.types.h-include.patch | 31 -------------------
 .../iptables/iptables_1.8.10.bb               |  1 -
 2 files changed, 32 deletions(-)
 delete mode 100644 meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch deleted +0 -31
deleted file mode 100644
index a190c7e8ae2..00000000000
@@ -1,31 +0,0 @@
-From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 17 May 2022 10:56:59 +0200
-Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
-
-This resolves the build error under musl:
-
-| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
-|    83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
-|       |                                                        ^~~~~~~~~
-|       |                                                        uint16_t
-
-Upstream-Status: Submitted [via email to [email protected]]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- iptables/xshared.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iptables/xshared.h b/iptables/xshared.h
-index a200e0d..f543dbf 100644
---- a/iptables/xshared.h
-+++ b/iptables/xshared.h
-@@ -6,6 +6,7 @@
- #include <stdint.h>
- #include <netinet/in.h>
- #include <net/if.h>
-+#include <sys/types.h>
- #include <linux/netfilter_arp/arp_tables.h>
- #include <linux/netfilter_ipv4/ip_tables.h>
- #include <linux/netfilter_ipv6/ip6_tables.h>
meta/recipes-extended/iptables/iptables_1.8.10.bb +0 -2
index 5a878977425..cbd727b75df 100644
@@ -14,7 +14,6 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
            file://ip6tables.service \
            file://ip6tables.rules \
            file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
-           file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
            file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
            "
 SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
--

2.39.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199477): https://lists.openembedded.org/g/openembedded-core/message/199477
Mute This Topic: https://lists.openembedded.org/mt/106132526/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#11 lore raw

PATCH 11/13 iptables: correctly enable libnetfilter_conntrack support

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

This is done via configure option, and makes 0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch unnecessary, as both libnetfilter_conntrack and libnfnetlink are enabled in lockstep.

---
 ...y-check-conntrack-when-libnfnetlink-.patch | 49 -------------------
 .../iptables/iptables_1.8.10.bb               |  3 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch deleted +0 -49
deleted file mode 100644
index 5a022ebc8c3..00000000000
@@ -1,49 +0,0 @@
-From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <[email protected]>
-Date: Tue, 21 Feb 2017 11:49:07 +0200
-Subject: [PATCH] configure.ac:
- only-check-conntrack-when-libnfnetlink-enabled.patch
-
-Package libnetfilter-conntrack depends on package libnfnetlink. iptables
-checks package libnetfilter-conntrack whatever its package config
-libnfnetlink is enabled or not. When libnfnetlink is disabled but
-package libnetfilter-conntrack exists, it fails randomly with:
-
-In file included from
-.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0:
-
-.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42:
-fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory
-
-compilation terminated.
-GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed
-Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it.
-
-Upstream-Status: Pending
-
-Signed-off-by: Kai Kang <[email protected]>
-Signed-off-by: Maxin B. John <[email protected]>
-
----
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d607772..25a8e75 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -159,10 +159,12 @@ if test "$nftables" != 1; then
- fi
- 
- if test "x$enable_connlabel" = "xyes"; then
--	PKG_CHECK_MODULES([libnetfilter_conntrack],
-+    nfconntrack=0
-+    AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
-+    PKG_CHECK_MODULES([libnetfilter_conntrack],
- 		[libnetfilter_conntrack >= 1.0.6],
- 		[nfconntrack=1], [nfconntrack=0])
--
-+    ])
- 	if test "$nfconntrack" -ne 1; then
- 		blacklist_modules="$blacklist_modules connlabel";
- 		echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built";
meta/recipes-extended/iptables/iptables_1.8.10.bb +1 -2
index cbd727b75df..a9c88582cda 100644
@@ -14,7 +14,6 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
            file://ip6tables.service \
            file://ip6tables.rules \
            file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
-           file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
            "
 SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
 
@@ -33,7 +32,7 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
 # libnfnetlink recipe is in meta-networking layer
-PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack"
+PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink --enable-connlabel,--disable-libnfnetlink --disable-connlabel,libnfnetlink libnetfilter-conntrack"
 
 # libnftnl recipe is in meta-networking layer(previously known as libnftables)
 PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl"
Signature · 1 line
2.39.2
#12 lore raw

PATCH 12/13 x264: update to latest revision on official git

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

The mirror was out of date; meanwhile x264 remains in active development.

Drop unsuitable x32 patch and declare x264 incompatible with the target (by every sign it's an extinct target; if not so please work with upstream to develop a solution there).

Replace don-t-default-to-cortex-a9-with-neon.patch with a configure option passing in target compiler options so that configure can make correct decisions and we don't have to patch it.

---
 .../x264/Fix-X32-build-by-disabling-asm.patch | 51 -------------------
 ...don-t-default-to-cortex-a9-with-neon.patch | 33 ------------
 meta/recipes-multimedia/x264/x264_git.bb      |  9 ++--
 3 files changed, 5 insertions(+), 88 deletions(-)
 delete mode 100644 meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
 delete mode 100644 meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch deleted +0 -51
deleted file mode 100644
index cb771fb0bf8..00000000000
@@ -1,51 +0,0 @@
-From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001
-From: Christopher Larson <[email protected]>
-Date: Tue, 13 Dec 2016 14:22:32 -0700
-Subject: [PATCH] Fix X32 build by disabling asm
-
-This applies gentoo's x32 patch, adjusted slightly, which disables asm support
-for x32 as well as correcting -m.
-
-Debian has a different patch which does the same, and there's a superior yet
-out of date patch series on the x264 list which keeps asm support enabled, but
-doesn't successfully build at this time, and my assembly is very rusty.
-
-Upstream-Status: Pending
-Signed-off-by: Christopher Larson <[email protected]>
-
----
- configure | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 51b128d..6ea9469 100755
---- a/configure
-+++ b/configure
-@@ -754,7 +754,13 @@ case $host_cpu in
-         AS_EXT=".asm"
-         ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
-         stack_alignment=16
--        [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+        if [ $compiler = GNU ]; then
-+            if cpp_check "" "" "__ILP32__" ; then
-+                CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS"
-+            else
-+                CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+            fi
-+        fi
-         if [ "$SYS" = MACOSX ]; then
-             ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
-             if cc_check '' "-arch x86_64"; then
-@@ -773,7 +779,11 @@ case $host_cpu in
-                 RCFLAGS="--target=pe-x86-64 $RCFLAGS"
-             fi
-         else
--            ASFLAGS="$ASFLAGS -f elf64"
-+            if cpp_check "" "" "__ILP32__" ; then
-+                asm=no
-+            else
-+                ASFLAGS="$ASFLAGS -f elf64"
-+            fi
-         fi
-         ;;
-     powerpc*)
meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch deleted +0 -33
deleted file mode 100644
index 065e3b35b7c..00000000000
@@ -1,33 +0,0 @@
-From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <[email protected]>
-Date: Fri, 2 Feb 2018 15:10:08 +0200
-Subject: [PATCH] dont default to cortex-a9 with neon
-
--march flag is not in CFLAGS so this will always default to
- -mcpu=cortex-a8 -mfpu=neon.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrei Gherzan <[email protected]>
-Signed-off-by: Maxin B. John <[email protected]>
----
- configure | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure b/configure
-index 0e3ef23..955b993 100755
---- a/configure
-+++ b/configure
-@@ -911,9 +911,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
- fi
- 
- if [ $asm = auto -a $ARCH = ARM ] ; then
--    # set flags so neon is built by default
--    [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
--
-     cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
-     if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
-         define HAVE_ARMV6
--- 
-2.4.0
-
meta/recipes-multimedia/x264/x264_git.bb +5 -4
index e7d9e75e8de..fae88d24d13 100644
@@ -8,13 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "nasm-native"
 
-SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \
-           file://don-t-default-to-cortex-a9-with-neon.patch \
-           file://Fix-X32-build-by-disabling-asm.patch \
+SRC_URI = "git://code.videolan.org/videolan/x264.git;branch=stable;protocol=https \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "baee400fa9ced6f5481a728138fed6e867b0ff7f"
+SRCREV = "31e19f92f00c7003fa115047ce50978bc98c3a0d"
 
 PV = "r3039+git"
 
@@ -41,6 +39,7 @@ EXTRA_OECONF = '--prefix=${prefix} \
                 --disable-opencl \
                 --enable-pic \
                 ${X264_DISABLE_ASM} \
+                --extra-cflags="${TUNE_CCARGS}" \
                '
 
 do_configure() {
@@ -54,3 +53,5 @@ do_install() {
 }
 
 AS[unexport] = "1"
+
+COMPATIBLE_HOST:x86-x32 = "null"
Signature · 1 line
2.39.2
#13 lore raw

PATCH 13/13 elfutils: remove unneeded 0006-Fix-build-on-aarch64-musl.patch

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Verified on qemuarm64/musl (as the patch says).

---
 .../elfutils/elfutils_0.191.bb                |  1 -
 .../0006-Fix-build-on-aarch64-musl.patch      | 58 -------------------
 2 files changed, 59 deletions(-)
 delete mode 100644 meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
meta/recipes-devtools/elfutils/elfutils_0.191.bb +0 -1
index c4d872430be..76bd2b3a99c 100644
@@ -15,7 +15,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://0001-dso-link-change.patch \
            file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
            file://0003-fixheadercheck.patch \
-           file://0006-Fix-build-on-aarch64-musl.patch \
            file://0001-libasm-may-link-with-libbz2-if-found.patch \
            file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
            file://0001-skip-the-test-when-gcc-not-deployed.patch \
meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch deleted +0 -58

58 lines not on this page · raw message

Signature · 1 line
2.39.2