pool/virt-launcher-container
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1098518 from home:vulyanov:branches:Virtualization

Browse Source 
- Drop TARGETARCH argument (detect arch during build)

OBS-URL: https://build.opensuse.org/request/show/1098518
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-launcher-container?expand=0&rev=40
This commit is contained in:
Vasily Ulyanov 2023-07-13 11:45:40 +00:00 committed by Git OBS Bridge
parent cda445b6fc
commit afe51f6976
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -10,9 +10,6 @@
# BuildFlags: dockerarg:KUBEVIRTFROM=opensuse/tumbleweed # BuildFlags: dockerarg:KUBEVIRTFROM=opensuse/tumbleweed
ARG KUBEVIRTFROM ARG KUBEVIRTFROM
FROM $KUBEVIRTFROM FROM $KUBEVIRTFROM
# TARGETARCH defined in prjconf, to handle architecture specific bits
# since TARGETARCH is not defined in OBS builds yet. Default to amd64.
ARG TARGETARCH=amd64
# Mandatory labels for the build service: # Mandatory labels for the build service:
# https://en.opensuse.org/Building_derived_containers # https://en.opensuse.org/Building_derived_containers
@ -48,12 +45,12 @@ RUN zypper -n install \
xorriso xorriso
#!ArchExclusiveLine: x86_64 #!ArchExclusiveLine: x86_64
RUN if [ "$TARGETARCH" = "amd64" ]; then \ RUN if [ "$(uname -m)" = "x86_64" ]; then \
zypper -n install qemu-x86 ; \ zypper -n install qemu-x86 ; \
fi; fi;
#!ArchExclusiveLine: aarch64 #!ArchExclusiveLine: aarch64
RUN if [ "$TARGETARCH" = "arm64" ]; then \ RUN if [ "$(uname -m)" = "aarch64" ]; then \
zypper -n install \ zypper -n install \
qemu-arm \ qemu-arm \
qemu-uefi-aarch64 ; \ qemu-uefi-aarch64 ; \
@ -66,7 +63,7 @@ RUN ln -s ncat /usr/bin/nc
RUN mkdir -p /usr/share/OVMF RUN mkdir -p /usr/share/OVMF
#!ArchExclusiveLine: x86_64 #!ArchExclusiveLine: x86_64
RUN if [ "$TARGETARCH" = "amd64" ]; then \ RUN if [ "$(uname -m)" = "x86_64" ]; then \
ln -s ../qemu/ovmf-x86_64-code.bin /usr/share/OVMF/OVMF_CODE.fd && \ ln -s ../qemu/ovmf-x86_64-code.bin /usr/share/OVMF/OVMF_CODE.fd && \
ln -s ../qemu/ovmf-x86_64-vars.bin /usr/share/OVMF/OVMF_VARS.fd && \ ln -s ../qemu/ovmf-x86_64-vars.bin /usr/share/OVMF/OVMF_VARS.fd && \
ln -s ../qemu/ovmf-x86_64-code.bin /usr/share/OVMF/OVMF_CODE.cc.fd && \ ln -s ../qemu/ovmf-x86_64-code.bin /usr/share/OVMF/OVMF_CODE.cc.fd && \
@ -75,7 +72,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
fi; fi;
#!ArchExclusiveLine: aarch64 #!ArchExclusiveLine: aarch64
RUN if [ "$TARGETARCH" = "arm64" ]; then \ RUN if [ "$(uname -m)" = "aarch64" ]; then \
ln -s ../qemu/aavmf-aarch64-code.bin /usr/share/OVMF/AAVMF_CODE.fd && \ ln -s ../qemu/aavmf-aarch64-code.bin /usr/share/OVMF/AAVMF_CODE.fd && \
ln -s ../qemu/aavmf-aarch64-vars.bin /usr/share/OVMF/AAVMF_VARS.fd ; \ ln -s ../qemu/aavmf-aarch64-vars.bin /usr/share/OVMF/AAVMF_VARS.fd ; \
fi; fi;

5
virt-launcher-container.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 12 06:53:31 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Drop TARGETARCH argument (detect arch during build)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 15 16:59:48 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com> Thu Jun 15 16:59:48 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>