De-vendor pre-built binaries #1152
Merged
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
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Codecov Report
@@ Coverage Diff @@
## develop #1152 +/- ##
===========================================
- Coverage 84.09% 84.08% -0.01%
===========================================
Files 113 114 +1
Lines 12448 12455 +7
===========================================
+ Hits 10468 10473 +5
- Misses 1980 1982 +2
Continue to review full report at Codecov.
|
Implement this in extractcode and typecode to provide 7zip, libarchive and libmagic through plugins instead of using vendored binaries in the core scancode Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
- Some binaries initially committed were not correct for a given architecture. Also several provide location were not correct and have been updated. - All location keys are also inlined in plugins code to avoid recursive imports - Extra consistency checks are done on provided locations (they must exist) The version reported in p7zip plugins and ABOUT files was 9.20.1 but it is 9.38.1: this has been fixed. In sevenzip CLI calls, the empty password arg is now last on the CLI args to avoid any ambiguity with the file being extracted. The overall command execute2 logging has been aslo updated. Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
pombredanne
force-pushed
the
469-location-provider-plugin
branch
from
1ce0f9d to
e60e92b
Compare
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 is a fix for #469
It add a
location provider pluginmechanism such that path to binaries can be provided by such plugins.A plugin can then either provide a path to a bundled binary or point to a system installed-binary. This later approach would work well for distro packaging #487 (including for Guix #288 and FreeBSD #1147 and help deal with some distro specific issues more easily such as #443 )
The plugins that provide locations to binaries are found here: https://github.com/nexB/scancode-toolkit/tree/0b121e834e831f97954a3a42d19fe08868dc31a0/plugins
Each provide a few paths such as there https://github.com/nexB/scancode-toolkit/blob/0b121e834e831f97954a3a42d19fe08868dc31a0/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/__init__.py#L40 .... and these could easily be replaced by system paths or links or anything.
@pgiffuni @miwi-fbsd and @mat813 : ping too to get feedback if this can be something that will work for you for https://reviews.freebsd.org/D16484
@dvc94ch this would likely help you on Guix.