autopatch/kernel
5
0
Fork 1
Code Issues Pull Requests Releases Activity

fix(autopatch): Fixed three replace actions that broke when upstream added new Nvidia certs (SOURCE107/108), changed the SBAT suffix mec #10

Merged
alukoshko merged 1 commits from agent-fix/a10-20260717-115748 into a10 2026-07-17 12:18:44 +00:00
Conversation 0 Commits 1 Files Changed 1 +37 -17
eabdullin commented 2026-07-17 11:57:48 +00:00
Owner
Copy Link

Automated fix by autopatch agent.

Summary: Fixed three replace actions that broke when upstream added new Nvidia certs (SOURCE107/108), changed the SBAT suffix mechanism from shell variables to RPM macros, and already enabled Btrfs in several non-debug kernel configs.

Root cause

Three separate ReplaceAction failures were found and fixed, guided by the a10s reference branch which already had all three fixes:

  • Btrfs config target too broad (kernel*.config): Upstream enabled CONFIG_BTRFS_FS=m in kernel-ppc64le-rhel.config, kernel-riscv64-rhel.config, kernel-s390x-rhel.config, and kernel-x86_64-rhel.config — so # CONFIG_BTRFS_FS is not set no longer exists there. The broad kernel*.config target was replaced with 7 per-arch specific targets (all kernel*aarch64*.config, plus individual debug/rt/zfcpdump targets), and the 7-line replacement block was simplified to just CONFIG_BTRFS_FS=m since the surrounding # CONFIG_BTRFS_ASSERT, # CONFIG_BTRFS_DEBUG, POSIX_ACL, REF_VERIFY, and RUN_SANITY_TESTS lines are already present in the upstream configs (the non-existent CONFIG_BTRFS_FS_CHECK_INTEGRITY line was also removed).

  • Nvidia cert bundle find mismatch (spec): Upstream added two new Nvidia certs — SOURCE107: nvidiajetsonsoc.x509 and SOURCE108: nvidiabfdpu.x509 — between the nvidiagpuoot001.pem line and the final cat command. The find value was updated to match the new 4-line block, and almalinuxnvidia1.x509 was moved from SOURCE107 to SOURCE109 (avoiding collision with the upstream SOURCE107). The replace block now keeps jetsonsoc and bfdpu and appends almalinuxnvidia.pem as SOURCE109 in the cert bundle.

  • SBAT suffix mechanism changed (spec): Upstream replaced the shell-variable pattern SBATsuffix="centos" inside a build script with an RPM macro %global sbat_suffix centos at the top of the spec. The find/replace strings were updated to match the new %global sbat_suffix form.

Original error

Type: ActionNotAppliedError

Traceback (most recent call last):
  File "/root/autopatch-tool/src/webserv.py", line 89, in debrand_packages
    result = apply_modifications(
  File "/root/autopatch-tool/src/debranding.py", line 120, in apply_modifications
    config.apply_actions(rpms_working_dir + f"/{package}")
  File "/root/autopatch-tool/src/actions_handler.py", line 938, in apply_actions
    action.execute(Path(package_path))
  File "/root/autopatch-tool/src/actions_handler.py", line 475, in execute
    process_lines(
  File "/root/autopatch-tool/src/actions_handler.py", line 236, in process_lines
    raise ActionNotAppliedError(
actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['# CONFIG_BTRFS_FS is not set']' in /root/autopatch-tool/src/rpms-namespace/kernel/kernel-ppc64le-rhel.config

Package: kernel | Webhook branch: c10

Automated fix by autopatch agent. **Summary:** Fixed three replace actions that broke when upstream added new Nvidia certs (SOURCE107/108), changed the SBAT suffix mechanism from shell variables to RPM macros, and already enabled Btrfs in several non-debug kernel configs. ### Root cause Three separate `ReplaceAction` failures were found and fixed, guided by the a10s reference branch which already had all three fixes: - **Btrfs config target too broad** (`kernel*.config`): Upstream enabled `CONFIG_BTRFS_FS=m` in `kernel-ppc64le-rhel.config`, `kernel-riscv64-rhel.config`, `kernel-s390x-rhel.config`, and `kernel-x86_64-rhel.config` — so `# CONFIG_BTRFS_FS is not set` no longer exists there. The broad `kernel*.config` target was replaced with 7 per-arch specific targets (all `kernel*aarch64*.config`, plus individual debug/rt/zfcpdump targets), and the 7-line replacement block was simplified to just `CONFIG_BTRFS_FS=m` since the surrounding `# CONFIG_BTRFS_ASSERT`, `# CONFIG_BTRFS_DEBUG`, `POSIX_ACL`, `REF_VERIFY`, and `RUN_SANITY_TESTS` lines are already present in the upstream configs (the non-existent `CONFIG_BTRFS_FS_CHECK_INTEGRITY` line was also removed). - **Nvidia cert bundle find mismatch** (`spec`): Upstream added two new Nvidia certs — `SOURCE107: nvidiajetsonsoc.x509` and `SOURCE108: nvidiabfdpu.x509` — between the `nvidiagpuoot001.pem` line and the final `cat` command. The `find` value was updated to match the new 4-line block, and `almalinuxnvidia1.x509` was moved from `SOURCE107` to `SOURCE109` (avoiding collision with the upstream `SOURCE107`). The `replace` block now keeps jetsonsoc and bfdpu and appends `almalinuxnvidia.pem` as SOURCE109 in the cert bundle. - **SBAT suffix mechanism changed** (`spec`): Upstream replaced the shell-variable pattern `SBATsuffix="centos"` inside a build script with an RPM macro `%global sbat_suffix centos` at the top of the spec. The `find`/`replace` strings were updated to match the new `%global sbat_suffix` form. ### Original error **Type:** `ActionNotAppliedError` ``` Traceback (most recent call last): File "/root/autopatch-tool/src/webserv.py", line 89, in debrand_packages result = apply_modifications( File "/root/autopatch-tool/src/debranding.py", line 120, in apply_modifications config.apply_actions(rpms_working_dir + f"/{package}") File "/root/autopatch-tool/src/actions_handler.py", line 938, in apply_actions action.execute(Path(package_path)) File "/root/autopatch-tool/src/actions_handler.py", line 475, in execute process_lines( File "/root/autopatch-tool/src/actions_handler.py", line 236, in process_lines raise ActionNotAppliedError( actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['# CONFIG_BTRFS_FS is not set']' in /root/autopatch-tool/src/rpms-namespace/kernel/kernel-ppc64le-rhel.config ``` --- Package: `kernel` | Webhook branch: `c10`
eabdullin added 1 commit 2026-07-17 11:57:49 +00:00 
Fixed three replace actions that broke when upstream added new Nvidia certs (SOURCE107/108), changed the SBAT suffix mechanism from shell variables to RPM macros, and already enabled Btrfs in several
alukoshko merged commit 3972f069be into a10 2026-07-17 12:18:44 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
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/kernel#10
No description provided.
Delete Branch "agent-fix/a10-20260717-115748"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?