From 79da855b8367f141c95d5a9fe55b9f86be72fa01 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Thu, 9 Aug 2018 16:28:38 -0500 Subject: [PATCH] build-image: Dont create image in script dir. Create in the current directory where the script is called. Signed-off-by: Jose Carlos Venegas Munoz --- .../kata-containers-image/build_image.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/obs-packaging/kata-containers-image/build_image.sh b/obs-packaging/kata-containers-image/build_image.sh index 9b3bbd97d7..fc9a7750ab 100755 --- a/obs-packaging/kata-containers-image/build_image.sh +++ b/obs-packaging/kata-containers-image/build_image.sh @@ -23,13 +23,6 @@ source "${script_dir}/../../scripts/lib.sh" arch_target="$(uname -m)" -#image information -img_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name") -img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version") - -#initrd information -initrd_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name") -initrd_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version") kata_version="master" @@ -39,7 +32,7 @@ kata_osbuilder_version="${KATA_OSBUILDER_VERSION:-}" agent_version="${AGENT_VERSION:-}" -readonly destdir="${script_dir}" +readonly destdir="${PWD}" build_initrd(){ sudo -E PATH="$PATH" make initrd\ @@ -107,6 +100,14 @@ main(){ # Agent version [ -n "${agent_version}" ] || agent_version="${kata_version}" + #image information + img_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name" "${kata_version}") + img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version" "${kata_version}") + + #initrd information + initrd_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name" "${kata_version}") + initrd_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version" "${kata_version}") + shift "$(( $OPTIND - 1 ))" git clone "$osbuilder_url" "${tmp_dir}/osbuilder" pushd "${tmp_dir}/osbuilder"