userland: fix installed-vs-shipped in multilib builds #1295
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
Be aware that whole userland repo is marked as ancient and deprecated: raspberrypi/userland@96a7334 and explicitly says: "If you are using code from here you should rethink your solution." But even if your build is using vc4graphics in MACHINE_FEATURES to avoid most of userland, this issue with multilib was preventing do_install:append to actually remove those libraries provided by lib32-mesa when building lib32-userland (e.g. to provide virtual/libomxil or as dependency of raspidmx or runtime dependency of omxplayer). Signed-off-by: Martin Jansa <[email protected]>
shr-project
force-pushed
the
jansa/userland
branch
from
10be99b to
c2da1c5
Compare
|
Our builds are using vc4graphics and normally don't use lib32-userland. I've verified that for no-multilib builds there is no change in userland packages (other than CMakeLists.txt files in userland-dev): And without vc4graphics: this is the diff with and without vc4graphics and this change doesn't have any impact again: So the only change is for multilib (or other non-standard libdir builds) where it caused installed-vs-shipped QA issue before and kept all libraries (when building with vc4graphics) and now it works correctly (or at least as well as non-multilib case does). |
|
With it shows even more errors :) and after I didn't do any runtime testing. |
|
And yes, we should start considering completely dropping userland. |
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.
Be aware that whole userland repo is marked as ancient and deprecated: raspberrypi/userland@96a7334 and explicitly says:
"If you are using code from here you should rethink your solution."
But even if your build is using vc4graphics in MACHINE_FEATURES to avoid most of userland, this issue with multilib was preventing do_install:append to actually remove those libraries provided by lib32-mesa when building lib32-userland (e.g. to provide virtual/libomxil or as dependency of raspidmx or runtime dependency of omxplayer).