From 1dbcdde79085e227fa2a5b0fc32881ab4467299d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 4 Apr 2021 16:16:36 +0000
Subject: build: qemu: do not use symlinks on generated images

Jenkins can not properly deal with symbolic links.

(cherry picked from commit 5c359621dfff2b3d134547aa3be6cddc245a2a5e)
---
 scripts/build-qemu-image | 3 ++-
 scripts/copy-image       | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build-qemu-image b/scripts/build-qemu-image
index 7687db36..349f4a5d 100755
--- a/scripts/build-qemu-image
+++ b/scripts/build-qemu-image
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016 VyOS maintainers and contributors
+# Copyright (C) 2016-2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -31,3 +31,4 @@ export PACKER_LOG=1
 mkdir -p "${PACKER_BUILD_DIR}"
 
 packer build -only=qemu-image scripts/packer.json
+cp "${PACKER_BUILD_DIR}/qemu/vyos_qemu_image.img" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.qcow2"
diff --git a/scripts/copy-image b/scripts/copy-image
index 15e7cd53..4196d06d 100755
--- a/scripts/copy-image
+++ b/scripts/copy-image
@@ -4,6 +4,4 @@ BUILD_DIR="$(scripts/query-json build/build-config.json build_dir)"
 BUILD_ARCH="$(scripts/query-json build/build-config.json architecture)"
 VERSION="$(cat $BUILD_DIR/version)"
 
-ln -rnsf "$BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso"
-
-
+cp "$BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso"
-- 
cgit v1.2.3