From 19ae6765c73410c5a2f1aff96dfc36cbd2ad95ee Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 16 Apr 2024 16:46:08 -0400 Subject: [PATCH] cmake: remove bbappend The backported fix being applied by our cmake bbappend was merged in upstream oe-core long ago (thud release), remove it. Bug-AGL: SPEC-4578 Change-Id: Ib6453000a0bbebb591d16f3502041363be487dd4 Signed-off-by: Scott Murray --- meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend | 1 - meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc | 9 --------- .../recipes-devtools/cmake/files/environment.d-cmake-agl.sh | 1 - 3 files changed, 11 deletions(-) delete mode 100644 meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend delete mode 100644 meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc delete mode 100644 meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh diff --git a/meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend b/meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend deleted file mode 100644 index 980783236..000000000 --- a/meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', '${BPN}_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc b/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc deleted file mode 100644 index 2d50a1f24..000000000 --- a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:append := ":${THISDIR}/files" - -SRC_URI:append:class-nativesdk = " \ - file://environment.d-cmake-agl.sh \ -" - -do_install:append:class-nativesdk() { - install -m 644 ${WORKDIR}/environment.d-cmake-agl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake-agl.sh -} diff --git a/meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh b/meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh deleted file mode 100644 index 64b6cf3c6..000000000 --- a/meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh +++ /dev/null @@ -1 +0,0 @@ -export OE_CMAKE_TOOLCHAIN_FILE="$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake" -- 2.16.6