This reduces friction in version updates, as devtool can handle conditional patches, but not conditional local files.
Signed-off-by: Alexander Kanavin <[email protected]> --- meta/recipes-devtools/cmake/cmake-native_3.24.2.bb | 3 +-- meta/recipes-devtools/cmake/cmake.inc | 4 ++++ meta/recipes-devtools/cmake/cmake_3.24.2.bb | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.24.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.24.2.bb index bcc87eb8f2..79b364909c 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.24.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.24.2.bb @@ -3,8 +3,7 @@ inherit native DEPENDS += "bzip2-replacement-native xz-native zlib-native curl-native ncurses-native zstd-native" -SRC_URI += "file://OEToolchainConfig.cmake \ - file://environment.d-cmake.sh \ +SRC_URI += "\ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ " diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 7561e851c6..151456e500 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -17,6 +17,10 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ + file://OEToolchainConfig.cmake \ + file://SDKToolchainConfig.cmake.template \ + file://cmake-setup.py \ + file://environment.d-cmake.sh \ " SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db" diff --git a/meta/recipes-devtools/cmake/cmake_3.24.2.bb b/meta/recipes-devtools/cmake/cmake_3.24.2.bb index bb7ed83e30..5959b0e552 100644 --- a/meta/recipes-devtools/cmake/cmake_3.24.2.bb +++ b/meta/recipes-devtools/cmake/cmake_3.24.2.bb @@ -5,10 +5,6 @@ inherit cmake bash-completion DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" SRC_URI:append:class-nativesdk = " \ - file://OEToolchainConfig.cmake \ - file://SDKToolchainConfig.cmake.template \ - file://cmake-setup.py \ - file://environment.d-cmake.sh \ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ " -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174525): https://lists.openembedded.org/g/openembedded-core/message/174525 Mute This Topic: https://lists.openembedded.org/mt/95642225/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
