Clean up klish patches and build commands #96
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current patching infra for klish involved a custom script as well as a directory tree of the patches to apply, split for each source file. This, IMO, is not good for maintainability, since the context/purpose for each change is split across multiple files and it's a little bit harder to correlate changes across files. In addition, quilt and stg are already used for patching elsewhere. Therefore, replace the individual file diffs with two patches (one for a possible build fix with libxml, and the other being the Python 3 support and klish enhancements). Some cleanup was done in the latter patch to reduce the size of the diff, but should be otherwise functionally equivalent. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Instead of hardcoding the include paths and library paths in the Makefile, add dynamic checks for curl, python, and libcjson into configure.ac. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
saiarcot895
force-pushed
the
clean-up-klish-patches-and-build
branch
from
9a2f6ca to
1206ca7
Compare
|
@praveen-li could you help review this PR? |
|
@praveen-li Would you be able to review this PR? |
|
Looks good to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR restructures the patches to use one patch file per logical change and to use quilt, so that it's easier to maintain and modify in the future. In addition,
configure.acin klish source code is now modified to properly check for python, curl, and cjson, instead of having include directories/linker flags be passed in. (Note, however, that because the cjson package in Buster does not provide pkg-config files, the include directories and linker flags are still passed in. This can be removed for Bullseye.)This also makes some changes for the armhf cross-compile build (sonic-net/sonic-buildimage#8035).