From 75f35c4dffd2ead797b3128fbffa60055f61296a Mon Sep 17 00:00:00 2001 From: tifycloud <223196928+tifycloud@users.noreply.github.com> Date: Sun, 19 Jul 2026 16:14:59 +0800 Subject: [PATCH] fix: accept generated x86 target manifest --- scripts/build-vm-image.sh | 2 +- tests/test_vm_manifest_selection.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/build-vm-image.sh b/scripts/build-vm-image.sh index cbca1d3..492309c 100755 --- a/scripts/build-vm-image.sh +++ b/scripts/build-vm-image.sh @@ -36,7 +36,7 @@ select_x86_64_release_manifest() { local target_dir="$1" local openwrt_version="$2" local built_image_basename="$3" - local expected_basename="openwrt-${openwrt_version}-x86-64.manifest" + local expected_basename="openwrt-${openwrt_version}-x86-64-generic.manifest" local image_derived_basename="${built_image_basename%.img.gz}.manifest" local candidate local candidate_basename diff --git a/tests/test_vm_manifest_selection.sh b/tests/test_vm_manifest_selection.sh index 5998893..f690346 100755 --- a/tests/test_vm_manifest_selection.sh +++ b/tests/test_vm_manifest_selection.sh @@ -17,7 +17,7 @@ trap 'rm -rf "$tmp_dir"' EXIT version="25.12.5" image_basename="openwrt-${version}-x86-64-generic-ext4-combined.img.gz" -manifest_basename="openwrt-${version}-x86-64.manifest" +manifest_basename="openwrt-${version}-x86-64-generic.manifest" image_derived_manifest="${image_basename%.img.gz}.manifest" release_manifest_basename="NexaWrt-x86_64-v0.1.0-rc.1-generic-ext4-combined.manifest" @@ -67,6 +67,14 @@ if (select_x86_64_release_manifest "$unique_symlink_dir" "$version" "$image_base fail_test "selector accepted a unique symlink manifest" fi +wrong_target_name_dir="$tmp_dir/wrong-target-name/bin/targets/x86/64" +mkdir -p "$wrong_target_name_dir" +printf 'fake image bytes\n' > "$wrong_target_name_dir/$image_basename" +printf 'wrong target name\n' > "$wrong_target_name_dir/openwrt-${version}-x86-64.manifest" +if (select_x86_64_release_manifest "$wrong_target_name_dir" "$version" "$image_basename" >/dev/null 2>&1); then + fail_test "selector accepted the obsolete target manifest name without the generic profile" +fi + abnormal_dir="$tmp_dir/abnormal/bin/targets/x86/64" mkdir -p "$abnormal_dir" printf 'fake image bytes\n' > "$abnormal_dir/$image_basename"