Fix mkbootimg since 33.0.3 upgrade #78
Conversation
|
Now that I thought about it I guess now my question is do I put the files in a |
edab27b to
5796bc0
Compare
5796bc0 to
e374f31
Compare
|
Would it be possible to also get #68 merged before creating a new |
vendor/CMakeLists.avb.txt
Outdated
| @@ -0,0 +1 @@ | |||
| install(PROGRAMS avb/avbtool.py DESTINATION bin RENAME avbtool) | |||
There was a problem hiding this comment.
It is better to split this PR into 2 separate commits.
1 - fix of mkbootimg
2 - enabling avb tool
There was a problem hiding this comment.
Oh I just realized you meant splitting it to 2 commits in this PR, oh well... let me know if you want them both here and I can close the other.
There was a problem hiding this comment.
Either works for me.
The current condition looks good to me. There is no need to redo it.
@nmeum are you OK with this PR?
It now requires an import of a gki/generate_gki_certificate.py, so install the scripts in /usr/share/android-tools/mkbootimg and symlink back to /usr/bin/mkbootimg to avoid having to patch anything.
e374f31 to
df97e86
Compare
| install(PROGRAMS mkbootimg/mkbootimg.py DESTINATION bin RENAME mkbootimg) | ||
| set(MKBOOTIMG_SCRIPTS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/android-tools/mkbootimg") | ||
| install(PROGRAMS mkbootimg/mkbootimg.py DESTINATION ${MKBOOTIMG_SCRIPTS_DIR}) | ||
| add_custom_target(mkbootimg_symlink ALL COMMAND ${CMAKE_COMMAND} -E create_symlink |
There was a problem hiding this comment.
I see that this target is called even if I do not modify any sources
ninja: Entering directory `build'
[1/1] cd /home/anatol/sources/android-tools/build/vendor && /usr/bin/cmake -E create_symlink /usr/share/android-tools/mkbootimg/mkbootimg.py /home/anatol/sources/android-tools/build/vendor/mkbootimg
what is this custom target used for? Do we need it here?
There was a problem hiding this comment.
Nothing, this was one of the ways I found to create the final installed /usr/bin/mkbootimg symlink file itself (which the install() below places in /usr/bin/); I already acknowledged it wasn't so nice in the description of the PR.
Please do replace it with something else if you know a better way!
There was a problem hiding this comment.
add_custom_target is not intended to have any output and is thus always run. You could maybe try to work around that via add_custom_command? I haven't looked into using that to create symlinks as part of the installation though.
It now requires an import of a
gki/generate_gki_certificate.py, so install the scripts in/usr/share/android-tools/mkbootimgand symlink back to/usr/bin/mkbootimgto avoid having to patch anything.Suggestions for a better way to create the symlink are welcome, I'm not entirely happy with it, but it does work :)
Fixes #76.