fix(autopatch): Rewrote config.yaml to match updated llvm spec structure: replaced failing '%if %{maj_ver} >=18 / %global cfg_file_conte #2

Merged
eabdullin merged 1 commits from agent-fix/a10-20260520-000928 into a10 2026-05-20 10:50:34 +00:00
Owner

Automated fix by autopatch agent.

Summary: Rewrote config.yaml to match updated llvm spec structure: replaced failing '%if %{maj_ver} >=18 / %global cfg_file_content --gcc-triple=...' action with the new '%global gcc_triple' based approach from a10s reference; removed 6 actions whose find patterns were already applied upstream (BPF;WebAssembly;RISCV, runtimes/offload block, LLVM_ENABLE_RUNTIMES, offload file removal, check-openmp, liborc_rt, libomptarget); retained and adapted 9 actions still needed for the current spec.

Root cause

The upstream llvm spec (c10, v21) changed significantly: (1) the gcc_triple handling moved from a '%if %{maj_ver} >=18' conditional to a bare '%global gcc_triple' macro, requiring the find string to be updated to match the a10s reference approach; (2) several riscv64 changes the old a10 config was trying to apply (BPF/WebAssembly targets, LLVM_ENABLE_RUNTIMES, offload/libomptarget exclusions, liborc_rt arch guard, check-openmp arch guard) had already been applied in the upstream spec; (3) 9 actions remain valid and still needed: the x86_64_v2 gcc_triple and cfg_file_content arch guards, riscv64 reduce_debuginfo and _find_debuginfo_dwz_opts, and riscv64 guards for check-lit/check-llvm/check-clang/check-clang-tools/check-lld test targets.

Original error

Type: ActionNotAppliedError

Traceback (most recent call last):
  File "/root/autopatch-tool/src/webserv.py", line 77, in debrand_packages
    result = apply_modifications(
  File "/root/autopatch-tool/src/debranding.py", line 111, in apply_modifications
    config.apply_actions(rpms_working_dir + f"/{package}")
  File "/root/autopatch-tool/src/actions_handler.py", line 925, in apply_actions
    action.execute(Path(package_path))
  File "/root/autopatch-tool/src/actions_handler.py", line 472, in execute
    process_lines(
  File "/root/autopatch-tool/src/actions_handler.py", line 233, in process_lines
    raise ActionNotAppliedError(
actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['%if %{maj_ver} >=18', '%global cfg_file_content --gcc-triple=%{_target_cpu}-redhat-linux']' in /root/autopatch-tool/src/rpms-namespace/llvm/llvm.spec

Package: llvm | Webhook branch: c10

Automated fix by autopatch agent. **Summary:** Rewrote config.yaml to match updated llvm spec structure: replaced failing '%if %{maj_ver} >=18 / %global cfg_file_content --gcc-triple=...' action with the new '%global gcc_triple' based approach from a10s reference; removed 6 actions whose find patterns were already applied upstream (BPF;WebAssembly;RISCV, runtimes/offload block, LLVM_ENABLE_RUNTIMES, offload file removal, check-openmp, liborc_rt, libomptarget); retained and adapted 9 actions still needed for the current spec. ### Root cause The upstream llvm spec (c10, v21) changed significantly: (1) the gcc_triple handling moved from a '%if %{maj_ver} >=18' conditional to a bare '%global gcc_triple' macro, requiring the find string to be updated to match the a10s reference approach; (2) several riscv64 changes the old a10 config was trying to apply (BPF/WebAssembly targets, LLVM_ENABLE_RUNTIMES, offload/libomptarget exclusions, liborc_rt arch guard, check-openmp arch guard) had already been applied in the upstream spec; (3) 9 actions remain valid and still needed: the x86_64_v2 gcc_triple and cfg_file_content arch guards, riscv64 reduce_debuginfo and _find_debuginfo_dwz_opts, and riscv64 guards for check-lit/check-llvm/check-clang/check-clang-tools/check-lld test targets. ### Original error **Type:** `ActionNotAppliedError` ``` Traceback (most recent call last): File "/root/autopatch-tool/src/webserv.py", line 77, in debrand_packages result = apply_modifications( File "/root/autopatch-tool/src/debranding.py", line 111, in apply_modifications config.apply_actions(rpms_working_dir + f"/{package}") File "/root/autopatch-tool/src/actions_handler.py", line 925, in apply_actions action.execute(Path(package_path)) File "/root/autopatch-tool/src/actions_handler.py", line 472, in execute process_lines( File "/root/autopatch-tool/src/actions_handler.py", line 233, in process_lines raise ActionNotAppliedError( actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['%if %{maj_ver} >=18', '%global cfg_file_content --gcc-triple=%{_target_cpu}-redhat-linux']' in /root/autopatch-tool/src/rpms-namespace/llvm/llvm.spec ``` --- Package: `llvm` | Webhook branch: `c10`
eabdullin added 1 commit 2026-05-20 00:09:29 +00:00
Rewrote config.yaml to match updated llvm spec structure: replaced failing '%if %{maj_ver} >=18 / %global cfg_file_content --gcc-triple=...' action with the new '%global gcc_triple' based approach fro
eabdullin merged commit bcbbd7de75 into a10 2026-05-20 10:50:34 +00:00
eabdullin deleted branch agent-fix/a10-20260520-000928 2026-05-20 10:50:34 +00:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: autopatch/llvm#2
No description provided.