mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-19 08:28:19 +00:00
packaging: Move repo_root_dir to lib.sh
This is used in several parts of the code, and can have a single declaration as part of the `lib.sh` file, which is already imported by all the places where it's used. Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
parent
58480aac34
commit
02f6af9e1e
@ -14,7 +14,9 @@ set -o pipefail
|
|||||||
readonly script_name="$(basename "${BASH_SOURCE[0]}")"
|
readonly script_name="$(basename "${BASH_SOURCE[0]}")"
|
||||||
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly packaging_root_dir="$(cd "${script_dir}/../" && pwd)"
|
readonly packaging_root_dir="$(cd "${script_dir}/../" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../" && pwd)"
|
|
||||||
|
source "${packaging_root_dir}/scripts/lib.sh"
|
||||||
|
|
||||||
readonly osbuilder_dir="$(cd "${repo_root_dir}/tools/osbuilder" && pwd)"
|
readonly osbuilder_dir="$(cd "${repo_root_dir}/tools/osbuilder" && pwd)"
|
||||||
|
|
||||||
patches_path=""
|
patches_path=""
|
||||||
@ -26,8 +28,6 @@ final_image_name="kata-containers"
|
|||||||
final_initrd_name="kata-containers-initrd"
|
final_initrd_name="kata-containers-initrd"
|
||||||
image_initrd_extension=".img"
|
image_initrd_extension=".img"
|
||||||
|
|
||||||
source "${packaging_root_dir}/scripts/lib.sh"
|
|
||||||
|
|
||||||
arch_target="$(uname -m)"
|
arch_target="$(uname -m)"
|
||||||
|
|
||||||
build_initrd() {
|
build_initrd() {
|
||||||
|
@ -15,8 +15,9 @@ readonly project="kata-containers"
|
|||||||
readonly script_name="$(basename "${BASH_SOURCE[0]}")"
|
readonly script_name="$(basename "${BASH_SOURCE[0]}")"
|
||||||
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
|
||||||
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
|
||||||
readonly prefix="/opt/kata"
|
readonly prefix="/opt/kata"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly static_build_dir="${repo_root_dir}/tools/packaging/static-build"
|
readonly static_build_dir="${repo_root_dir}/tools/packaging/static-build"
|
||||||
readonly version_file="${repo_root_dir}/VERSION"
|
readonly version_file="${repo_root_dir}/VERSION"
|
||||||
readonly versions_yaml="${repo_root_dir}/versions.yaml"
|
readonly versions_yaml="${repo_root_dir}/versions.yaml"
|
||||||
|
@ -13,6 +13,8 @@ export PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-"no"}"
|
|||||||
|
|
||||||
this_script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
this_script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
|
||||||
|
export repo_root_dir="$(cd "${this_script_dir}/../../../" && pwd)"
|
||||||
|
|
||||||
short_commit_length=10
|
short_commit_length=10
|
||||||
|
|
||||||
hub_bin="hub-bin"
|
hub_bin="hub-bin"
|
||||||
|
@ -9,7 +9,6 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly initramfs_builder="${script_dir}/build-initramfs.sh"
|
readonly initramfs_builder="${script_dir}/build-initramfs.sh"
|
||||||
readonly default_install_dir="$(cd "${script_dir}/../../kernel" && pwd)"
|
readonly default_install_dir="$(cd "${script_dir}/../../kernel" && pwd)"
|
||||||
|
|
||||||
|
@ -9,11 +9,11 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly kernel_builder="${repo_root_dir}/tools/packaging/kernel/build-kernel.sh"
|
|
||||||
|
|
||||||
source "${script_dir}/../../scripts/lib.sh"
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
|
||||||
|
readonly kernel_builder="${repo_root_dir}/tools/packaging/kernel/build-kernel.sh"
|
||||||
|
|
||||||
DESTDIR=${DESTDIR:-${PWD}}
|
DESTDIR=${DESTDIR:-${PWD}}
|
||||||
PREFIX=${PREFIX:-/opt/kata}
|
PREFIX=${PREFIX:-/opt/kata}
|
||||||
container_image="${KERNEL_CONTAINER_BUILDER:-${CC_BUILDER_REGISTRY}:kernel-$(get_last_modification ${repo_root_dir} ${script_dir})-$(uname -m)}"
|
container_image="${KERNEL_CONTAINER_BUILDER:-${CC_BUILDER_REGISTRY}:kernel-$(get_last_modification ${repo_root_dir} ${script_dir})-$(uname -m)}"
|
||||||
|
@ -9,7 +9,6 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly ovmf_builder="${script_dir}/build-ovmf.sh"
|
readonly ovmf_builder="${script_dir}/build-ovmf.sh"
|
||||||
|
|
||||||
source "${script_dir}/../../scripts/lib.sh"
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
@ -9,7 +9,6 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly qemu_builder="${script_dir}/build-qemu.sh"
|
readonly qemu_builder="${script_dir}/build-qemu.sh"
|
||||||
|
|
||||||
source "${script_dir}/../../scripts/lib.sh"
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
@ -9,11 +9,11 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly kernel_builder="${repo_root_dir}/tools/packaging/kernel/build-kernel.sh"
|
|
||||||
|
|
||||||
source "${script_dir}/../../scripts/lib.sh"
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
|
||||||
|
readonly kernel_builder="${repo_root_dir}/tools/packaging/kernel/build-kernel.sh"
|
||||||
|
|
||||||
GO_VERSION=${GO_VERSION}
|
GO_VERSION=${GO_VERSION}
|
||||||
RUST_VERSION=${RUST_VERSION:-}
|
RUST_VERSION=${RUST_VERSION:-}
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly tdshim_builder="${script_dir}/build-td-shim.sh"
|
readonly tdshim_builder="${script_dir}/build-td-shim.sh"
|
||||||
|
|
||||||
source "${script_dir}/../../scripts/lib.sh"
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
@ -9,7 +9,6 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)"
|
|
||||||
readonly virtiofsd_builder="${script_dir}/build-static-virtiofsd.sh"
|
readonly virtiofsd_builder="${script_dir}/build-static-virtiofsd.sh"
|
||||||
|
|
||||||
source "${script_dir}/../../scripts/lib.sh"
|
source "${script_dir}/../../scripts/lib.sh"
|
||||||
|
Loading…
Reference in New Issue
Block a user