Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ else
PKGS_$(ZARCH)=$(shell find pkg -maxdepth 1 -type d | grep -Ev "eve|alpine|sources|kube|external-boot-image$$")
# nvidia platform requires more space
ifeq (, $(findstring nvidia,$(PLATFORM)))
ROOTFS_MAXSIZE_MB=290
ROOTFS_MAXSIZE_MB=295

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this the actual size (5MB larger?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@eriknordmark rootfs is about 2 MiB larger, exact number is in "Changelog notes" section

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

But the current master rootfs is 277MB so why do you need to increase the max past 290?

else
ROOTFS_MAXSIZE_MB=10240
endif
Expand Down
1 change: 1 addition & 0 deletions kernel-commits.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
KERNEL_COMMIT_amd64_next_generic = a65e45508b45
KERNEL_COMMIT_amd64_v6.12.96_generic = 5ec53c5d956c

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we remove it from the list? That's the old one....

KERNEL_COMMIT_amd64_v6.18.46_generic = daa483f487da
KERNEL_COMMIT_arm64_v5.10.192_nvidia-jp5 = 2e0dcfd3260d
KERNEL_COMMIT_arm64_v5.15.136_nvidia-jp6 = 4929f15eda41
KERNEL_COMMIT_arm64_v6.1.155_generic = 417a12ac3d50
Expand Down
7 changes: 5 additions & 2 deletions kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
# SPDX-License-Identifier: Apache-2.0
#
# This file is included by the main Makefile.
# Four variables are used as input for the kernel build:
# Five variables are used as input for the kernel build:
# ZARCH - architecture (amd64, arm64)
# PLATFORM - platform (generic, nvidia, rt, imx*) based on these two
# variables we set kernel version, commit hash and branch
# when new kernel is built and pushed to the corresponding
# dockerhub
# HV - hypervisor (kvm, k, xen, mini)
# KERNEL_COMMIT_xxx variable must be manually updated
# KERNEL_CONFIG_FLAVOR - optional, used to select kernel's docker tag
# which corresponds to the kernel config file
Expand Down Expand Up @@ -35,10 +36,12 @@ ifeq (, $(filter $(PLATFORM), $(PLATFORMS_$(ZARCH))))
endif

ifeq ($(ZARCH), amd64)
KERNEL_VERSION=v6.12.96
KERNEL_VERSION=v6.18.46
KERNEL_FLAVOR=generic
ifeq ($(PLATFORM), rt)
KERNEL_CONFIG_FLAVOR=rt
else ifeq ($(HV), k)
KERNEL_CONFIG_FLAVOR=hwe
else
KERNEL_CONFIG_FLAVOR=core
endif
Expand Down
Loading