deps: PR opencomputeproject#1130 (kernel 6.18 LTS + machine kernel configs)

Squashed content of PR opencomputeproject#1130 (delta over opencomputeproject#1129), pulled in as a dependency.

Signed-off-by: Brad House <bhouse@nexthop.ai>

Author: bhouse-nexthop

build-config/conf/kernel/linux.armv8a.config

@@ -16,9 +16,9 @@
 #-------------------------------------------------------------------------------
 # Need the Linux kernel downloaded before building xtools
 
-LINUX_VERSION		?= 5.4
+LINUX_VERSION		?= 6.18
 LINUX_MAJOR_VERSION	= $(firstword $(subst ., ,$(LINUX_VERSION)))
-LINUX_MINOR_VERSION	?= 86
+LINUX_MINOR_VERSION	?= 35
 LINUX_RELEASE		?= $(LINUX_VERSION).$(LINUX_MINOR_VERSION)
 LINUX_TARBALL		?= linux-$(LINUX_RELEASE).tar.xz
 export LINUX_TARBALL

build-config/conf/kernel/linux.x86_64.config

@@ -14,7 +14,12 @@
 
 #-------------------------------------------------------------------------------
 
-LINUX_CONFIG 		?= conf/kernel/$(LINUX_RELEASE)/linux.$(ONIE_ARCH).config
+# Prefer a version-specific kernel config if a platform ships one (the legacy
+# per-version configs under conf/kernel/<release>/ are kept for the older
+# machine kernels), otherwise fall back to the shared, non-versioned base.
+# olddefconfig (see the .config recipe below) reconciles whichever base to the
+# kernel actually being built, so a kernel bump needs no new committed config.
+LINUX_CONFIG 		?= $(firstword $(wildcard conf/kernel/$(LINUX_RELEASE)/linux.$(ONIE_ARCH).config) conf/kernel/linux.$(ONIE_ARCH).config)
 KERNELDIR   		= $(MBUILDDIR)/kernel
 LINUXDIR   		= $(KERNELDIR)/linux
 
