Skip to content

Commit

Permalink
Update the kata-ctl install rule to allow it to be installed to a giv…
Browse files Browse the repository at this point in the history
…en directory

The Makefile was updated to use an INSTALL_PATH variable to track where the
kata-ctl binary should be installed.  If the user doesn't specify anything,
then it uses the default path that cargo uses.  Otherwise, it will install it
in the directory that the user specified.  The README.md file was also updated
to show how to use the new option.

This work was done by pair programming by the following contributors:
Cesar Tamayo
Kevin Mora Jimenez
Narendra Patel
Ray Karrenbauer
Srinath Duraisamy

Fixes kata-containers#5403

Signed-off-by: Narendra Patel <narendra.g.patel@intel.com>
  • Loading branch information
ngpatel6 committed Apr 29, 2023
1 parent 29785a4 commit 7c2988e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/tools/kata-ctl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ PROJECT_URL = https://github.com/kata-containers
PROJECT_COMPONENT = kata-ctl

TARGET = $(PROJECT_COMPONENT)
INSTALL_PATH = $(HOME)/.cargo

VERSION_FILE := ./VERSION
export VERSION := $(shell grep -v ^\# $(VERSION_FILE))
Expand Down Expand Up @@ -55,7 +56,7 @@ test:
@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture

install:
@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path .
@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH)

check: standard_rust_check

Expand Down
5 changes: 5 additions & 0 deletions src/tools/kata-ctl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ $ make
$ make install
```

If you would like to install the tool to a specific directory, then you can provide it through the `INSTALL_PATH` variable.
```bash
$ make install INSTALL_PATH=<install_path>
```

## Run the tool

```bash
Expand Down

0 comments on commit 7c2988e

Please sign in to comment.