mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-28 12:31:04 +00:00
tools: fix static build of qemu and shimv2 on ppc64le
- statically linked qemu requires slof.bin to run, hence remove it from blacklist - By default, initrd is used for Power, modify the configuration.toml accordingly Fixes: #8458 Signed-off-by: Amulyam24 <amulmek1@in.ibm.com>
This commit is contained in:
parent
4fd2914a33
commit
08f3603123
@ -29,7 +29,6 @@ qemu_black_list=(
|
||||
*/share/*/qemu_vga.ndrv
|
||||
*/share/*/sgabios.bin
|
||||
*/share/*/skiboot.lid
|
||||
*/share/*/slof.bin
|
||||
*/share/*/trace-events-all
|
||||
*/share/*/u-boot*
|
||||
*/share/*/vgabios*
|
||||
|
@ -63,6 +63,7 @@ RUN apt-get update && apt-get upgrade -y && \
|
||||
rsync \
|
||||
zlib1g-dev${DPKG_ARCH} && \
|
||||
if [ "${ARCH}" != s390x ]; then apt-get install -y --no-install-recommends libpmem-dev${DPKG_ARCH}; fi && \
|
||||
if [ "${ARCH}" == ppc64le ]; then apt-get install -y --no-install-recommends librados-dev librbd-dev; fi && \
|
||||
GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \
|
||||
if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/
|
||||
|
@ -74,8 +74,13 @@ sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
|
||||
for vmm in ${VMM_CONFIGS}; do
|
||||
config_file="${DESTDIR}/${PREFIX}/share/defaults/kata-containers/configuration-${vmm}.toml"
|
||||
if [ -f ${config_file} ]; then
|
||||
if [ ${ARCH} == "ppc64le" ]; then
|
||||
sudo sed -i -e '/^image =/d' ${config_file}
|
||||
sudo sed -i 's/^# \(initrd =.*\)/\1/g' ${config_file}
|
||||
else
|
||||
sudo sed -i -e '/^initrd =/d' ${config_file}
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
pushd "${DESTDIR}/${PREFIX}/share/defaults/kata-containers"
|
||||
|
Loading…
Reference in New Issue
Block a user