[PATCH 4/6] arm/hafnium: Remove deprecated patch for third_party/linux submodule
Csaba Szilágyi <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
third_party/linux submodule has been removed from hafnium in the following commit: ddeedafa - chore: drop the third_party/linux submodule Relevant patch can not be applied anymore. Patch is removed from the recipe. Signed-off-by: Csaba Szilágyi <[email protected]> --- ...ig-native-to-find-the-libssl-headers.patch | 26 ------------------- .../recipes-bsp/hafnium/hafnium_2.12.0.bb | 1 - 2 files changed, 27 deletions(-) delete mode 100644 meta-arm/recipes-bsp/hafnium/hafnium/0001-Use-pkg-config-native-to-find-the-libssl-headers.patch diff --git a/meta-arm/recipes-bsp/hafnium/hafnium/0001-Use-pkg-config-native-to-find-the-libssl-headers.patch b/meta-arm/recipes-bsp/hafnium/hafnium/0001-Use-pkg-config-native-to-find-the-libssl-headers.patch deleted file mode 100644 index cfb534d4..00000000 --- a/meta-arm/recipes-bsp/hafnium/hafnium/0001-Use-pkg-config-native-to-find-the-libssl-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1c1e7ca2874feaa3e447dce578487d42c226ef46 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Sat, 17 Jul 2021 14:38:02 -0500 -Subject: [PATCH] Use pkg-config-native to find the libssl headers. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <[email protected]> ---- - scripts/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/Makefile b/scripts/Makefile -index 9adb6d247818..5fe371c7d7f5 100644 ---- a/scripts/Makefile -+++ b/scripts/Makefile -@@ -3,8 +3,8 @@ - # scripts contains sources for various helper programs used throughout - # the kernel for the build process. - --CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) --CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) -+CRYPTO_LIBS = $(shell pkg-config-native --libs libcrypto 2> /dev/null || echo -lcrypto) -+CRYPTO_CFLAGS = $(shell pkg-config-native --cflags libcrypto 2> /dev/null) - - hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c - hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms 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 693e81f2..3db20eeb 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb +++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb @@ -14,7 +14,6 @@ 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-Use-pkg-config-native-to-find-the-libssl-headers.patch;patchdir=third_party/linux \ " SRCREV = "2cf2ca7c4b81ab18e9cd363d9a5c8288e2a94fda" B = "${WORKDIR}/build"