generated from amazon-archives/__template_Apache-2.0
-
Notifications
You must be signed in to change notification settings - Fork 37
kernel-6.12: update to 6.12.58-82.121 #333
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
mgsharm
merged 1 commit into
bottlerocket-os:develop
from
mgsharm:update_2025-12-08_6.12
Dec 9, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| From 05a7163507930b56804896818c80e92a2454ef4d Mon Sep 17 00:00:00 2001 | ||
| From cfede7055134b412d9c7a293b9064ca89a19f3d1 Mon Sep 17 00:00:00 2001 | ||
| From: Arnaldo Garcia Rincon <[email protected]> | ||
| Date: Wed, 22 Jun 2022 19:26:43 +0000 | ||
| Subject: [PATCH] Revert "kbuild: hide tools/ build targets from external | ||
|
|
@@ -10,44 +10,45 @@ they are required by the kmod kit since the 'tools/*' binaries are not | |
| distributed as part of the archive. | ||
|
|
||
| Signed-off-by: Arnaldo Garcia Rincon <[email protected]> | ||
| Signed-off-by: Gaurav Sharma <[email protected]> | ||
| --- | ||
| Makefile | 16 ++++++++-------- | ||
| 1 file changed, 8 insertions(+), 8 deletions(-) | ||
|
|
||
| diff --git a/Makefile b/Makefile | ||
| index 340da92..27269cb 100644 | ||
| index 35d423fde..9ce64894e 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -1357,14 +1357,6 @@ ifneq ($(wildcard $(resolve_btfids_O)),) | ||
| @@ -1370,14 +1370,6 @@ ifneq ($(wildcard $(resolve_btfids_O)),) | ||
| $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean | ||
| endif | ||
|
|
||
| -tools/: FORCE | ||
| - $(Q)mkdir -p $(objtree)/tools | ||
| - $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ | ||
| - $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ | ||
| - | ||
| -tools/%: FORCE | ||
| - $(Q)mkdir -p $(objtree)/tools | ||
| - $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* | ||
| - $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* | ||
| - | ||
| # --------------------------------------------------------------------------- | ||
| # Kernel selftest | ||
| @@ -2054,6 +2046,14 @@ kernelversion: | ||
|
|
||
| @@ -2080,6 +2072,14 @@ kernelversion: | ||
| image_name: | ||
| @echo $(KBUILD_IMAGE) | ||
|
|
||
| +tools/: FORCE | ||
| + $(Q)mkdir -p $(objtree)/tools | ||
| + $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ | ||
| + $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ | ||
| + | ||
| +tools/%: FORCE | ||
| + $(Q)mkdir -p $(objtree)/tools | ||
| + $(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* | ||
| + $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $* | ||
| + | ||
| PHONY += run-command | ||
| run-command: | ||
| $(Q)$(KBUILD_RUN_COMMAND) | ||
| -- | ||
| 2.47.1 | ||
| -- | ||
| 2.50.1 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The 1002-Revert-kbuild-hide-tools-build-targets-from-external.patch was reworked because AL has backported an upstream fix (amazonlinux/linux@73a722a) that removes the LDFLAGS= override from the tools/ targets in the Makefile. Our patch needed to be updated to align with this change, as the context and line numbers have shifted.