peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-07 07:53:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1267 from kernelkit/post-post-image

Browse Source 
Move to a post post-image world

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2025-12-03 20:32:36 +01:00
committed by GitHub
parent 9def1e6873 bac11dad0f
commit ec0ed82b71
69 changed files with 1274 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/env
+10 -10
View File
@@ -74,7 +74,7 @@ get_base_img()
{
local files="$1"
local base_img_file
base_img_file=$(echo "$files" | tr ' ' '\n' | grep -- '-disk.qcow2$')
base_img_file=$(echo "$files" | tr ' ' '\n' | grep -- '.qcow2$')
echo "$envdir/qeneth/$(basename "$base_img_file")"
}
@@ -95,16 +95,16 @@ start_topology()
ln -sf "$file" "$envdir/qeneth/$filename"
done
base_img=$(get_base_img "$files")
test_img_name="${base_img%-disk.qcow2}-disk-test"
base_img_name="${base_img%-disk.qcow2}-disk"
test_img_raw="${test_img_name}.img"
base_img_raw="${base_img_name}.img"
test_img_qcow2="${test_img_name}.qcow2"
base_img_qcow2=$(get_base_img "$files")
base_img_disk="${base_img_qcow2%.qcow2}.disk"
test_img_disk="${base_img_qcow2%.qcow2}-test.disk"
test_img_qcow2="${test_img_disk%.disk}.qcow2"
qemu-img convert -f qcow2 -O raw "$base_img_qcow2" "$base_img_disk"
$testdir/inject-test-mode -b "$base_img_disk" -o "$test_img_disk"
qemu-img convert -f raw -O qcow2 "$test_img_disk" "$test_img_qcow2"
qemu-img convert -f qcow2 -O raw "$base_img" "$base_img_raw"
$testdir/inject-test-mode -b "$base_img_raw" -o "$test_img_raw"
qemu-img convert -f raw -O qcow2 "$test_img_raw" "$test_img_qcow2"
img_name=$(basename $test_img_qcow2)
sed -i "s/qn_image=\".*\"/qn_image=\"$img_name\"/" "$envdir/qeneth/topology.dot.in"
test/test.mk
+4 -4
View File
@@ -17,11 +17,11 @@ mode-qeneth := -q $(test-dir)/virt/quad
mode-host := -t $(or $(TOPOLOGY),/etc/infamy.dot)
mode-run := -t $(BINARIES_DIR)/qemu.dot
mode := $(mode-$(TEST_MODE))
INFIX_IMAGE_ID := $(call qstrip,$(INFIX_IMAGE_ID))
binaries-$(ARCH) := $(addprefix $(INFIX_IMAGE_ID),.img -disk.qcow2)
pkg-$(ARCH) := -p $(O)/images/$(addprefix $(INFIX_IMAGE_ID),.pkg)
pkg-$(ARCH) := -p $(O)/images/$(INFIX_ARTIFACT).pkg
binaries-$(ARCH) := $(INFIX_ARTIFACT).qcow2
binaries-x86_64 += OVMF.fd
binaries := $(foreach bin,$(binaries-$(ARCH)),-f $(BINARIES_DIR)/$(bin))
binaries := $(foreach bin,$(binaries-$(ARCH)),-f $(BINARIES_DIR)/$(bin))
# Common transport override for minimal defconfigs
ifneq ($(BR2_PACKAGE_ROUSETTE),y)
test/virt/quad/topology.dot.in
+1 -1
View File
@@ -9,7 +9,7 @@ graph "quad" {
edge [color="cornflowerblue", penwidth="2"];
qn_template="infix-bios-x86_64";
qn_image="infix-x86_64-disk-test.qcow2"
qn_image="infix-x86_64-test.qcow2"
qn_oui="00:a0:85";
qn_append="quiet";