From dadab1febf77940fbba33d9f3cb6f1596d31149f Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Thu, 16 Jul 2020 18:15:39 +0800 Subject: [PATCH] osbuilder: build rust agent by default Since we only have the rust agent. Signed-off-by: Peng Tao --- tools/osbuilder/Makefile | 1 + tools/osbuilder/rootfs-builder/rootfs.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/osbuilder/Makefile b/tools/osbuilder/Makefile index 15e57b9b7..316dcecf5 100644 --- a/tools/osbuilder/Makefile +++ b/tools/osbuilder/Makefile @@ -13,6 +13,7 @@ DISTRO := centos BUILD_METHOD := distro BUILD_METHOD_LIST := distro dracut AGENT_INIT ?= no +USE_DOCKER ?= true ROOTFS_BUILD_DEST := $(shell pwd) IMAGES_BUILD_DEST := $(shell pwd) ROOTFS_MARKER_SUFFIX := _rootfs.done diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 483a7e83c..05cb16b8d 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -15,7 +15,7 @@ script_dir="$(dirname $(readlink -f $0))" AGENT_VERSION=${AGENT_VERSION:-} GO_AGENT_PKG=${GO_AGENT_PKG:-github.com/kata-containers/agent} RUST_AGENT_PKG=${RUST_AGENT_PKG:-github.com/kata-containers/kata-containers} -RUST_AGENT=${RUST_AGENT:-no} +RUST_AGENT=${RUST_AGENT:-yes} RUST_VERSION="null" CMAKE_VERSION=${CMAKE_VERSION:-"null"} MUSL_VERSION=${MUSL_VERSION:-"null"}