github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 13:14:33 +00:00
Code Issues Projects Releases Wiki Activity

packaging/static-build: s390x fixes

Browse Source 
- Install OpenSSL for key generation in kernel build
- Do not install libpmem
- Do not exclude `*/share/*/*.img` files in QEMU tarball since among
  them are boot loader files critical for IPLing.

Fixes: #2895
Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
This commit is contained in:
Jakob Naucke 2021-10-25 18:47:35 +02:00
parent 3d0fe433c6
commit d2a7b6ff4a
No known key found for this signature in database
GPG Key ID: 45FA1C7D310C0EBE
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/static-build/kernel/Dockerfile
View File

@ -15,4 +15,6 @@ RUN apt install -y \
flex \ flex \
git \ git \
iptables \ iptables \
libelf-dev \ libelf-dev
RUN [ "$(uname -m)" = "s390x" ] && apt-get install -y libssl-dev || true

1
tools/packaging/static-build/qemu.blacklist
View File

@ -16,7 +16,6 @@ qemu_black_list=(
*/share/*/efi-rtl8139.rom */share/*/efi-rtl8139.rom
*/share/*/efi-vmxnet3.rom */share/*/efi-vmxnet3.rom
*/share/*/icons */share/*/icons
*/share/*/*.img
*/share/*/keymaps */share/*/keymaps
*/share/*/multiboot.bin */share/*/multiboot.bin
*/share/*/npcm7xx_bootrom.bin */share/*/npcm7xx_bootrom.bin

3
tools/packaging/static-build/qemu/Dockerfile
View File

@ -36,7 +36,6 @@ RUN apt-get --no-install-recommends install -y \
libltdl-dev \ libltdl-dev \
libmount-dev \ libmount-dev \
libpixman-1-dev \ libpixman-1-dev \
libpmem-dev \
libselinux1-dev \ libselinux1-dev \
libtool \ libtool \
make \ make \
@ -49,6 +48,8 @@ RUN apt-get --no-install-recommends install -y \
rsync \ rsync \
zlib1g-dev zlib1g-dev
RUN [ "$(uname -m)" != "s390x" ] && apt-get install -y libpmem-dev || true
ARG QEMU_REPO ARG QEMU_REPO
RUN cd .. && git clone "${QEMU_REPO}" qemu RUN cd .. && git clone "${QEMU_REPO}" qemu