From patchwork Thu May 16 11:26:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43763 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5573FC25B79 for ; Thu, 16 May 2024 11:26:57 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.11209.1715858814234064250 for ; Thu, 16 May 2024 04:26:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AnBnZz2B; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a59b178b75bso242125366b.0 for ; Thu, 16 May 2024 04:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858812; x=1716463612; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=viX360TOiuxY+EA+qKBqei5Gvfx+NWkk1FRaOKjGAq0=; b=AnBnZz2B/H6VnGAa1AqUvcnNcHSU7KKTbBMRyorJTUMMiRLhQZFe1T+MzseZkGWNEe 5CLzzLM66VQnXnmnR6eb3bLMSdjxvviH3OfPg0y6EKhUTpUb3E2x9RHcjBScVHwcZe93 s1rRS2mYh5Nk7HSj8wor/iX2k/w17wFq1KADH2ihVD45v04+70I2NQWIa9jlcKCaCJYU Jhzn/0aPkf/vwU38q4y4aFdW8TSYfIb9GOHafutD8kF+r+CuIq/qltx1fWDrMCv+gXPd 3tHCwFg5Q0kKF1RwWG1FjgMzoMerhBtYUEuohDrmRhi36Cs1nnwP50Em/KyL5FR0hxn+ O+4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858812; x=1716463612; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=viX360TOiuxY+EA+qKBqei5Gvfx+NWkk1FRaOKjGAq0=; b=tqOS3iryb0sWp1Qceaa15JNxfVwsMTiFK4U/VVj6tjcr4hXDCFU56QQxgsKxJ2F+u8 QfpU5/l7Kdcpybi516eiT6NXBGrn7gOQJ2gYnq2k08JFTx/xR4P7nqMpIRmAV6Da+JJJ TfhgQJMSch9cHIZ3X5bXZKd+t/8fjhQ50RfW/DPlKsoGaN8DDth2fG4uyM4Ykxkqz5KD ASYP3NTgA8k2zviGw8H8BRCgUW3HPErFCAyDQakPW8nxtaGjhGs37P5mm2xaZnuTsKSh 9KLlsUmKaUJJniqpHH4onaNvVCm6LYPD1VvLg2DRhVnYD4CS5UGVl5lHIz9/KKOqb3TP F59Q== X-Gm-Message-State: AOJu0Yxim23ii9VJ76B8DS5TDMKW9cxc/PYKBzyZ7aRwnhk7OPStS1Yf b321s7faT7FCbDd79SRxnSGkZNCvBu/bq5TkeMsWJ71DRS2rex4IzfIVkQ== X-Google-Smtp-Source: AGHT+IGL2+bBgAxAblbE8kSbBw9MfpDksGTPVTrcr87hf892sT66F6fSsdC9QDY4sK5ot76iFA7l2A== X-Received: by 2002:a17:906:17d9:b0:a59:efd3:9d with SMTP id a640c23a62f3a-a5a2d673060mr1386464666b.58.1715858812307; Thu, 16 May 2024 04:26:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:51 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/13] mesa: remove obsolete 0001-meson.build-check-for-all-linux-host_os-combinations.patch Date: Thu, 16 May 2024 13:26:28 +0200 Message-Id: <20240516112640.2145789-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:26:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199468 From: Alexander Kanavin 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 Signed-off-by: Alexander Kanavin --- ...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 diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted file mode 100644 index 7be7d81eeb7..00000000000 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -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 -Signed-off-by: Fabio Berton -Signed-off-by: Otavio Salvador -Signed-off-by: Alistair Francis ---- - 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__' diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 77e9c80fcb6..a8f3397e04a 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -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 \ From patchwork Thu May 16 11:26:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43764 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 971C4C25B7D for ; Thu, 16 May 2024 11:26:57 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web10.11096.1715858814692547781 for ; Thu, 16 May 2024 04:26:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=D9XpM8dj; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a59c5c9c6aeso299648966b.2 for ; Thu, 16 May 2024 04:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858813; x=1716463613; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=foRCbXnIIycuHjUxiXkCphwmuIfENn2qRI5E4VEC320=; b=D9XpM8djNY4GCHHtPKcttGJDLxRaRdMCC3BuV2sXWtLWx9udzohQ+tNz3q5Js8X4KU oaV1jEGV9mAhbsEZgM76sVhuk+UGo0W8UzaNbAnsvZcu0TtDqJ1N8LJmltm/CTsUwiYw eloqi3bvkkPkoYjhJwbgHWWznOyp/ZAQcfNChKdARi3MrLWapl0DJmKnZ66BHG6W12py FOYADR62nFAqshSuGWOL7Ga5iDJPuQ0jAmNzUJx5IKS7rkYzld1YGaUMUMburChWcfbo Fp35stforq+3Deve00/+8fmsOfg7Y6vKgHk9kui6FQ1k26MTLFSnt+Nk1JkY0oIKD1yi hl+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858813; x=1716463613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=foRCbXnIIycuHjUxiXkCphwmuIfENn2qRI5E4VEC320=; b=STz63a1abblqkIXwnnQ4ygXIgmLIPj0U+6UIfrV/8V+iDqoKjenlQNiPOYEAnC2qE2 XFVPhx71YtBpPRTJDYZ5geVkBoJFNlnlvAJD1mZxen/Ns/58LK4uRTr7wQVqSAc5Z9rT 58bAKw1ZLZeRZ70VyDhro4cdlm8U2XvXwlhHG8kYF3Cyf7zic/iYAvLGpzGwcDFtV38b aQzAZDlfuL4//5Or3p+ZC3UQKIT0VQeqgP1H3QFqGUuwTz5JzERWHhA0aa5tQCijqQoS aOBocD4UycwpwuY4RfPc3oBEDnhkxuoNO+I0R3qJzQPw7fuiLVX1VGM5U6qdBKiDnkWK B2rA== X-Gm-Message-State: AOJu0YywF1eXjK1OkvtALSOE92/pWEtIzxlL498oUSM+maMHWqMtqw9Q lXS8vQRv5L23UyutNYQC5EprU4ZSfzFJLeVRHln/UurHGWB3kYs6F2Qu4A== X-Google-Smtp-Source: AGHT+IEJTe8VGDRtHUspV+sbAo9/82aomCdKwpeZzOJ2EhUXG//0aNJTm/5sA9ZXwfJL0Bjyy784vg== X-Received: by 2002:a17:907:986:b0:a5a:5c5:a9f7 with SMTP id a640c23a62f3a-a5a2d55a4bemr1518310166b.8.1715858812998; Thu, 16 May 2024 04:26:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:52 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/13] glib-2.0: remove obsolete 0001-Set-host_machine-correctly-when-building-with-mingw3.patch Date: Thu, 16 May 2024 13:26:29 +0200 Message-Id: <20240516112640.2145789-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:26:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199469 From: Alexander Kanavin This as well has been solved via https://git.yoctoproject.org/poky/commit/?id=f6a35934540e910794b8729ecc278189a39b710f Signed-off-by: Alexander Kanavin --- ...-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 diff --git a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch deleted file mode 100644 index a2f9dd9672f..00000000000 --- a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 13 Feb 2019 15:32:05 +0100 -Subject: [PATCH] Set host_machine correctly when building with mingw32 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - gio/tests/meson.build | 8 ++++---- - glib/tests/meson.build | 2 +- - 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 diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 1a97a0d02a6..2de50dd9af3 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -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 \ From patchwork Thu May 16 11:26:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43761 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5428DC25B78 for ; Thu, 16 May 2024 11:26:57 +0000 (UTC) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by mx.groups.io with SMTP id smtpd.web10.11097.1715858815607204778 for ; Thu, 16 May 2024 04:26:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AaS1QAlE; spf=pass (domain: gmail.com, ip: 209.85.167.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-51ffff16400so1053707e87.2 for ; Thu, 16 May 2024 04:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858814; x=1716463614; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kpO/g4R6QHleQ6+mYxplT+UPY3oX3PXTmYRcL+vbVEo=; b=AaS1QAlE94AoK4BVvGUnZKxxRhorPj0DpIzlqChV/uI1SnvzYpDFJUNJaXnIKb6e+6 pQ2YmDH+Lomsvm7pcDQGMDFMht2Ip9JJ5i9f9tTvII2JGpl7H9LtKdLGhNJdyx0Yexn6 bST8psA/gQyqaGXCAl/VNmK6NWptFiYNZhsf5WmjngRT+DN1o0I4cVAuCuY/mQZmToNn b84oAC7U/XJpNGPjCs5x53FwzZO+Tk4wKvZGYvAOahp81g1REwq4zcDhmkVZWHg0Oir8 iHt9T+E6RXA3UcAjZebqcEEReRxZVBsT364FNAGVEvBD+SCGJ5fXjGbuK3Wk0/PS5C2c vDwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858814; x=1716463614; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kpO/g4R6QHleQ6+mYxplT+UPY3oX3PXTmYRcL+vbVEo=; b=xFEraSit5Gk7GgTsEAfqSZvc0hVUQnw4nI303LVm1x8rQ8ZM5ZxElBbphdeY/HSjgj vNdbEdZY7++wi6ws1NVGfYmvp2K/4Cyv0BFBgWrO7G1ByG9iZecHyX18shNdbs8O/YnI 2+TI1+EiWmb/RaElixETmDUzMHPqi83Il+al6ei9rm4TLVjXgGUV+Ok8kaFX71CRuygd ZAjnXen2gwo2+k4ej7a/fTyV/ce8jM1Py3ajlbgTCD0isFTBOP4P5P8w8KsYfdTBdZ1I KLvKBx2ybI0B7ZjFOcM9qtMkykhfd15yu+DEQBsArdLVMpDJlI1zg2vMWbwwEhEDXMX/ noXQ== X-Gm-Message-State: AOJu0YzQADTElKDM7zT0p8aATuDj7HkbGkWVJZ1TFnbPLB6laTiN4c+/ fgr1J8UQfZ/1UGrQIYpAMj9S1dCJNSsn71+NUUaHGMMGRrfYkvYgQw6ZDg== X-Google-Smtp-Source: AGHT+IGlucTrrWQ6/84MZBYVq7vWdGO1Z7q51Bf3s5D7UrmCVOs2dXX8UyjF6HR2OVrwLp/ZoEiOTA== X-Received: by 2002:ac2:4643:0:b0:523:ae99:b333 with SMTP id 2adb3069b0e04-523ae99b3c5mr2368201e87.64.1715858813631; Thu, 16 May 2024 04:26:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:53 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/13] kexec-tools: submit 0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch upstream Date: Thu, 16 May 2024 13:26:30 +0200 Message-Id: <20240516112640.2145789-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:26:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199470 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch index e874a8b4f16..489b1092850 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch @@ -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 horms@kernel.org,http://lists.infradead.org/pipermail/kexec/2024-April/029903.html] Suggested-By:fredrik.markstrom@gmail.com Signed-off-by: Haiqing Bai From patchwork Thu May 16 11:26:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70C6CC25B7C for ; Thu, 16 May 2024 11:26:57 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.11210.1715858816135144505 for ; Thu, 16 May 2024 04:26:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DSBaOMZs; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a59b81d087aso268725366b.3 for ; Thu, 16 May 2024 04:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858814; x=1716463614; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sSMrn0NH9XUGVDEzcmc6ZVwsu68bBEEU9pkp8eTXDME=; b=DSBaOMZs2KKH2DdvISC3THj3DJfUwa+WNrL3c3VCuXTQ9y9Oe28rtkulINzk5pEUyH 9/olCkVevBETaqrYwJacq2VxtXpOcZo6nt5+i3SSda+dXkmhgA5Jwy9kAuDuPZY31bR5 5aiUCLS+Nvwmt3gFF8/Aeg53VZE97AY2HxoQCBfRY34P2nxJqeV4hIJStwYrgcl8Rxs/ 517njAbdvrMyrsG7nG7XYPb+9/urm3rgoIRI58KfLIhqC9UeJKoCvYJ2RSxNOZA7O9Zn qwQUOioP0jRJaqaky6h/BpeJOPCldVt8Vr6tM6f8grMCfuNX6io83rAdNnOyzWtVBwEc OOOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858814; x=1716463614; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sSMrn0NH9XUGVDEzcmc6ZVwsu68bBEEU9pkp8eTXDME=; b=SYGeOwWSlkPTAjIqDJhQnT8dYD4o5OqLjXDDcEXwYFerRoAOihVAjjDZDK7Q/YkBBh mePajfoOqqVWUwxxHt12rRBDgr76VN7pSdR2pPVyRiV2ghMY3gOqWmZXK0jluBH1qtdi Rkb8apJ5YwAKD/WYvezMtcKLCz4/ho/irjlFF3IysZsrEruV+fY5QW2j7HGO8AXHX57e jrCysphJO27kYb5LBaf9Geox4TFd6uqzFxfnHW/G78iUboesFVF+YhbLK1qsRunW/Bzq 4YJ7SHyBOiMgcbVUDlzygpxzydsMbmvm0xVy3TtyRudbeySh8KNsIL2cU4PT48keGFU1 QMRg== X-Gm-Message-State: AOJu0Yz3WgXqO7eZakQ91ZcvdpBw5P63cw67r3nYFCQDgqWXdfum57NI guCS730gJsEipQb9OPvoR4yl7/NdQH9kTyRA4rZhYzd1RpCc1QNzoZE4oQ== X-Google-Smtp-Source: AGHT+IHJbqA83dTrxYuP72V9RM1P+AbKLR6Ziyw1twyuhWp3BLdlSHVj0D/FnCo9b3UTq2pJxKcjig== X-Received: by 2002:a17:906:66ca:b0:a59:c2c3:bb4c with SMTP id a640c23a62f3a-a5a2d675a9dmr1631974066b.70.1715858814318; Thu, 16 May 2024 04:26:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:53 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/13] vorbis: mark patch as Inactive-Upstream Date: Thu, 16 May 2024 13:26:31 +0200 Message-Id: <20240516112640.2145789-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:26:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199471 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../libvorbis/libvorbis/0001-configure-Check-for-clang.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch b/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch index b06029b98b7..d4fac605b66 100644 --- a/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch +++ b/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch @@ -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 --- -Upstream-Status: Pending configure.ac | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) From patchwork Thu May 16 11:26:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43762 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 863D3C25B7B for ; Thu, 16 May 2024 11:26:57 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.11098.1715858816582188300 for ; Thu, 16 May 2024 04:26:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fJYlIbgr; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a59a0168c75so333138166b.1 for ; Thu, 16 May 2024 04:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858815; x=1716463615; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FMwM35sL15JbkmcfStKtPQ7tzSRunKEJUBZM1d6AQUI=; b=fJYlIbgr8PIoDY+zenygg2KkJiya88/2SnNdIcrTUhYbNWt5ugimggSFzTjYAvT6Hd V3EQIAHurO8i+JnYksNjuQBdUC+b30yckuYDXyHTIGGNDoS4E+Rf15IxSuZ/gSjn6SOp KuPR3RolJ97uUvETmvY3Mnh7dSDf5oH65JFlDEUuubriac8WAbnw6qgMJ6wODWWGqr08 1CgAeOG1K62Na/b1VC5jsvgc/oeaWcDxhHBa8yG67UBdJeynxgmQ7M85gqR533sTGL+w 1Q0S1MOmETo1KxPdmo1PA3ExAR3Uw8zg5oV+soGkHndGD0l0Z3/AjhTgTpP7qZoGP5ga CNSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858815; x=1716463615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FMwM35sL15JbkmcfStKtPQ7tzSRunKEJUBZM1d6AQUI=; b=KyI7dYSZ1dQQ8U10iiBmSEIw/JaH42GGwwtNEXSvUejm5Haie5BE5pq+QFtCoFH3Ss 4q+NL7oyU5vRMUIke6DcAakVNMo3w31Yi5cHrbbZ5hQ9rUvTXMItIWxsao2NofUskKCz jqNQjTeaefwfWtxlKzqjpzNTaQ0yLYHnAlxO4E22Dd7kcWfrvsVx2euOULoWeyaTuzbZ lo8qtWWQvZjrZuhdd84IwB694333vdyx602SdfcOp9giGKqdpHP4B5Bf0PRG3P+j0z0F s6A7RjQC1WrYaenrNPlYmINU27JPwh0qfyTh5S7szyNgwv/GnIQfFPByILcY4saczqKb hUgQ== X-Gm-Message-State: AOJu0Yw01drbf+QCCPWhmgCfBEV8TlJOxMQPsFS/moq6b2dyQEOfKdHb W0nouxp2+5L/tlMFOU6n0ZxaHlcp7M49G3Mdn8Uu4aEKVHjnfxqmtxp2hA== X-Google-Smtp-Source: AGHT+IHQB8WQhkeYY4+xeCfSbCPeBt1PLDYuzE2jsqNePaYq2H1mnOfvS+iE8sWvflqvooJfOF8yuA== X-Received: by 2002:a17:906:38f:b0:a59:cdf4:f93d with SMTP id a640c23a62f3a-a5a2d5cb1dfmr1203606166b.34.1715858814953; Thu, 16 May 2024 04:26:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:54 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/13] grub: mark grub-module-explicitly-keeps-symbole-.module_license.patch as a workaround Date: Thu, 16 May 2024 13:26:32 +0200 Message-Id: <20240516112640.2145789-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:26:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199472 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../grub-module-explicitly-keeps-symbole-.module_license.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch index d9012d1dd63..7c8770ce8bd 100644 --- a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch +++ b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch @@ -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 From patchwork Thu May 16 11:26:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43767 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F831C25B74 for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mx.groups.io with SMTP id smtpd.web11.11211.1715858817430987966 for ; Thu, 16 May 2024 04:26:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jqMCbx6/; spf=pass (domain: gmail.com, ip: 209.85.167.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-52388d9ca98so1214797e87.0 for ; Thu, 16 May 2024 04:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858815; x=1716463615; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2NhBhQfXXChwHW9PIkKb918YPd7F2/Y3zMPCR1thn/8=; b=jqMCbx6/7Ky3mspPFiP1ulwNulf28ZCprFR/SIXWTait6CsOB53nw8hmASQZZEBxZC qmKFw8Yx3H+gmYgoAjDb1Si+eFFxqWpHMLJ4a6cAaTeHbjNNC51eQyRWY4V0j8uKLWX9 1PBoDkfVMEe2N+W/yVOBvTOdkYZ5bL3jRRxivDrOHMb8axi31N4Av5ac1NhcSP/vPqq7 LkJw27hQBtFXomulg3tzo6BomAAIDWQzcpn3aQV4wl8c64aqVTwr6pOPmulg3IBIDAuD d1/Aq1TEQTRAVCMTh91vwA5M1fMngfNEonhB4AUUF268yxFcGZ7o+OhhivdleYEPIw2d oRhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858815; x=1716463615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2NhBhQfXXChwHW9PIkKb918YPd7F2/Y3zMPCR1thn/8=; b=cSGLwVqIXIjsPgUrNJAMkpu+WUasRkgralFi3i6yWI6xyCbETT+MHtxeeO9I4yOaiH O9v2RQRotNawMJDDuV6ZeG9XrJd6N7pGN9470hVkX4NRfwYmdmTDvccbIq+jrrNKcRIm cNelRSPVHH7GFsa4bIRYXhOLybYalsMWWIm9QFmAgfI9mO2jXwEiuOF1mWadJhZ4kAcY ZTlfTIydoiwCicR8PIIAblGbfiNqnRrplDss16feB3W7nbCGYXShPpbgfZ3v3/y6krRt jh0X0lu31SV3FOCCuBxBONObHCarHXOcx2LjXAoQ9FuX/ynuGrthFmX5FbpVzMdKsnzi VkEg== X-Gm-Message-State: AOJu0YzBgjECXmevyyUVo4rLFHLjXTCdl6A6S5N9HK3c1+byffPTkMhb fA6KAinIIb8ssUxfeDtk02TcniaDrH9xMCVzVw4hv9szckK48N5FIAmSlg== X-Google-Smtp-Source: AGHT+IHBpTKSr5Y7VNkFudPOtiIcMYdXeCBh+Sz/N1/oOVf5obcfUB64LGVnS7E42Ydslmgf9/AzKw== X-Received: by 2002:a05:6512:3d24:b0:51d:5f0a:8839 with SMTP id 2adb3069b0e04-5220fc7c529mr21530256e87.5.1715858815555; Thu, 16 May 2024 04:26:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:55 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/13] grub: remove unneeded 0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch Date: Thu, 16 May 2024 13:26:33 +0200 Message-Id: <20240516112640.2145789-6-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199473 From: Alexander Kanavin Verified on qemux86 and qemux86-64 with grub and grub-efi. Signed-off-by: Alexander Kanavin --- ...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 diff --git a/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch b/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch deleted file mode 100644 index 05a4697a734..00000000000 --- a/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 006799e9c4babe8a8340a24501b253e759614a2d Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 -Signed-off-by: Khem Raj - -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 diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index bb9aacb478a..e2a2a842773 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -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 \ From patchwork Thu May 16 11:26:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43773 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7464C25B7F for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.groups.io with SMTP id smtpd.web11.11212.1715858817834492741 for ; Thu, 16 May 2024 04:26:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JX116qtI; spf=pass (domain: gmail.com, ip: 209.85.208.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5727dc6d3edso3318580a12.0 for ; Thu, 16 May 2024 04:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858816; x=1716463616; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P7Z56GisingUNnv47jmYPvP6/BmtkFcT8pxErIKyAAw=; b=JX116qtIkPvfIlGdWafe6Ejpip7Y23wGoBCrVFA8pyrJOaa95j8NJjOB2V6xE6foN0 HlK9jy04sceJXwujUNFoEaQYx+zq2fGLFfvvcBiQ0OfIPsg4MvxDzbvNMLWwyAugVfGS X3iFAnYQx6Ls9BvZVOuCdQumXRmZUCn2F2fxXWhJseK2oLDGrTD5qjWxVg9TZI+pFLjB Jipoozk04qCpikBBkZuywW19ytNRoj6qJloc/PjfgILG03Y+3X1Evdb7ON6NrCjGPr0d 4giadTGPJvTU4sEnPqejLpyo9cjG9ElrIPYLZsb093FqHWuIuUwomRQvbs0IddRDtnjp nwMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858816; x=1716463616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7Z56GisingUNnv47jmYPvP6/BmtkFcT8pxErIKyAAw=; b=EjzwtlsLCaNbUFpIgEv26LtKV9yQ5jY1QBdV7WBXpfDKn9+u3lO9ueWSFBY40yk1Ed 1RGDoxca9pTDoBVUoiHLIpGxBkh/go2K3nQBTQTAOth44jCBso7j5may57rYLOC1bT3c olC8zhPNmZGpPyae+KDoSkcp1KKhSa4WXuUIJrU0rTZopT6eC30kfrJJ/LtTvkmMABrN tKCsnLPEBnq6PJZMLXGSbTiqiLtg6NJjhpng+AarRtCEtWRKR9mxEBdr5UnKa1dkl9Wn iTVcfVEIcALHhinVxNPmtMTw2UGVZn2KPUbRFp5BVslXWIRh8oGIy7Y2Rd1FZyuS/Eeg tX9w== X-Gm-Message-State: AOJu0YzBMSTcShXzNGx2L0wBlE/UBd4tSmuRjZGFaklbbMvqweXH+Gep 7U0TOJgFR/N5HjFA7gpZIWbOId60xjC5fvfx1RKoDdh4A8WPt7LeE5c1pw== X-Google-Smtp-Source: AGHT+IGCkbiUhVsQKtYiaSKxXoz0wqJoecbpcIN33TgW1wbnafJFT4QEvWAEKd/cPIz2kiJnog0lLQ== X-Received: by 2002:a17:906:3589:b0:a59:a83b:d43d with SMTP id a640c23a62f3a-a5a2d53b13dmr1274785566b.16.1715858816257; Thu, 16 May 2024 04:26:56 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:55 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/13] gdb: remove unneeded 0006-resolve-restrict-keyword-conflict.patch Date: Thu, 16 May 2024 13:26:34 +0200 Message-Id: <20240516112640.2145789-7-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199474 From: Alexander Kanavin Somewhere on the way the issue solved itself. Signed-off-by: Alexander Kanavin --- 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 diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 81ac441462a..c2fbcb2ac6b 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -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 \ " diff --git a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch deleted file mode 100644 index 45388c5ac5a..00000000000 --- a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 477f1b2049c7f940b8e8fda4ac396cfe322b269f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH] resolve restrict keyword conflict - -GCC detects that we call 'restrict' as param name in function -signatures and complains since both params are called 'restrict' -therefore we use __restrict to denote the C99 keywork - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - gnulib/import/sys_time.in.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h -index 87db1a88745..e6b98c7e467 100644 ---- a/gnulib/import/sys_time.in.h -+++ b/gnulib/import/sys_time.in.h -@@ -93,20 +93,20 @@ struct timeval - # define gettimeofday rpl_gettimeofday - # endif - _GL_FUNCDECL_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - _GL_CXXALIAS_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # else - # if !@HAVE_GETTIMEOFDAY@ - _GL_FUNCDECL_SYS (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - # endif - /* Need to cast, because on glibc systems, by default, the second argument is - struct timezone *. */ - _GL_CXXALIAS_SYS_CAST (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # endif - _GL_CXXALIASWARN (gettimeofday); - # if defined __cplusplus && defined GNULIB_NAMESPACE From patchwork Thu May 16 11:26:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43768 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ADCDC25B79 for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web10.11099.1715858818549894167 for ; Thu, 16 May 2024 04:26:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ASNq9+B9; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a59cf8140d0so255119066b.3 for ; Thu, 16 May 2024 04:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858817; x=1716463617; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QiLX+csJI/an9dAclrorjUngC2nPx6Wr4Cikjg0bET4=; b=ASNq9+B9O015lEn6It3lOTnEP8WaTtgaY5L7k6shKtDNrXSGrEGDhyTHpbK+oLInRg VuPJBtA+HmdCrdfjCW55knyr6H30klRtwAhZHVDKOGs6KWr6OcVf+Y0FmMWNV3oldkhf WhZoHFUyorS6X95EJaqaTiB6H3nBTU7c8/+FxVe83iX/ySPKBphrqtHOru+A9q96EWZs SBAMABiSU91NO5NlCoxGdx05Ho0GbDZ4lKMOZBwdXro1OzGYtm8OqOEI8N3jDv137NsJ wDdBuWV/PlsDAAVbJQ5bhgH0k8YlImbj97G8smW8CKAcr7CbavsZkN5Ivv+N8R2ctQnZ V9vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858817; x=1716463617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QiLX+csJI/an9dAclrorjUngC2nPx6Wr4Cikjg0bET4=; b=w7f0W2X8XpgMWVYXtfqAdXeBE9CaV1bnDwLdr+/zzcd0w7gSgSRNKh1gclh9fYxGll 5yXHrN6CvkYKhJyfGpinphCBDeGX6YkDaE0dSg7LbPtC7RMeyykSrf0LZUMisvH9g6D8 ITUprIuVq/heBI8s+VU9cVRRUVsnS136VCI5UvChex7olaI5JU+auKY7EaVkFK+VL6Nk r3db21Obh3To8TUohw5BSzuOgq2LyO1fPYcjP9lkczyDf8lW4OaxcsQs3qoGxKxLKJdZ qqpztH9BQDdsdilx4yZi6/U9YBXy8GXyZkoqnhdIGQBgrOcgI8vL5U2SBLuIFtJAqyN0 ZRHg== X-Gm-Message-State: AOJu0YxPM9msf7yajD8ezhbi8O1scs+pH5axL/bwIW8/OaX0fIxisj23 sXlCJ55TrrqUnxWinLlNI6gHdP5wwhdpO28r/SlJwW4Dq1AaC797g3dWPA== X-Google-Smtp-Source: AGHT+IE0gL2/LQWOizkQFNfeYgGUmPOy75etWtXdvC/zm5ncqI8S4Gcp71609MA5X67g7MOxtiVtQw== X-Received: by 2002:a17:906:7110:b0:a59:a18e:3fd9 with SMTP id a640c23a62f3a-a5a2d54c365mr1132476266b.5.1715858816859; Thu, 16 May 2024 04:26:56 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:56 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/13] perl: submit the rest of determinism.patch upstream Date: Thu, 16 May 2024 13:26:35 +0200 Message-Id: <20240516112640.2145789-8-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199475 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/files/determinism.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch index aa85ccef100..f2b11115524 100644 --- a/meta/recipes-devtools/perl/files/determinism.patch +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -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 X-Patchwork-Id: 43770 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B9EEC41513 for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.11100.1715858819253337612 for ; Thu, 16 May 2024 04:26:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lCWWElPG; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a59b81d087aso268733366b.3 for ; Thu, 16 May 2024 04:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858818; x=1716463618; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d1oA3iariMK4JfLWR6dP+yY5YqbzWQVAKZD+0tDRFqA=; b=lCWWElPGEHrNNwHHQBt7Ykn71tZg9caxX8ouqc9wrcvEL6ZJpdnKWEeT43RVruAexk wNK5JYheV2GJ6FIompq8DdPZLuYBxZNoP09AqpW2NwEPqZ/mH6aSPzbf9cAP5E2XcxAG 8r0tcbRjekp97EUJRo7VV7vMszSRCNRX1sr9IKTBjWATog/QVyrCvhOVVgkxaE5KpQLu 9w368ebkSsScBa4q+sJhKbfPw1HYL6TbbZZP9qcN+Cdj/G7Yip/jhZHHNTqmi6QSdxkR 3qGILSaH/4kNB5bZ2vYYIxlazhnkbl6HfMGc10IBjdVIO5TFN5pfNIAnkzlSlW2EaEVr KWOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858818; x=1716463618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d1oA3iariMK4JfLWR6dP+yY5YqbzWQVAKZD+0tDRFqA=; b=b7IlyZw/ntc/mlOxFP6EJ2ZkAm1vkImA0XzgKHVS+KQeNisLOkfZGsLILBHKcDmEmU aGEE/xzwOAAMN18Ll3Bo6e5BTY+Z+0IYV0M6LNhs8BEFnRtfcs/WVurz8nAmvX74VZbJ rEyTkcOLDK7NM7xuossllfpCQeM2pe+CHQ25ESC0d89H/kn90nNGi4YOuRe0opJ2c1rk vl7iwIReJYV2Dy21BWlmBmMDtA7RymfmqELiCBxFZFr7dXz6Ysqa8M4561RrA5yb/IZC Dv0ng5Ps9za6JuICA1ebfIjLlETDUBrvfKsDE6Ylu8gkXxqb3KtSAAtdZcv2euQ7L3O/ AucA== X-Gm-Message-State: AOJu0YzsmlrRSjBijT1a8Y4F80bC4tati6scno13nfQ1cwyG9hlCUjsc 7g1fxMBuXKqgzNRslzDpXE0PPtVMnQGZPS32qLduQFYefyrJZYeGvpX4EA== X-Google-Smtp-Source: AGHT+IHqRM+RozIXBAcxpNAK7/juMqmpfHRjAnLLjCYcx7fjCz+8MpRFj3XL2AtJpVfJW95JMOrNnw== X-Received: by 2002:a17:906:741:b0:a5b:f7b2:485a with SMTP id a640c23a62f3a-a5bf7b248e2mr486797966b.30.1715858817627; Thu, 16 May 2024 04:26:57 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:57 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/13] iptables: submit 0001-configure-Add-option-to-enable-disable-libnfnetlink.patch upstream Date: Thu, 16 May 2024 13:26:36 +0200 Message-Id: <20240516112640.2145789-9-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199476 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...ption-to-enable-disable-libnfnetlink.patch | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 8824bf2af7e..0fe22615119 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch @@ -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" -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 Signed-off-by: Maxin B. John - +Signed-off-by: Alexander Kanavin +Signed-off-by: Phil Sutter --- - 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 + From patchwork Thu May 16 11:26:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF3C7C25B7B for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web10.11101.1715858820151833089 for ; Thu, 16 May 2024 04:27:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cOhZ2MXC; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a59a352bbd9so409228866b.1 for ; Thu, 16 May 2024 04:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858818; x=1716463618; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YslvNR2STXCadUbzQBAYysMidrTMxODnCd7XFdp6ZRw=; b=cOhZ2MXCKAGpcQ8bZjZA+fcrEwM5Vd4Cvul78qn/h5QgJ8ARI5xgwNdyb4uCX/wqNh +aLl7RgbKISApiyg4q4DllIuuMR9j9VVHHVtTkcLRSU//8A/WcU49rZcMm8Rg0Rj2JDM 7ZmYgp2HT+Vvq9Ho+RSdh1NEATUSdDHMysVtdSLPIzYRDGapWGssSAv5KLB1X463ETN3 OtRBTSlChICWDt0G4eKe62ywSQvF5cwItUDXBqNKxbBeBmRJt28crVLgcoCen/uMbS4s T5iFnjalHD2qoQ5KVGsGVnbkCTMYoJ3Sfc6v1Ogho7GI1bDqeiJ3VVj18xgFmLhubbEl OEow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858818; x=1716463618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YslvNR2STXCadUbzQBAYysMidrTMxODnCd7XFdp6ZRw=; b=uWM3h+fub/NxSsAoW7WgeJPNo+AzzPjbMKnSdEUhV7sAof/xbZYSp5kTGQuyLDw6Va aVz/pQlIl8C67s6mpFZxdy6xPYQA5jVWGco9BXpR93vP26ko9CB1oAHL57qF7l/yxPbt 9RjkscUJK51RflIE8Hk29tQms4xcTIgAkt6CWYOchjsQ8agw2VHCEyLkiA+VULgtyiSG S9r1kcIab0/zvEtVgOjiaPIsqSKNdQgeewp0kbN3ctnOrxGEs7uAhuNDShBNZ/r+Cas5 ThwnA+yPrDIZf4h3978rRn88UZVOHTkCivB+7mi7q/m9TogcjMgieYWMEUNGRq4iNOYN nDUQ== X-Gm-Message-State: AOJu0YwN/hi7CdPse6oqeyrLlNNld10Ku/dimRcGJZBRlEVbDIHzvzX+ 8hBztDs/oSc8q4Vto62drl3FrdiZNw6UEwgHbk0rW33i5mreVxatTN58hw== X-Google-Smtp-Source: AGHT+IFyTWtUY72GfPgWBYuyHYoQRzz6fzTEvVS7oENdfDaxw9eI6VstPj0xINNDm11XyebM85QWmQ== X-Received: by 2002:a17:906:55cc:b0:a59:a431:a8d6 with SMTP id a640c23a62f3a-a5a2d317577mr1428642166b.38.1715858818511; Thu, 16 May 2024 04:26:58 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:58 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/13] iptables: remove unneeded 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch Date: Thu, 16 May 2024 13:26:37 +0200 Message-Id: <20240516112640.2145789-10-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199477 From: Alexander Kanavin Somewhere on the way it ceased to be necessary. Signed-off-by: Alexander Kanavin --- ...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 diff --git a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch deleted file mode 100644 index a190c7e8ae2..00000000000 --- a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 phil@nwl.cc] -Signed-off-by: Alexander Kanavin - ---- - 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 - #include - #include -+#include - #include - #include - #include diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index 5a878977425..cbd727b75df 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb @@ -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" From patchwork Thu May 16 11:26:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43769 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A80DBC25B78 for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web11.11215.1715858820780351811 for ; Thu, 16 May 2024 04:27:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=C+23jbaY; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a5a89787ea4so290775966b.2 for ; Thu, 16 May 2024 04:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858819; x=1716463619; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WPaaLcxUek1fD4cNgAipWucUTsk8/Pra3W5BzXhnP0o=; b=C+23jbaYeH9SejwjRO3++rMlPgmD/imij7S+kFn6sIQlCk2E3Bs4tKsOqqMas6QZ+l AiBvuGvqzI9NXdovE7iNGyFGNUv7p0Wa4gMrroUgTaz7tFMV2geVwLl2Ih+PjAMJd5Xv n5Qk5gXREGK3XRKV6yBtXsshSN+ibqdz9+RBBhylHJVhgbTfKoNKEJ+EpMkY5JQe3De4 CyinZ6QfiyYLYQdyKWiW1cDcumMLoWbmfrMyfbJUvfKtmB7ssPQvM4anI2JCUTDuEr4v hB5YgI7mZKf4EnuIc2tTIYHlasvWcOwevp4LOAt1v+s9YXy/zse/tm5ttZMAD9lL5C92 v8kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858819; x=1716463619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WPaaLcxUek1fD4cNgAipWucUTsk8/Pra3W5BzXhnP0o=; b=cSH7x7dgN8Ct+eVdhLeq+/cE558mBDJ22YJ+3Zk7cep0Zr73FdojqiVeKPowpnFu/X hiMWIRBg3cKKLWPwi6AtbT5S8Klvi0IKxauyWTw6iQ+BntiQE/BuPJ2CWFVHXpD2UUm0 gUWop1TMDwuIDk/s0LuVQ2R0WwtzJVxTdaoMwMCYxD/F9QF6udwq1jDhbTvsdUIa/m2B Oh6+rQOS52OeUKBt41bdEO9zT8tUhVg1l3ePprYSHaoUbJsAx22kYgSFfk4F65bcdmVK PxmXtAqT4y5ayttGL3MP0kHabdKu623SiyjJMAAvk3rm8kgWkKdIJfkbv+KzsEI3gZe+ F7wQ== X-Gm-Message-State: AOJu0YxqQWktJtpDpUqj8uUYeaPIL6PcUtYqe58MFrMyBNB1a3wy/4Kf t7hpQxRkXatmufsDZniRsdks4NzqJ4wes6pCLpio6g2ipnoWFv2NbNCivA== X-Google-Smtp-Source: AGHT+IFcbzKsCqJ0vF7DdQir1b5FIV+p7AAFNIocg0pdMFSnfP9ODL8GGNJoG2+EI0T5WOlFKqYk4A== X-Received: by 2002:a17:906:3713:b0:a59:cc74:c28f with SMTP id a640c23a62f3a-a5a2d66a379mr1224480666b.52.1715858819219; Thu, 16 May 2024 04:26:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:58 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/13] iptables: correctly enable libnetfilter_conntrack support Date: Thu, 16 May 2024 13:26:38 +0200 Message-Id: <20240516112640.2145789-11-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199478 From: Alexander Kanavin 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. Signed-off-by: Alexander Kanavin --- ...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 diff --git a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch deleted file mode 100644 index 5a022ebc8c3..00000000000 --- a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -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 -Signed-off-by: Maxin B. John - ---- - 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"; diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index cbd727b75df..a9c88582cda 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb @@ -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" From patchwork Thu May 16 11:26:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43772 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA15FC25B7C for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.11216.1715858821341255383 for ; Thu, 16 May 2024 04:27:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iBsdhXcj; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a59a387fbc9so332849166b.1 for ; Thu, 16 May 2024 04:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858820; x=1716463620; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bEoBuDt/Ic/qJgdlcmlSXw8b+Rheum4J8ncS5btfDmQ=; b=iBsdhXcjO7+WS0L6IVExPjdSwWgX681UmzUFoBcjXTsmxraMNqV+ZiM5q7IxzfnSeY 2Hb50cYAdVcN5qwjjfmfMZx1OgUPKa5ABPFoJGpOR2/hM101bZE56IOoBW+dAJDkd54D pPQ4Pf79zf58QyMzC2tuFm6z7WRop7O9hVFL8/NQ2L818pzIsWBw1CpJBK3V556Uhm4O UInzGgRhC4ufZcF1es62n7+GQh2xL1rR37tdu7pVlMp+u4tkkiPK8p+YWzkmQP4nQy/J ffKDnYuqkczP+cc1pI6A/2EfMBhh5HJx9P9iK73xBqfxNCLbzCOCub1SsGuBlPqtRAu3 iJPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858820; x=1716463620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bEoBuDt/Ic/qJgdlcmlSXw8b+Rheum4J8ncS5btfDmQ=; b=ESOnvHzZVHXJgiyJPxcN6OHDwshCXB808M93SELnxGrLiXIhgwaa2FhzYJk4FMRmb1 WiqSz1mbqg1xg+73d0m+ybm/aaV+3vgyFSXJRpBsJBkklgv1JMsCvYg+H+2zprguG31/ LM/hLNa/9geDKX0QvF7UDqej46MkjMsCetET7XHPYZEAzUXHL1AsiUbuKIhCJX32ScL+ gjLgTtrk9kJZhx5DkK+c8xPvGK03EWdBfNUZXrwPAR6XaBuXah3FFfemAyoZ9H6cRLax 7DAiWlZ67sSUAOgaLvkj0DPWP0cNV18QVkUVb/rDIPHZu/UL9qIUY9UGOdOBL3Gd4KNX Pcxg== X-Gm-Message-State: AOJu0YzddAw04TBDcwiVK0030IHzE/0OQADPVreRHIrw2ee7jew7uE5D 3S7spcGLgDBiIgiX8wt5eMAAo7dweECCrNCOoU0CycBjkMTZ1ge4pl8iXA== X-Google-Smtp-Source: AGHT+IHeBIQsnGytXU76LvnZNd8mULLse8fbPddBOV9c/jLi/07Eof3O5IJWf8TlvbpDKTNl35U58w== X-Received: by 2002:a17:906:b79a:b0:a59:aa69:9790 with SMTP id a640c23a62f3a-a5a2d54c87fmr1161498966b.8.1715858819761; Thu, 16 May 2024 04:26:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:26:59 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/13] x264: update to latest revision on official git Date: Thu, 16 May 2024 13:26:39 +0200 Message-Id: <20240516112640.2145789-12-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199479 From: Alexander Kanavin 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. Signed-off-by: Alexander Kanavin --- .../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 diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch deleted file mode 100644 index cb771fb0bf8..00000000000 --- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 -From: Christopher Larson -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 - ---- - 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*) diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch deleted file mode 100644 index 065e3b35b7c..00000000000 --- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -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 -Signed-off-by: Maxin B. John ---- - 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 - diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index e7d9e75e8de..fae88d24d13 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -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" From patchwork Thu May 16 11:26:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 43771 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6F63C25B7D for ; Thu, 16 May 2024 11:27:07 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.11218.1715858822097193519 for ; Thu, 16 May 2024 04:27:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kq1sRddU; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a599c55055dso287454666b.0 for ; Thu, 16 May 2024 04:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715858820; x=1716463620; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C2wv+cI/OhplZOduNf4j5yiNlFREniW7I8HRBWvlh9E=; b=kq1sRddU4vSw3a9X7dNfxV4M1GDCTdyNMjUFrFN7+lurEL4JBIIa51S2kfmqV+kH4G kG+EZO+0l/IKiFc9v9bGcp/Uc0m3xSIR1hDPahx/VeS+CX48AuI3IqJrhjvLRRP1dBHk NflJAyOP/Iipkjx0xwgmO6Z94J/2Hn3tRO1xYCYQO+thLgig9KOiZRiv86CGvfbX3U86 TE8ZoOOHWA64ZOd/PS1RkqqTdYcZe5F60HUQgJAZZ2T9Nmd6C1wjBT8SvPn64GRy53sk yZ0g3fc+mR9sphgaRU5IMlnVJb2abGS5a9fIuaBBjlQ0DhmV9J/QmgVBXIh+hibTxzi4 8/sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715858820; x=1716463620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C2wv+cI/OhplZOduNf4j5yiNlFREniW7I8HRBWvlh9E=; b=eC9OZQkmxoL8QldlkIWgYmV21n391O+6wf5HUr0iij9s54spOKX9dL5jOkBkscI80o DwCRKXsvVEE7a3ptq/AzCtw3e0e8DgG/jXEDVCU0BAJBILvla1hcI7H5RJC9CXFeJZPo UJ7OGkAECWsoKW7q1UkOsDSUC7avm6OIHnYOul8b+Mf1JQR4vBM0Bd6zpEPCj2N6/qbd dpuYaBbyEY3j/ElDc7HExycy3N2QQV4cOhEQVIbv3PVACipv4SpJPsPCHSvikWD1QHXl fQtNOCcISKnDA6iLOvb+s9c7uI3mp99OFaKJkbMgMag70bmKzpl4g+OnicEJAM/Lc0ZI c9DQ== X-Gm-Message-State: AOJu0YxnmHQrrCWm3g7Ycmq3UGJ1OQcfzxCLDwM4UbxCZSq1vzCwtuDJ t1M+USFTFzIbpxVFRwstSAuyFBhCPaN4A8qLmsrCoPyaY/oVvD6HD9yG0A== X-Google-Smtp-Source: AGHT+IFJg9qd87O5i3eDHbZsxiHztYkQ2c/NTBFNv+mrMJ5P1dVpaoN2tnlQTjMWb5P+37TC0KNpLg== X-Received: by 2002:a17:906:714a:b0:a5a:8ac4:3c4c with SMTP id a640c23a62f3a-a5a8ac43e15mr480397566b.68.1715858820423; Thu, 16 May 2024 04:27:00 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b18110sm973898366b.225.2024.05.16.04.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 04:27:00 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/13] elfutils: remove unneeded 0006-Fix-build-on-aarch64-musl.patch Date: Thu, 16 May 2024 13:26:40 +0200 Message-Id: <20240516112640.2145789-13-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516112640.2145789-1-alex.kanavin@gmail.com> References: <20240516112640.2145789-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 May 2024 11:27:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199480 From: Alexander Kanavin Verified on qemuarm64/musl (as the patch says). Signed-off-by: Alexander Kanavin --- .../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 diff --git a/meta/recipes-devtools/elfutils/elfutils_0.191.bb b/meta/recipes-devtools/elfutils/elfutils_0.191.bb index c4d872430be..76bd2b3a99c 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.191.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.191.bb @@ -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 \ diff --git a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch deleted file mode 100644 index 149e0e6a7b9..00000000000 --- a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4409f128c81a9d76b9360b002a1d76043c77b53e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 15 Aug 2017 17:27:30 +0800 -Subject: [PATCH] Fix build on aarch64/musl - -Errors - -invalid operands to binary & (have 'long double' and 'unsigned int') - -error: redefinition - of 'struct iovec' - struct iovec { void *iov_base; size_t iov_len; }; - ^ -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Rebase to 0.170 -Signed-off-by: Hongxu Jia ---- - backends/aarch64_initreg.c | 4 ++-- - backends/arm_initreg.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c -index daf6f37..6445276 100644 ---- a/backends/aarch64_initreg.c -+++ b/backends/aarch64_initreg.c -@@ -33,7 +33,7 @@ - #include "system.h" - #include - #if defined(__aarch64__) && defined(__linux__) --# include -+# include - # include - # include - /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ -@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), - - Dwarf_Word dwarf_fregs[32]; - for (int r = 0; r < 32; r++) -- dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; -+ dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF; - - if (! setfunc (64, 32, dwarf_fregs, arg)) - return false; -diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c -index efcabaf..062bb9e 100644 ---- a/backends/arm_initreg.c -+++ b/backends/arm_initreg.c -@@ -38,7 +38,7 @@ - #endif - - #ifdef __aarch64__ --# include -+# include - # include - # include - /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */