github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 11:36:56 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Use variable for default binary permissions

Browse Source 
Create a variable for the default binary permissions.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2024-02-13 17:56:25 +00:00
parent cc2d96671f
commit e49aeec97f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -52,6 +52,8 @@ workdir="${WORKDIR:-$PWD}"
destdir="${workdir}/kata-static" destdir="${workdir}/kata-static"
default_binary_permissions='0744'
die() { die() {
msg="$*" msg="$*"
echo "ERROR: ${msg}" >&2 echo "ERROR: ${msg}" >&2
@ -586,8 +588,8 @@ install_firecracker() {
"${firecracker_builder}" "${firecracker_builder}"
info "Install static firecracker" info "Install static firecracker"
mkdir -p "${destdir}/opt/kata/bin/" mkdir -p "${destdir}/opt/kata/bin/"
sudo install -D --owner root --group root --mode 0744 release-${firecracker_version}-${ARCH}/firecracker-${firecracker_version}-${ARCH} "${destdir}/opt/kata/bin/firecracker" sudo install -D --owner root --group root --mode "$default_binary_permissions" release-${firecracker_version}-${ARCH}/firecracker-${firecracker_version}-${ARCH} "${destdir}/opt/kata/bin/firecracker"
sudo install -D --owner root --group root --mode 0744 release-${firecracker_version}-${ARCH}/jailer-${firecracker_version}-${ARCH} "${destdir}/opt/kata/bin/jailer" sudo install -D --owner root --group root --mode "$default_binary_permissions" release-${firecracker_version}-${ARCH}/jailer-${firecracker_version}-${ARCH} "${destdir}/opt/kata/bin/jailer"
} }
install_clh_helper() { install_clh_helper() {
@ -610,7 +612,7 @@ install_clh_helper() {
libc="${libc}" features="${features}" "${clh_builder}" libc="${libc}" features="${features}" "${clh_builder}"
info "Install static cloud-hypervisor" info "Install static cloud-hypervisor"
mkdir -p "${destdir}/opt/kata/bin/" mkdir -p "${destdir}/opt/kata/bin/"
sudo install -D --owner root --group root --mode 0744 cloud-hypervisor/cloud-hypervisor "${destdir}/opt/kata/bin/cloud-hypervisor${suffix}" sudo install -D --owner root --group root --mode "$default_binary_permissions" cloud-hypervisor/cloud-hypervisor "${destdir}/opt/kata/bin/cloud-hypervisor${suffix}"
} }
# Install static cloud-hypervisor asset # Install static cloud-hypervisor asset
@ -654,7 +656,7 @@ install_stratovirt() {
"${stratovirt_builder}" "${stratovirt_builder}"
info "Install static stratovirt" info "Install static stratovirt"
mkdir -p "${destdir}/opt/kata/bin/" mkdir -p "${destdir}/opt/kata/bin/"
sudo install -D --owner root --group root --mode 0744 static-stratovirt/stratovirt "${destdir}/opt/kata/bin/stratovirt" sudo install -D --owner root --group root --mode "$default_binary_permissions" static-stratovirt/stratovirt "${destdir}/opt/kata/bin/stratovirt"
} }
# Install static virtiofsd asset # Install static virtiofsd asset
@ -674,7 +676,7 @@ install_virtiofsd() {
"${virtiofsd_builder}" "${virtiofsd_builder}"
info "Install static virtiofsd" info "Install static virtiofsd"
mkdir -p "${destdir}/opt/kata/libexec/" mkdir -p "${destdir}/opt/kata/libexec/"
sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/opt/kata/libexec/virtiofsd" sudo install -D --owner root --group root --mode "$default_binary_permissions" virtiofsd/virtiofsd "${destdir}/opt/kata/libexec/virtiofsd"
} }
# Install static nydus asset # Install static nydus asset
@ -698,7 +700,7 @@ install_nydus() {
mkdir -p "${destdir}/opt/kata/libexec/" mkdir -p "${destdir}/opt/kata/libexec/"
ls -tl . || true ls -tl . || true
ls -tl nydus-static || true ls -tl nydus-static || true
sudo install -D --owner root --group root --mode 0744 nydus-static/nydusd "${destdir}/opt/kata/libexec/nydusd" sudo install -D --owner root --group root --mode "$default_binary_permissions" nydus-static/nydusd "${destdir}/opt/kata/libexec/nydusd"
} }
#Install all components that are not assets #Install all components that are not assets
@ -853,7 +855,7 @@ install_tools_helper() {
sudo install -D --owner root --group root --mode 0644 ${repo_root_dir}/src/tools/${tool}/genpolicy-settings.json "${defaults_path}/genpolicy-settings.json" sudo install -D --owner root --group root --mode 0644 ${repo_root_dir}/src/tools/${tool}/genpolicy-settings.json "${defaults_path}/genpolicy-settings.json"
binary_permissions="0755" binary_permissions="0755"
else else
binary_permissions="0744" binary_permissions="$default_binary_permissions"
fi fi
info "Install static ${tool_binary}" info "Install static ${tool_binary}"