diff --git a/ci/install_libseccomp.sh b/ci/install_libseccomp.sh index e997143b18..25b306344b 100755 --- a/ci/install_libseccomp.sh +++ b/ci/install_libseccomp.sh @@ -23,11 +23,11 @@ workdir="$(mktemp -d --tmpdir build-libseccomp.XXXXX)" # Variables for libseccomp libseccomp_version="${LIBSECCOMP_VERSION:-""}" if [ -z "${libseccomp_version}" ]; then - libseccomp_version=$(get_from_kata_deps ".externals.libseccomp.version") + libseccomp_version=$(get_from_kata_deps ".externals.libseccomp.version") fi libseccomp_url="${LIBSECCOMP_URL:-""}" if [ -z "${libseccomp_url}" ]; then - libseccomp_url=$(get_from_kata_deps ".externals.libseccomp.url") + libseccomp_url=$(get_from_kata_deps ".externals.libseccomp.url") fi libseccomp_tarball="libseccomp-${libseccomp_version}.tar.gz" libseccomp_tarball_url="${libseccomp_url}/releases/download/v${libseccomp_version}/${libseccomp_tarball}" @@ -36,11 +36,11 @@ cflags="-O2" # Variables for gperf gperf_version="${GPERF_VERSION:-""}" if [ -z "${gperf_version}" ]; then - gperf_version=$(get_from_kata_deps ".externals.gperf.version") + gperf_version=$(get_from_kata_deps ".externals.gperf.version") fi gperf_url="${GPERF_URL:-""}" if [ -z "${gperf_url}" ]; then - gperf_url=$(get_from_kata_deps ".externals.gperf.url") + gperf_url=$(get_from_kata_deps ".externals.gperf.url") fi gperf_tarball="gperf-${gperf_version}.tar.gz" gperf_tarball_url="${gperf_url}/${gperf_tarball}" @@ -48,64 +48,64 @@ gperf_tarball_url="${gperf_url}/${gperf_tarball}" # We need to build the libseccomp library from sources to create a static library for the musl libc. # However, ppc64le and s390x have no musl targets in Rust. Hence, we do not set cflags for the musl libc. if ([ "${arch}" != "ppc64le" ] && [ "${arch}" != "s390x" ]); then - # Set FORTIFY_SOURCE=1 because the musl-libc does not have some functions about FORTIFY_SOURCE=2 - cflags="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2" + # Set FORTIFY_SOURCE=1 because the musl-libc does not have some functions about FORTIFY_SOURCE=2 + cflags="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2" fi die() { - msg="$*" - echo "[Error] ${msg}" >&2 - exit 1 + msg="$*" + echo "[Error] ${msg}" >&2 + exit 1 } finish() { - rm -rf "${workdir}" + rm -rf "${workdir}" } trap finish EXIT build_and_install_gperf() { - echo "Build and install gperf version ${gperf_version}" - mkdir -p "${gperf_install_dir}" - curl -sLO "${gperf_tarball_url}" - tar -xf "${gperf_tarball}" - pushd "gperf-${gperf_version}" - # Unset $CC for configure, we will always use native for gperf - CC= ./configure --prefix="${gperf_install_dir}" - make - make install - export PATH=$PATH:"${gperf_install_dir}"/bin - popd - echo "Gperf installed successfully" + echo "Build and install gperf version ${gperf_version}" + mkdir -p "${gperf_install_dir}" + curl -sLO "${gperf_tarball_url}" + tar -xf "${gperf_tarball}" + pushd "gperf-${gperf_version}" + # Unset $CC for configure, we will always use native for gperf + CC= ./configure --prefix="${gperf_install_dir}" + make + make install + export PATH=$PATH:"${gperf_install_dir}"/bin + popd + echo "Gperf installed successfully" } build_and_install_libseccomp() { - echo "Build and install libseccomp version ${libseccomp_version}" - mkdir -p "${libseccomp_install_dir}" - curl -sLO "${libseccomp_tarball_url}" - tar -xf "${libseccomp_tarball}" - pushd "libseccomp-${libseccomp_version}" - [ "${arch}" == $(uname -m) ] && cc_name="" || cc_name="${arch}-linux-gnu-gcc" - CC=${cc_name} ./configure --prefix="${libseccomp_install_dir}" CFLAGS="${cflags}" --enable-static --host="${arch}" - make - make install - popd - echo "Libseccomp installed successfully" + echo "Build and install libseccomp version ${libseccomp_version}" + mkdir -p "${libseccomp_install_dir}" + curl -sLO "${libseccomp_tarball_url}" + tar -xf "${libseccomp_tarball}" + pushd "libseccomp-${libseccomp_version}" + [ "${arch}" == $(uname -m) ] && cc_name="" || cc_name="${arch}-linux-gnu-gcc" + CC=${cc_name} ./configure --prefix="${libseccomp_install_dir}" CFLAGS="${cflags}" --enable-static --host="${arch}" + make + make install + popd + echo "Libseccomp installed successfully" } main() { - local libseccomp_install_dir="${1:-}" - local gperf_install_dir="${2:-}" + local libseccomp_install_dir="${1:-}" + local gperf_install_dir="${2:-}" - if [ -z "${libseccomp_install_dir}" ] || [ -z "${gperf_install_dir}" ]; then - die "Usage: ${0} " - fi + if [ -z "${libseccomp_install_dir}" ] || [ -z "${gperf_install_dir}" ]; then + die "Usage: ${0} " + fi - pushd "$workdir" - # gperf is required for building the libseccomp. - build_and_install_gperf - build_and_install_libseccomp - popd + pushd "$workdir" + # gperf is required for building the libseccomp. + build_and_install_gperf + build_and_install_libseccomp + popd } main "$@"