Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virt-launcher-container for
openSUSE:Factory checked in at 2022-01-19 00:35:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-launcher-container (Old)
and /work/SRC/openSUSE:Factory/.virt-launcher-container.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-launcher-container"
Wed Jan 19 00:35:24 2022 rev:10 rq:947223 version:unknown
Changes:
--------
---
/work/SRC/openSUSE:Factory/virt-launcher-container/virt-launcher-container.changes
2022-01-13 00:23:16.099969017 +0100
+++
/work/SRC/openSUSE:Factory/.virt-launcher-container.new.1892/virt-launcher-container.changes
2022-01-19 00:35:58.174323645 +0100
@@ -1,0 +2,6 @@
+Mon Jan 10 10:56:39 UTC 2022 - Guillaume GARDET <[email protected]>
+
+- Handle aarch64
+- Enable build only on aarch64 and x86_64
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Dockerfile ++++++
--- /var/tmp/diff_new_pack.EPRd93/_old 2022-01-19 00:35:58.674324002 +0100
+++ /var/tmp/diff_new_pack.EPRd93/_new 2022-01-19 00:35:58.674324002 +0100
@@ -3,11 +3,16 @@
#!BuildTag: %%TAGPREFIX%%/virt-launcher:%%PKG_VERSION%%.%RELEASE%
#!BuildTag: %%TAGPREFIX%%/virt-launcher:%%PKG_VERSION%%-%%PKG_RELEASE%%
+#!ExclusiveArch: x86_64 aarch64
+
# virt-launcher container image
# KUBEVIRTFROM defined in prjconf, e.g.
# BuildFlags: dockerarg:KUBEVIRTFROM=opensuse/tumbleweed
ARG KUBEVIRTFROM
FROM $KUBEVIRTFROM
+# TARGETARCH defined in prjconf, to handle architecture specific bits
+# since TARGETARCH is not defined in OBS builds yet.
+ARG TARGETARCH
# labelprefix=%%LABELPREFIX%%
PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-launcher container"
@@ -29,21 +34,42 @@
libvirt-daemon-qemu \
nftables \
qemu-tools \
- qemu-x86 \
socat \
tar \
timezone \
vim \
- xorriso && \
- zypper clean -a && \
+ xorriso
+#!ArchExclusiveLine: x86_64
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+ zypper -n install qemu-x86 ; \
+ fi;
+
+#!ArchExclusiveLine: aarch64
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+ zypper -n install \
+ qemu-arm \
+ qemu-uefi-aarch64 ; \
+ fi;
+
+RUN zypper clean -a && \
mkdir -p /usr/share/kubevirt/virt-launcher
-RUN mkdir -p /usr/share/OVMF && \
+RUN mkdir -p /usr/share/OVMF
+
+#!ArchExclusiveLine: x86_64
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
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-code.bin /usr/share/OVMF/OVMF_CODE.cc.fd && \
ln -s ../qemu/ovmf-x86_64-smm-ms-code.bin
/usr/share/OVMF/OVMF_CODE.secboot.fd && \
- ln -s ../qemu/ovmf-x86_64-smm-ms-vars.bin
/usr/share/OVMF/OVMF_VARS.secboot.fd
+ ln -s ../qemu/ovmf-x86_64-smm-ms-vars.bin
/usr/share/OVMF/OVMF_VARS.secboot.fd ; \
+ fi;
+
+#!ArchExclusiveLine: aarch64
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+ 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 ; \
+ fi;
COPY augconf /augconf
