Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: fix DESTDIR handling #2578

Merged
merged 1 commit into from
Sep 30, 2020

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Sep 8, 2020

DESTDIR should only be used while installing.

To test:

make DESTDIR=$(pwd)/inst PREFIX=/usr install install-man install-bash

Before this commit, this would result in installing to /usr
rather than $(pwd)/usr.

Fixes: #2571

@kolyshkin
Copy link
Contributor Author

Hmm, I haven't seen this failure before :(

not ok 42 runc exec --additional-gids
# (in test file tests/integration/exec.bats, line 128)
#   `[[ ${output} == "uid=1000 gid=1000 groups=100(users),65534(nogroup)" ]]' failed

and now it's consistently failing everywhere 🤔

@kolyshkin
Copy link
Contributor Author

OK the expected output is

uid=1000 gid=1000 groups=100(users),65534(nogroup)

while the actual is

uid=1000 gid=1000 groups=100(users),65534(nobody)

Fix is coming

@kolyshkin
Copy link
Contributor Author

Fix is coming

#2580

DESTDIR should only be used while installing.

To test:

	make DESTDIR=$(pwd)/inst PREFIX=/usr install install-man install-bash

Before this commit, this would result in installing to /usr
rather than $(pwd)/usr.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
Copy link
Contributor Author

rebased on top of current master (merged #2580 should fix CI)

@nanonyme
Copy link

nanonyme commented Sep 9, 2020

Misread. Looks good to me.

@kolyshkin
Copy link
Contributor Author

@AkihiroSuda PTAL

1 similar comment
@kolyshkin
Copy link
Contributor Author

@AkihiroSuda PTAL

@AkihiroSuda AkihiroSuda merged commit d4885ca into opencontainers:master Sep 30, 2020
@kolyshkin kolyshkin added this to the 1.0.0-rc93 milestone Feb 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Makefile: DESTDIR is not added to PREFIX if PREFIX is manually given
4 participants