| Message ID | 20221213111118.149697-14-alex@linutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/24] ptest-packagelists.inc: correctly assign fast and slow tests | expand |
On Tue, 2022-12-13 at 12:11 +0100, Alexander Kanavin wrote: > This reduces friction in version updates, as devtool can handle conditional > patches, but not conditional local files. Whilst I understand the desire, putting files in SRC_URI which aren't used just complicates the build and means if you change those files, things rebuild which really don't care. As such I'd really prefer not to do this. Can't we fix devtool to handle this if it can already handle patches that way? Cheers, Richard
On Wed, 21 Dec 2022 at 11:18, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > Can't we fix devtool to handle this if it can already handle patches > that way? That's right. I queued a fix to devtool, where 'devtool finish' processes local files only for the main SRC_URI set, but not any of the conditional ones. This matches 'devtool modify/upgrade' which both only install one set from the no-override list (via meta/classes/devtool-source.bbclass). Implementing multiple sets of local files (one for each override) is not impossible, but is significant work, and the use case is marginal. Alex
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 \ "
This reduces friction in version updates, as devtool can handle conditional patches, but not conditional local files. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- 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(-)