[5/6] arm/hafnium: Restore patch on gn visibility

Message ID	20250730074551.1388-6-csaba.szilagyi@arm.com
State	New
Headers	show Return-Path: <csaba.szilagyi@arm.com> ip: 217.140.110.172, mailfrom: csaba.szilagyi@arm.com) From: =?utf-8?q?Csaba_Szil=C3=A1gyi?= <csaba.szilagyi@arm.com> To: meta-arm@lists.yoctoproject.org Cc: =?utf-8?q?Csaba_Szil=C3=A1gyi?= <csaba.szilagyi@arm.com> Subject: [PATCH 5/6] arm/hafnium: Restore patch on gn visibility Date: Wed, 30 Jul 2025 07:45:50 +0000 Message-ID: <20250730074551.1388-6-csaba.szilagyi@arm.com> In-Reply-To: <20250730074551.1388-1-csaba.szilagyi@arm.com> References: <20250730074551.1388-1-csaba.szilagyi@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Series	arm/hafnium: Enable build on non x86_64 hosts and include it to qemuarm64-secureboot build \| expand [0/6] arm/hafnium: Enable build on non x86_64 hosts and include it to qemuarm64-secureboot build [1/6] Revert "arm/hafnium: refuse to build on non-x86-64 hosts" [2/6] arm/hafnium: Depend on clang-native [3/6] arm/hafnium: Select valid platform for hafnium and properly pass to make [4/6] arm/hafnium: Remove deprecated patch for third_party/linux submodule [5/6] arm/hafnium: Restore patch on gn visibility [6/6] arm/hafnium: add hafnium to qemuarm64-secureboot target

Message ID

20250730074551.1388-6-csaba.szilagyi@arm.com

State

New

Headers

From: =?utf-8?q?Csaba_Szil=C3=A1gyi?= <csaba.szilagyi@arm.com>
To: meta-arm@lists.yoctoproject.org
Cc: =?utf-8?q?Csaba_Szil=C3=A1gyi?= <csaba.szilagyi@arm.com>
Subject: [PATCH 5/6] arm/hafnium: Restore patch on gn visibility
Date: Wed, 30 Jul 2025 07:45:50 +0000
Message-ID: <20250730074551.1388-6-csaba.szilagyi@arm.com>
In-Reply-To: <20250730074551.1388-1-csaba.szilagyi@arm.com>
References: <20250730074551.1388-1-csaba.szilagyi@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Series

arm/hafnium: Enable build on non x86_64 hosts and include it to qemuarm64-secureboot build | expand

Commit Message

Csaba Szilágyi July 30, 2025, 7:45 a.m. UTC

This patch has been dropped in the following commit:
f1fc5c53 - arm/hafnium: update to v2.12.0

Unfortunately the original issue is still present and the
patch is required for the successful build. Patch is
restored in this commit.

Signed-off-by: Csaba Szilágyi <csaba.szilagyi@arm.com>
---
 .../0001-work-around-visibility-issue.patch   | 29 +++++++++++++++++++
 .../recipes-bsp/hafnium/hafnium_2.12.0.bb     |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-arm/recipes-bsp/hafnium/hafnium/0001-work-around-visibility-issue.patch

diff --git a/meta-arm/recipes-bsp/hafnium/hafnium/0001-work-around-visibility-issue.patch b/meta-arm/recipes-bsp/hafnium/hafnium/0001-work-around-visibility-issue.patch
new file mode 100644
index 00000000..dc0c35fe
--- /dev/null
+++ b/meta-arm/recipes-bsp/hafnium/hafnium/0001-work-around-visibility-issue.patch
@@ -0,0 +1,29 @@ 
+From 745294ffa9bb9296eb4250f24dd0ae8115fadd7a Mon Sep 17 00:00:00 2001
+From: Jon Mason <jon.mason@arm.com>
+Date: Thu, 27 Oct 2022 20:10:09 +0000
+Subject: [PATCH] work around visibility issue
+
+gn commit 46b572ce4ceedfe57f4f84051bd7da624c98bf01 "fixed" the
+visibility field not applying to public configs.  This caused dtc to
+have issues due to libfdt and others not being specified.  Due to the
+number, it was cleaner to remove the visibility field (which defaults to
+everything being visible).
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+---
+ BUILD.gn | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/BUILD.gn b/BUILD.gn
+index f55560c540de..d60c3e37135b 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -5,7 +5,6 @@
+ # https://opensource.org/licenses/BSD-3-Clause.
+ 
+ config("libfdt_config") {
+-  visibility = [ ":gtest" ]
+   include_dirs = [
+     "libfdt",
+     "hafnium_inc",
diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb
index 3db20eeb..42a02259 100644
--- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb
+++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb
@@ -14,6 +14,7 @@  inherit deploy python3native pkgconfig ${CLANGNATIVE}
 
 SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https;branch=master \
            file://0001-arm-hafnium-fix-kernel-tool-linking.patch  \
+           file://0001-work-around-visibility-issue.patch;patchdir=third_party/dtc \
           "
 SRCREV = "2cf2ca7c4b81ab18e9cd363d9a5c8288e2a94fda"
 B = "${WORKDIR}/build"