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 2023-07-13 17:19:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-launcher-container (Old)
and /work/SRC/openSUSE:Factory/.virt-launcher-container.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-launcher-container"
Thu Jul 13 17:19:07 2023 rev:23 rq:1098523 version:unknown
Changes:
--------
---
/work/SRC/openSUSE:Factory/virt-launcher-container/virt-launcher-container.changes
2023-07-03 17:43:53.253107901 +0200
+++
/work/SRC/openSUSE:Factory/.virt-launcher-container.new.8922/virt-launcher-container.changes
2023-07-13 17:19:09.489333136 +0200
@@ -1,0 +2,5 @@
+Wed Jul 12 06:53:31 UTC 2023 - Vasily Ulyanov <vasily.ulya...@suse.com>
+
+- Drop TARGETARCH argument (detect arch during build)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Dockerfile ++++++
--- /var/tmp/diff_new_pack.auwfbx/_old 2023-07-13 17:19:10.145337006 +0200
+++ /var/tmp/diff_new_pack.auwfbx/_new 2023-07-13 17:19:10.149337030 +0200
@@ -10,9 +10,6 @@
# 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. Default to amd64.
-ARG TARGETARCH=amd64
# Mandatory labels for the build service:
# https://en.opensuse.org/Building_derived_containers
@@ -48,15 +45,15 @@
xorriso
#!ArchExclusiveLine: x86_64
-RUN if [ "$TARGETARCH" = "amd64" ]; then \
- zypper -n install qemu-x86 ; \
+RUN if [ "$(uname -m)" = "x86_64" ]; then \
+ zypper -n install qemu-x86 ; \
fi;
#!ArchExclusiveLine: aarch64
-RUN if [ "$TARGETARCH" = "arm64" ]; then \
- zypper -n install \
- qemu-arm \
- qemu-uefi-aarch64 ; \
+RUN if [ "$(uname -m)" = "aarch64" ]; then \
+ zypper -n install \
+ qemu-arm \
+ qemu-uefi-aarch64 ; \
fi;
RUN zypper clean -a
@@ -66,18 +63,18 @@
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 ; \
+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-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 ; \
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 ; \
+RUN if [ "$(uname -m)" = "aarch64" ]; 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;
# KubeVirt expects virtiofsd to be installed in /usr/libexec
