Skip to content

Makefile: fix DESTDIR handling#2578

Merged
AkihiroSuda merged 1 commit intoopencontainers:masterfrom
kolyshkin:fix-destdir
Sep 30, 2020
Merged

Makefile: fix DESTDIR handling#2578
AkihiroSuda merged 1 commit intoopencontainers:masterfrom
kolyshkin:fix-destdir

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Sep 8, 2020 •
edited
Loading

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 kolyshkin mentioned this pull request Sep 8, 2020
Closed
@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Sep 9, 2020

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
Copy Markdown
Contributor Author

kolyshkin commented Sep 9, 2020

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
Copy Markdown
Contributor Author

kolyshkin commented Sep 9, 2020

Fix is coming

#2580

@kolyshkin
Makefile: fix DESTDIR handling
8297ae4 
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
Copy Markdown
Contributor Author

kolyshkin commented Sep 9, 2020

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

@nanonyme
Copy link
Copy Markdown

nanonyme commented Sep 9, 2020

Misread. Looks good to me.

@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Sep 23, 2020

@AkihiroSuda PTAL

1 similar comment
@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Sep 30, 2020

@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
@kolyshkin kolyshkin mentioned this pull request Feb 3, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp mrunalp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

easy-to-review

Projects

None yet

Milestone

1.0.0-rc93

Development

Successfully merging this pull request may close these issues.

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

4 participants

@kolyshkin @nanonyme @mrunalp @AkihiroSuda