Skip to content

fix: accept generated x86 target manifest #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tifycloud merged 1 commit into from
Jul 19, 2026
Merged

fix: accept generated x86 target manifest #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build-vm-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion tests/test_vm_manifest_selection.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down
Loading