Closed shr-project closed 3 years ago
@pattivacek @liuming50 FYI
@aodukha this would be great if we could drop this. Can you test and confirm?
The cmake.bbclass changes was backported to hardknott branch today: https://git.openembedded.org/openembedded-core/commit/?h=hardknott&id=db6a315e5f6de02e226e582f878a83c427fd87cc
so aktualizr-native builds will now fail also with the stable hardknott branch.
fails with latest oe-core/master with: https://git.openembedded.org/openembedded-core/commit/meta/classes/cmake.bbclass?id=0fb6280432a36985590d9a714a5f11164aaebb51
because this prepend does "cd ${S}" and doesn't go back to ${B} and cmake_do_configure function doesn't cd to ${B} anymore, resulting in:
| CMake Error at CMakeLists.txt:42 (message): | Aktualizr does not support building in the source tree. Please remove | CMakeCache.txt and the CMakeFiles/ directory, then create a subdirectory to | build in: mkdir build; cd build; cmake ..
drop this whole do_configure_prepend as git-native works fine:
aktualizr-native/1.0+gitAUTOINC+1255aa24fe-7/git$ grep Setting ../temp/log.do_configure -- Setting version to 2020.10-0-g1255aa24f
aktualizr/1.0+gitAUTOINC+1255aa24fe-7/temp$ grep Setting ../temp/log.do_configure -- Setting version to 2020.10-0-g1255aa24f
aktualizr/1.0+gitAUTOINC+1255aa24fe-7/build$ which git /OE/build/oe-core/tmp-musl/hosttools/git
aktualizr/1.0+gitAUTOINC+1255aa24fe-7/build$ grep GIT CMakeCache.txt GITCOMMAND:FILEPATH=/OE/build/oe-core/tmp-musl/hosttools/git GIT_EXECUTABLE:FILEPATH=/OE/build/oe-core/tmp-musl/hosttools/git //ADVANCED property for variable: GITCOMMAND GITCOMMAND-ADVANCED:INTERNAL=1 //ADVANCED property for variable: GIT_EXECUTABLE GIT_EXECUTABLE-ADVANCED:INTERNAL=1
Signed-off-by: Martin Jansa Martin.Jansa@gmail.com