Skip to content

kmod-parser: modules.builtin duplicate handling - #281

Merged
ddiss merged 1 commit into
rapido-linux:masterfrom
ddiss:kmod-parser-dups
Oct 22, 2026
Merged

ddiss merged 1 commit into
rapido-linux:masterfrom
ddiss:kmod-parser-dups

Conversation

@ddiss

@ddiss ddiss commented Oct 22, 2026 •

Copy link
Copy Markdown
Collaborator
The following changes since commit 6e00018339ae714bfbbd54044effdcc7640e8838:

  libiscsi_test_tool: export env vars for mutual CHAP (2026-10-22 14:15:01 +1100)

are available in the Git repository at:

  https://github.com/ddiss/rapido.git kmod-parser-dups

for you to fetch changes up to 6f97b30b42c810cd3b147428b929476629d0ffe5:

  kmod-parser: ignore modules.builtin duplicates (2026-10-22 20:52:16 +1100)

----------------------------------------------------------------
Sangeetha Thackarajan (1):
      kmod-parser: ignore modules.builtin duplicates

 src/kmod-parser/src/lib.rs | 50 ++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 19 deletions(-)

@ddiss

ddiss commented Oct 22, 2026

Copy link
Copy Markdown
Collaborator Author

v2: run rustfmt

Commit 5afc74d ("kmod-parser: fail with duplicate dep/builtin modules")
incorrectly assumed unique module names. We need to handle then as e.g.
6.12.113+deb13-cloud-arm64/modules.builtin contains:
  kernel/drivers/bus/arm-cci.ko
  kernel/drivers/perf/arm-cci.ko

As a workaround, ignore modules.builtin duplicates and retain the first
entry, which may come from modules.dep. Duplicate entries in (only)
modules.dep will still result in failure, but we can hopefully get away
with that for now.

Rework the test to check for the new behaviour.

Link: rapido-linux#279
Signed-off-by: Sangeetha Thackarajan <[email protected]>
Signed-off-by: David Disseldorp <[email protected]>
@ddiss

ddiss commented Oct 22, 2026

Copy link
Copy Markdown
Collaborator Author

v3: squash and add Sangeetha's sign-off following discussion

@ddiss
ddiss marked this pull request as ready for review October 22, 2026 09:57
@ddiss
ddiss merged commit 6f97b30 into rapido-linux:master Oct 22, 2026
2 checks passed
@ddiss
ddiss deleted the kmod-parser-dups branch October 22, 2026 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants