build: Allow for kata project build #933
Conversation
|
kubernetes qa-passed 👍 |
jodh-intel
force-pushed
the
build-using-project-name
branch
from
f63d5d2 to
71ff845
Compare
|
kubernetes qa-passed 👍 |
jodh-intel
force-pushed
the
build-using-project-name
branch
from
71ff845 to
8be1ed7
Compare
|
kubernetes qa-passed 👍 |
|
good patch!
|
jodh-intel
force-pushed
the
build-using-project-name
branch
from
8be1ed7 to
f5c282c
Compare
|
kubernetes qa-passed 👍 |
|
Could I get another review on this PR please? |
jodh-intel
force-pushed
the
build-using-project-name
branch
from
f5c282c to
6cc2899
Compare
|
kubernetes qa-passed 👍 |
jodh-intel
force-pushed
the
build-using-project-name
branch
from
6cc2899 to
4898b84
Compare
|
kubernetes qa-passed 👍 |
Makefile
Outdated
|
|
||
| ifneq ($(SYSTEM_BUILD_TYPE),) | ||
| ifeq ($(SYSTEM_BUILD_TYPE),$(CC_TYPE)) | ||
| system_build_type = $(SYSTEM_BUILD_TYPE) |
There was a problem hiding this comment.
Although equivalent, I think it looks less confusing to do:
system_build_type = $(CC_TYPE)
here, and the equiv for KATA below.
I guess all we are really doing here is checking that the SYSTEM_BUILD_TYPE is actually a type we know about. In which case, would an error case catchall of something like ifeq ($(SYSTEM_BUILD_TYPE),) after these two cases make sense? (that is, nobody set the type?) But, maybe that does not mesh with the other methods of choosing which sort of build (I sort of wish we only had one method....)
| @@ -21,31 +21,114 @@ for file in /etc/os-release /usr/lib/os-release; do \ | |||
| fi \ | |||
| done) | |||
|
|
|||
| # A "CC system build" is either triggered by specifying | |||
| # a special target or via an environment variable. | |||
| #------------------------------ | |||
There was a problem hiding this comment.
Update copyright year in this file? - and check others?
Rework the build system to allow the runtime to be built for either of the following: - Clear Containers (`cc-runtime` binary and configuration) - Kata Containers (`kata-runtime` binary and configuration) The existing build rules are retained but there are now two new rules: ``` $ make build-kata-system $ sudo make install-kata-system ``` Two new variables have also been added: - `KATA_SYSTEM_BUILD`: set to any value to build/install for Kata. - `SYSTEM_BUILD_TYPE`: build for either Clear Containers (set to `cc`) or Kata (set to `kata`). See `make help` for further details. Note that configuration files are installed to a project-specific directory, allowing for systems to be installed for both Kata and Clear Containers. Finally, the bash completion and collection scripts have been updated to work for either project. Fixes clearcontainers#919, clearcontainers#921. Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel
force-pushed
the
build-using-project-name
branch
from
4898b84 to
7a9a492
Compare
|
Hi @grahamwhaley - branch updated. |
|
kubernetes qa-passed 👍 |
|
LGTM
|
…oject-name build: Allow for kata project build
|
@jodh-intel FWIW, I have been testing Kata Containers with this PR (now in master), and I confirm it works very well as expected :) |
Rework the build system to allow the runtime to be built for either
of the following:
cc-runtimebinary and configuration)kata-runtimebinary and configuration)The existing build rules are retained but there are now two new rules:
Two new variables have also been added:
KATA_SYSTEM_BUILD: set to any value to build/install for Kata.SYSTEM_BUILD_TYPE: build for either Clear Containers (set tocc) orKata (set to
kata).See
make helpfor further details.Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.
Finally, the bash completion and collection scripts have been updated
to work for either project.
Fixes #919, #921.
Signed-off-by: James O. D. Hunt [email protected]