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

Merge pull request #2896 from Jakob-Naucke/static

Browse Source 
packaging/static-build: s390x fixes
This commit is contained in:
Chelsea Mafrica 2021-10-26 11:53:34 -07:00 committed by GitHub
commit 8f33e6f593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 \
git \
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-vmxnet3.rom
*/share/*/icons
*/share/*/*.img
*/share/*/keymaps
*/share/*/multiboot.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 \
libmount-dev \
libpixman-1-dev \
libpmem-dev \
libselinux1-dev \
libtool \
make \
@ -49,6 +48,8 @@ RUN apt-get --no-install-recommends install -y \
rsync \
zlib1g-dev
RUN [ "$(uname -m)" != "s390x" ] && apt-get install -y libpmem-dev || true
ARG QEMU_REPO
RUN cd .. && git clone "${QEMU_REPO}" qemu