-
Notifications
You must be signed in to change notification settings - Fork 5k
WIP: Update kernel to 6.6 #20923
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
Draft
nirs
wants to merge
7
commits into
kubernetes:master
Choose a base branch
from
nirs:kernel-update
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+431
−916
Draft
WIP: Update kernel to 6.6 #20923
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
475d56c
iso: Extract buildroot target
nirs e3af683
iso: Extract iso-prepare-% target
nirs 5a19eb5
iso: Fix linux-menuconfig-% target
nirs 3af2f90
iso: Simplify linux-menuconfig-%
nirs 2a3eea1
iso: Update to kernel 6.6.92 for krunkit
nirs ae0d023
Use default architecture config for aarch64
nirs fd86b93
iso: Disable platform configs
nirs 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 |
|---|---|---|
|
|
@@ -79,7 +79,6 @@ MINIKUBE_BUCKET ?= minikube/releases | |
| MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} | ||
| MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download | ||
|
|
||
| KERNEL_VERSION ?= 5.10.207 | ||
| # latest from https://github.com/golangci/golangci-lint/releases | ||
| # update this only by running `make update-golint-version` | ||
| GOLINT_VERSION ?= v2.1.5 | ||
|
|
@@ -302,10 +301,18 @@ out/e2e-windows-amd64.exe: out/e2e-windows-amd64 | |
| minikube-iso-amd64: minikube-iso-x86_64 | ||
| minikube-iso-arm64: minikube-iso-aarch64 | ||
|
|
||
| minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso | ||
| echo $(VERSION_JSON) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/version.json | ||
| echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION | ||
| cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in | ||
| minikube-iso-%: buildroot iso-prepare-% deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python3 | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* | ||
| # x86_64 ISO is still BIOS rather than EFI because of AppArmor issues for KVM, and Gen 2 issues for Hyper-V | ||
| if [ "$*" = "aarch64" ]; then \ | ||
| mv $(BUILD_DIR)/buildroot/output-aarch64/images/boot.iso $(BUILD_DIR)/minikube-arm64.iso; \ | ||
| else \ | ||
| mv $(BUILD_DIR)/buildroot/output-x86_64/images/rootfs.iso9660 $(BUILD_DIR)/minikube-amd64.iso; \ | ||
| fi; | ||
|
|
||
| .PHONY: buildroot | ||
| buildroot: | ||
| if [ ! -d $(BUILD_DIR)/buildroot ]; then \ | ||
| mkdir -p $(BUILD_DIR); \ | ||
| git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \ | ||
|
|
@@ -315,27 +322,25 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/ | |
| git --git-dir=$(BUILD_DIR)/buildroot/.git config user.email "[email protected]"; \ | ||
| git --git-dir=$(BUILD_DIR)/buildroot/.git config user.name "Random developer"; \ | ||
| fi; | ||
|
|
||
| .PHONY: iso-preapre-% | ||
| iso-prepare-%: | ||
| echo $(VERSION_JSON) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/version.json | ||
| echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION | ||
| cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python3 | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* | ||
| # x86_64 ISO is still BIOS rather than EFI because of AppArmor issues for KVM, and Gen 2 issues for Hyper-V | ||
| if [ "$*" = "aarch64" ]; then \ | ||
| mv $(BUILD_DIR)/buildroot/output-aarch64/images/boot.iso $(BUILD_DIR)/minikube-arm64.iso; \ | ||
| else \ | ||
| mv $(BUILD_DIR)/buildroot/output-x86_64/images/rootfs.iso9660 $(BUILD_DIR)/minikube-amd64.iso; \ | ||
| fi; | ||
|
|
||
| # Change buildroot configuration for the minikube ISO | ||
| .PHONY: iso-menuconfig | ||
| iso-menuconfig-%: ## Configure buildroot configuration | ||
| iso-menuconfig-%: iso-prepare-% ## Configure buildroot configuration | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* menuconfig | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* savedefconfig | ||
|
|
||
| # Change the kernel configuration for the minikube ISO | ||
| linux-menuconfig-%: ## Configure Linux kernel configuration | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot/output-$*/build/linux-$(KERNEL_VERSION)/ menuconfig | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot/output-$*/build/linux-$(KERNEL_VERSION)/ savedefconfig | ||
| cp $(BUILD_DIR)/buildroot/output-$*/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/minikube/$*/linux_$*_defconfig | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* linux-menuconfig | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* linux-savedefconfig | ||
| $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* linux-update-defconfig | ||
|
|
||
| out/minikube-%.iso: $(shell find "deploy/iso/minikube-iso" -type f) | ||
| ifeq ($(IN_DOCKER),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
Oops, something went wrong.
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.
consider adding a a comment starting with "##"
that will be shown in "make help"
for example