opencomputeproject · acctalex · Feb 19, 2025
diff --git a/builds/any/rootfs/buster/common/amd64-base-packages.yml b/builds/any/rootfs/buster/common/amd64-base-packages.yml
@@ -12,6 +12,7 @@
 - onl-kernel-4.14-lts-x86-64-all-modules
 - onl-kernel-4.19-lts-x86-64-all-modules
 - onl-kernel-5.4-lts-x86-64-all-modules
+- onl-kernel-6.1-lts-x86-64-all-modules
 - efibootmgr
 - gdisk
 - acpid
diff --git a/builds/any/rootfs/jessie/common/amd64-base-packages.yml b/builds/any/rootfs/jessie/common/amd64-base-packages.yml
@@ -15,5 +15,6 @@
 - onl-kernel-4.14-lts-x86-64-all-modules
 - onl-kernel-4.19-lts-x86-64-all-modules
 - onl-kernel-5.4-lts-x86-64-all-modules
+- onl-kernel-6.1-lts-x86-64-all-modules
 - efibootmgr
 - gdisk
diff --git a/builds/any/rootfs/stretch/common/amd64-base-packages.yml b/builds/any/rootfs/stretch/common/amd64-base-packages.yml
@@ -13,6 +13,7 @@
 - onl-kernel-4.14-lts-x86-64-all-modules
 - onl-kernel-4.19-lts-x86-64-all-modules
 - onl-kernel-5.4-lts-x86-64-all-modules
+- onl-kernel-6.1-lts-x86-64-all-modules
 - efibootmgr
 - gdisk
 - acpid
diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml
@@ -44,6 +44,10 @@ default:
       =: kernel-5.4-lts-x86_64-all
       package: onl-kernel-5.4-lts-x86-64-all:amd64
 
+    kernel-6.1: &kernel-6-1
+      =: kernel-6.1-lts-x86_64-all
+      package: onl-kernel-6.1-lts-x86-64-all:amd64
+
     # pick one of the above kernels
     kernel:
       <<: *kernel-3-16

diff --git a/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/Makefile b/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
diff --git a/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/PKG.yml b/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/PKG.yml
@@ -0,0 +1 @@
+!include $ONL/packages/base/any/kernels/lts/APKG.yml VERSION=6.1 ARCH=amd64 CONFIG=x86-64-all
diff --git a/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/builds/.gitignore b/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/builds/.gitignore
@@ -0,0 +1,3 @@
+linux-*
+kernel-*
+lib
diff --git a/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/builds/Makefile b/packages/base/amd64/kernels/kernel-6.1-lts-x86-64-all/builds/Makefile
@@ -0,0 +1,8 @@
+KERNEL_BUILD_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+KERNEL_ARCH := x86_64
+KERNEL_LTS_VERSION := 6.1
+KERNEL_CONFIG := x86_64-all
+include $(ONL)/packages/base/any/kernels/lts/builds/Makefile
+
+setup::
+	dpkg -l libelf-dev > /dev/null 2>&1 || sudo apt-get install libelf-dev
diff --git a/packages/base/amd64/upgrade/PKG.yml b/packages/base/amd64/upgrade/PKG.yml
@@ -5,6 +5,7 @@ prerequisites:
       - onl-kernel-4.14-lts-x86-64-all:amd64
       - onl-kernel-4.19-lts-x86-64-all:amd64
       - onl-kernel-5.4-lts-x86-64-all:amd64
+      - onl-kernel-6.1-lts-x86-64-all:amd64
       - onl-loader-initrd:amd64
     stage: 3
 

diff --git a/packages/base/amd64/upgrade/builds/Makefile b/packages/base/amd64/upgrade/builds/Makefile
@@ -6,6 +6,7 @@ $(eval $(call onlpm_find_file_add,X,onl-kernel-4.9-lts-x86-64-all:amd64,kernel-4
 $(eval $(call onlpm_find_file_add,X,onl-kernel-4.14-lts-x86-64-all:amd64,kernel-4.14-lts-x86_64-all,FILES))
 $(eval $(call onlpm_find_file_add,X,onl-kernel-4.19-lts-x86-64-all:amd64,kernel-4.19-lts-x86_64-all,FILES))
 $(eval $(call onlpm_find_file_add,X,onl-kernel-5.4-lts-x86-64-all:amd64,kernel-5.4-lts-x86_64-all,FILES))
+$(eval $(call onlpm_find_file_add,X,onl-kernel-6.1-lts-x86-64-all:amd64,kernel-6.1-lts-x86_64-all,FILES))
 
 # Loader initrd and manifest -> $FILES
 $(eval $(call onlpm_find_file_add,X,onl-loader-initrd:amd64,onl-loader-initrd-amd64.cpio.gz,FILES))

diff --git a/packages/base/any/kernels/6.1-lts/configs/x86_64-all/.gitignore b/packages/base/any/kernels/6.1-lts/configs/x86_64-all/.gitignore
@@ -0,0 +1,3 @@
+kernel-*
+linux-*
+lib
diff --git a/packages/base/any/kernels/6.1-lts/configs/x86_64-all/Makefile b/packages/base/any/kernels/6.1-lts/configs/x86_64-all/Makefile
@@ -0,0 +1,37 @@
+############################################################
+# <bsn.cl fy=2015 v=onl>
+#
+#           Copyright 2015 Big Switch Networks, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+include $(ONL)/make/config.mk
+
+export ARCH := x86_64
+ifndef K_TARGET_DIR
+K_TARGET_DIR := $(THIS_DIR)
+endif
+
+include ../../kconfig.mk
+K_CONFIG := x86_64-all.config
+K_BUILD_TARGET := bzImage
+K_COPY_SRC := arch/x86/boot/bzImage
+ifndef K_COPY_DST
+K_COPY_DST := kernel-6.1-lts-x86_64-all
+endif
+
+include $(ONL)/make/kbuild.mk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		!include $ONL/packages/base/any/kernels/lts/APKG.yml VERSION=6.1 ARCH=amd64 CONFIG=x86-64-all