@@ -82,12 +87,25 @@ $(KERNEL_PATCH_STAMP): $(KERNEL_SRCPATCHDIR)/* $(MACHINE_KERNEL_PATCHDIR)/* $(KE
 	$(Q) $(SCRIPTDIR)/apply-patch-series $(KERNEL_PATCHDIR)/series $(LINUXDIR)
 	$(Q) touch $@
 
-$(LINUXDIR)/.config : $(LINUX_CONFIG) $(KERNEL_PATCH_STAMP)
+# olddefconfig (below) runs the kernel kconfig, which probes the cross
+# compiler via scripts/Kconfig.include, so the toolchain must already be
+# built.  Order-only so a toolchain rebuild does not force a config regen.
+$(LINUXDIR)/.config : $(LINUX_CONFIG) $(KERNEL_PATCH_STAMP) | $(XTOOLS_BUILD_STAMP)
 	$(Q) echo "==== Copying $(LINUX_CONFIG) to $(LINUXDIR)/.config ===="
 	$(Q) cp -v $< $@
 #	$(Q) cat $(MACHINE_KERNEL_PATCHDIR)/config >> $(LINUXDIR)/.config
 	$(Q) echo "==== Merging patches from $(MACHINE_KERNEL_PATCHDIR)/config to $(LINUXDIR)/.config ===="
 	$(Q) $(LINUXDIR)/scripts/kconfig/merge_config.sh -r -m -O  $(LINUXDIR) $(LINUXDIR)/.config $(MACHINE_KERNEL_PATCHDIR)/config
+	$(Q) echo "==== Reconciling kernel config to $(LINUX_RELEASE) (olddefconfig) ===="
+	$(Q) PATH='$(CROSSBIN):$(PATH)' $(MAKE) -C $(LINUXDIR) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSSPREFIX) olddefconfig
+	# Modern kernels resolve CONFIG_MODULE_SIG_KEY relative to the build tree
+	# and dropped the MODULE_SIG_KEY_SRCPREFIX mechanism, so rewrite a
+	# configured module-signing key to the absolute path of the generated key.
+	$(Q) if grep -q '^CONFIG_MODULE_SIG_KEY=' $(LINUXDIR)/.config && [ -n "$(ONIE_MODULE_SIG_KEY_SRCPREFIX)" ]; then \
+		k=$$(sed -n 's/^CONFIG_MODULE_SIG_KEY="\(.*\)"/\1/p' $(LINUXDIR)/.config) ; \
+		sed -i "s|^CONFIG_MODULE_SIG_KEY=.*|CONFIG_MODULE_SIG_KEY=\"$(abspath $(ONIE_MODULE_SIG_KEY_SRCPREFIX))/$$(basename $$k)\"|" $(LINUXDIR)/.config ; \
+		echo "==== Set CONFIG_MODULE_SIG_KEY to $(abspath $(ONIE_MODULE_SIG_KEY_SRCPREFIX))/$$(basename $$k) ====" ; \
+	fi
 
 
 # Interactive update. User selects options, or not
@@ -129,7 +147,6 @@ $(KERNEL_BUILD_STAMP): $(KERNEL_SOURCE_STAMP) $(LINUX_NEW_FILES) $(LINUXDIR)/.co
 	    $(MAKE) -C $(LINUXDIR)		\
 		ARCH=$(KERNEL_ARCH)		\
 		CROSS_COMPILE=$(CROSSPREFIX)	\
-		MODULE_SIG_KEY_SRCPREFIX=$(ONIE_MODULE_SIG_KEY_SRCPREFIX)/ \
 		$(KERNEL_OLD_GCC_COMPAT)	\
 		V=$(V) 				\
 		all

build-config/make/kernel-download.make

@@ -30,9 +30,6 @@ I2CTOOLS_SYSEEPROM = no
 # Console parameters
 CONSOLE_DEV = 1
 
-# Specify Linux kernel version
-LINUX_VERSION = 5.4
-LINUX_MINOR_VERSION = 86
 
 
 #-------------------------------------------------------------------------------

build-config/make/kernel.make

@@ -33,9 +33,6 @@ VENDOR_ID = 259
 UEFI_ENABLE = yes
 PXE_EFI64_ENABLE = yes
 
-# Set Linux kernel version
-LINUX_VERSION = 5.4
-LINUX_MINOR_VERSION = 86
 
 
 #-------------------------------------------------------------------------------

machine/accton/accton_833435_b21/machine.make

@@ -29,9 +29,6 @@ PXE_EFI64_ENABLE = yes
 # Console parameters
 CONSOLE_DEV = 1
 
-# Set Linux kernel version
-LINUX_VERSION = 5.4
-LINUX_MINOR_VERSION = 86
 
 
 #-------------------------------------------------------------------------------

machine/accton/accton_as4222_28pe/machine.make

@@ -31,9 +31,6 @@ PXE_EFI64_ENABLE = yes
 # Console parameters
 CONSOLE_DEV = 0
 
-# Set Linux kernel version
-LINUX_VERSION = 5.4
-LINUX_MINOR_VERSION = 86
 
 
 #-------------------------------------------------------------------------------

machine/accton/accton_as4620_54pe/machine.make

@@ -30,9 +30,6 @@ I2CTOOLS_SYSEEPROM = no
 # Console parameters
 CONSOLE_DEV = 1
 
-# Set Linux kernel version
-LINUX_VERSION = 5.4
-LINUX_MINOR_VERSION = 86
 
 
 #-------------------------------------------------------------------------------

machine/accton/accton_as4625/machine.make

@@ -30,9 +30,6 @@ I2CTOOLS_SYSEEPROM = no
 # Console parameters
 CONSOLE_DEV = 1
 
-# Set Linux kernel version
-LINUX_VERSION = 5.4
-LINUX_MINOR_VERSION = 86
 
 
 #-------------------------------------------------------------------------------