build: fix test for subid 4 #12655
Merged
build: fix test for subid 4 #12655
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
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
giuseppe
force-pushed
the
fix-libsubid-test
branch
from
c84a2c4 to
2539d91
Compare
gyakovlev
reviewed
Dec 20, 2021
hack/libsubid_tag.sh
Outdated
| @@ -9,7 +9,11 @@ cc -o "$tmpdir"/libsubid_tag -l subid -x c - > /dev/null 2> /dev/null << EOF | |||
| #include <shadow/subid.h> | |||
| int main() { | |||
| struct subid_range *ranges = NULL; | |||
| #if SUBID_ABI_MAJOR >= 4j | |||
There was a problem hiding this comment.
a typo? the j character looks like vi artifact =)
There was a problem hiding this comment.
how have you installed libsubid? I see the need for
Progbut I don't seeshadow_logfddefined
nevermind my last comment, I was looking at the wrong version
|
I still can't get it to link to here's what works for me: #include <shadow/subid.h>
#include <stdlib.h>
const char *Prog;
FILE *shadow_logfd = NULL;
int main() {
struct subid_range *ranges = NULL;
#if SUBID_ABI_MAJOR >= 4
subid_get_uid_ranges("root", &ranges);
#else
get_subuid_ranges("root", &ranges);
#endif
free(ranges);
return 0;
} |
|
how have you installed libsubid? I see the need for |
libsubid changes its ABI in version 4. Account for the different name in the configure script. Closes: https://github.com/containers/podman/issues/12654 [NO NEW TESTS NEEDED] it is a change in the build script Signed-off-by: Giuseppe Scrivano <[email protected]>
Signed-off-by: Giuseppe Scrivano <[email protected]>
|
yeah it's here: include too: |
giuseppe
force-pushed
the
fix-libsubid-test
branch
from
52908a8 to
3570c38
Compare
|
some dumps, might be helpful |
|
could you please give a try to the latest version? |
|
sorry I missed "how" question shadow is installed via package manager (portage on gentoo linux) |
|
getting this, seems to be coming from storage |
|
yes, this is fixed with: containers/storage#1089 |
|
LGTM |
|
/lgtm |
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
libsubid changes its ABI in version 4. Account for the different name
in the configure script.
Closes: https://github.com/containers/podman/issues/12654
Signed-off-by: Giuseppe Scrivano [email protected]