Skip to content

mctp-2.4#1010

Closed
williamspatrick wants to merge 1 commit intoopenembedded:masterfrom
williamspatrick:master
Closed

mctp-2.4#1010
williamspatrick wants to merge 1 commit intoopenembedded:masterfrom
williamspatrick:master

Conversation

@williamspatrick
Copy link
Copy Markdown
Contributor

@williamspatrick williamspatrick commented Oct 22, 2025 •
edited
Loading

mctp-2.4 was released. It includes a previously submitted patch,
so drop that.

Signed-off-by: Patrick Williams patrick@stwcx.xyz

petermarko
petermarko reviewed Oct 22, 2025
View reviewed changes
@kraj
Copy link
Copy Markdown
Contributor

kraj commented Oct 24, 2025

fails to build on musl systems

| FAILED: [code=1] mctp-bench.p/src_mctp-bench.c.o
| ccache aarch64-yoe-linux-musl-clang -mcpu=cortex-a72+crc+nocrypto --dyld-prefix=/usr -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/recipe-sysroot -Imctp-bench.p -I. -I../sources/mctp-2.3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wno-unused-parameter -O2 -g -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/sources/mctp-2.3=/usr/src/debug/mctp/2.3 -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/build=/usr/src/debug/mctp/2.3 -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/recipe-sysroot= -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/recipe-sysroot-native= -pipe -MD -MQ mctp-bench.p/src_mctp-bench.c.o -MF mctp-bench.p/src_mctp-bench.c.o.d -o mctp-bench.p/src_mctp-bench.c.o -c ../sources/mctp-2.3/src/mctp-bench.c
| In file included from ../sources/mctp-2.3/src/mctp-bench.c:16:
| ../recipe-sysroot/usr/include/sys/prctl.h:88:8: error: redefinition of 'prctl_mm_map'
|    88 | struct prctl_mm_map {
|       |        ^
| ../recipe-sysroot/usr/include/linux/prctl.h:134:8: note: previous definition is here
|   134 | struct prctl_mm_map {
|       |        ^
| 1 error generated.

@williamspatrick
Copy link
Copy Markdown
Contributor Author

williamspatrick commented Oct 24, 2025

@jk-ozlabs - Can you investigate / fix this in the mctp repo?

@jk-ozlabs
Copy link
Copy Markdown
Contributor

jk-ozlabs commented Oct 27, 2025

PR for mctp: CodeConstruct/mctp#125

@jk-ozlabs
Copy link
Copy Markdown
Contributor

jk-ozlabs commented Oct 27, 2025

... and maybe we should be covering this in CI, issue for that here: CodeConstruct/mctp#126

@williamspatrick
Copy link
Copy Markdown
Contributor Author

williamspatrick commented Oct 27, 2025

PR for mctp: CodeConstruct/mctp#125

Can we tag a v2.3.1 with this fix?

@jk-ozlabs
Copy link
Copy Markdown
Contributor

jk-ozlabs commented Oct 28, 2025

We don't really have a need (at this stage) for patchlevel vs minor version bumps, so I have tagged 2.4: CodeConstruct/mctp@8b019a3

@williamspatrick williamspatrick changed the title mctp-2.3 mctp-2.4 Oct 28, 2025
@williamspatrick
Copy link
Copy Markdown
Contributor Author

williamspatrick commented Oct 28, 2025

@kraj - I updated this PR to include a commit for the 2.4 tag from @jk-ozlabs . Let me know if you'd prefer that these are squashed together.

@kraj
Copy link
Copy Markdown
Contributor

kraj commented Oct 29, 2025

@kraj - I updated this PR to include a commit for the 2.4 tag from @jk-ozlabs . Let me know if you'd prefer that these are squashed together.

@williamspatrick ideally, I like rebases more than merged to keep history linear. So please squash and rebase

@williamspatrick
mctp: upgrade 2.1 -> 2.4
895a520 
mctp-2.4 was released.  It includes a previously submitted patch,
so drop that.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
@williamspatrick
Copy link
Copy Markdown
Contributor Author

williamspatrick commented Oct 29, 2025

@williamspatrick ideally, I like rebases more than merged to keep history linear. So please squash and rebase

Done.

@kraj
Copy link
Copy Markdown
Contributor

kraj commented Oct 30, 2025

merged with 5a4c632

@kraj kraj closed this Oct 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@petermarko petermarko petermarko left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@williamspatrick @kraj @jk-ozlabs @petermarko