From afe51f697670b09be4f7332ac9eb9be4d373512db8486964a1f3bcdf362d34aa Mon Sep 17 00:00:00 2001
From: Vasily Ulyanov <vasily.ulyanov@suse.com>
Date: Thu, 13 Jul 2023 11:45:40 +0000
Subject: [PATCH] Accepting request 1098518 from
 home:vulyanov:branches:Virtualization

- 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
---
 Dockerfile                      | 33 +++++++++++++++------------------
 virt-launcher-container.changes |  5 +++++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dd037b5..916c03a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 @@ RUN zypper -n install \
               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 ln -s ncat /usr/bin/nc
 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
diff --git a/virt-launcher-container.changes b/virt-launcher-container.changes
index 7b3b7aa..d1e253d 100644
--- a/virt-launcher-container.changes
+++ b/virt-launcher-container.changes
@@ -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>