Skip to content

DLPX-96594 fix linux-kernel-generic upstream merge for 6.17#388

Open
lyriclake wants to merge 1 commit intodevelopfrom
dlpx/pr/lyriclake/512b6eee-2f55-49da-b0ba-5bc2fe9eb09e
Open

DLPX-96594 fix linux-kernel-generic upstream merge for 6.17#388
lyriclake wants to merge 1 commit intodevelopfrom
dlpx/pr/lyriclake/512b6eee-2f55-49da-b0ba-5bc2fe9eb09e

Conversation

@lyriclake
Copy link

@lyriclake lyriclake commented Feb 26, 2026

Problem

After updating to kernel 6.17, linux-kernel-generic was failing to build the perf tool with:

15:14:09 mmap.c: In function ‘perf_mmap__read’:
15:14:09 mmap.c:217:38: error: invalid use of undefined type ‘union perf_event’
15:14:09 217 | if (diff >= (int)sizeof(event->header)) {
15:14:09 | ^~
15:14:09 mmap.c:221:29: error: invalid use of undefined type ‘union perf_event’
15:14:09 221 | size = event->header.size;
15:14:09 | ^~
15:14:09 mmap.c:223:40: error: invalid use of undefined type ‘union perf_event’
15:14:09 223 | if (size < sizeof(event->header) || diff < (int)size)
15:14:09 | ^~
15:14:09 make[5]: *** [/export/home/delphix/jenkins/workspace/linux-pkg/develop/build-package/linux-kernel-generic/pre-push/linux-pkg/packages/linux-kernel-generic/tmp/repo/debian/build/tools-perarch/tools/build/Makefile.build:86: /export/home/delphix/jenkins/workspace/linux-pkg/develop/build-package/linux-kernel-generic/pre-push/linux-pkg/packages/linux-kernel-generic/tmp/repo/debian/build/tools-perarch/tools/perf/libperf/mmap.o] Error 1

Solution

I did not root-cause the perf compilation failure. However, in default-package-config.sh we have:
   # do_tools_common=false
   #   We do not need to build linux-tools-common package and we
   #   install it directly from our package mirror.

We don't have any custom modifications to perf, and it is provided by linux-tools-common, so we don't need to be building it. This PR adds do_tools_perf=false.

Testing Done

https://selfservice-jenkins.eng-tools-prd.aws.delphixcloud.com/job/appliance-build-orchestrator-pre-push/13331/

@lyriclake lyriclake force-pushed the dlpx/pr/lyriclake/512b6eee-2f55-49da-b0ba-5bc2fe9eb09e branch 2 times, most recently from c73de93 to becd38a Compare February 26, 2026 22:09
@lyriclake lyriclake marked this pull request as ready for review February 26, 2026 22:17
Copy link

@dbjwhs-perforce dbjwhs-perforce left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit boy in the house.

@lyriclake lyriclake force-pushed the dlpx/pr/lyriclake/512b6eee-2f55-49da-b0ba-5bc2fe9eb09e branch from becd38a to 150606a Compare February 26, 2026 22:36
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