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.

Sign up for GitHub

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

Jump to bottom

[1.1] Revert "allow overriding VERSION value in Makefile" and add EXTRA_VERSION #4382

Merged
merged 2 commits into from
Aug 23, 2024
Merged

[1.1] Revert "allow overriding VERSION value in Makefile" and add EXTRA_VERSION #4382

merged 2 commits into from
Aug 23, 2024

Commits on Aug 19, 2024

  1. Revert "allow overriding VERSION value in Makefile" 

    This reverts commit 9d9273c.

This commit broke the build for several other projects (see comments
here: opencontainers#4270, after the merge)
and we don't really need this to be able to set the version without
changing the file.

With this commit reverted, we can still run:

	make VERSION="1.2.3"

and it just works. It doesn't take it from an env variable, but that is
what broke all the other projects (VERSION is just too generic as an env
var, especially for a project like runc that is embedded in many
others).

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
(cherry picked from commit f4cc3d8)
    @rata
    rata committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    18cdc34 View commit details
    Browse the repository at this point in the history

  2. Makefile: Add EXTRA_VERSION 

    Add this new make variable so users can specify build information
without modifying the runc version nor the source code.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
(cherry picked from commit cc2078c)
    @rata
    rata committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    0514204 View commit details
    Browse the repository at this point in the history