Skip to content

Commit 8a91f3a

Browse files
committed
[Accton] Use kernel 6.1
1. added and modified files to run ONL with kernel 6.1. the supported and verified platforms: as7326-56x, as4630-54pe, as9716-32d , as4630-54te, as7712-32x, as7726-32x, as7946-74xkb, as7946-30xb, as9817-64o, as9817-64d, as7535-28xb, as7926-40xkfb, as9926-24db. 2. to support python3 in __init__.py, replaced the commands module's functions with the subprocess module's, including as7726-32x, as7326-56x, as7926-40xfb, as9716-32d, as9926-24db, as9817-64d, as9817-64o, as7946-30xb, as7946-74xkb. Signed-off-by: Alex Lai <alex_lai@accton.com>
1 parent 28f52e6 commit 8a91f3a

165 files changed

Lines changed: 7348 additions & 809 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

builds/any/rootfs/buster/common/amd64-base-packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- onl-kernel-4.14-lts-x86-64-all-modules
1313
- onl-kernel-4.19-lts-x86-64-all-modules
1414
- onl-kernel-5.4-lts-x86-64-all-modules
15+
- onl-kernel-6.1-lts-x86-64-all-modules
1516
- efibootmgr
1617
- gdisk
1718
- acpid

builds/any/rootfs/jessie/common/amd64-base-packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
- onl-kernel-4.14-lts-x86-64-all-modules
1616
- onl-kernel-4.19-lts-x86-64-all-modules
1717
- onl-kernel-5.4-lts-x86-64-all-modules
18+
- onl-kernel-6.1-lts-x86-64-all-modules
1819
- efibootmgr
1920
- gdisk

builds/any/rootfs/stretch/common/amd64-base-packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- onl-kernel-4.14-lts-x86-64-all-modules
1414
- onl-kernel-4.19-lts-x86-64-all-modules
1515
- onl-kernel-5.4-lts-x86-64-all-modules
16+
- onl-kernel-6.1-lts-x86-64-all-modules
1617
- efibootmgr
1718
- gdisk
1819
- acpid

packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ default:
4444
=: kernel-5.4-lts-x86_64-all
4545
package: onl-kernel-5.4-lts-x86-64-all:amd64
4646

47+
kernel-6.1: &kernel-6-1
48+
=: kernel-6.1-lts-x86_64-all
49+
package: onl-kernel-6.1-lts-x86-64-all:amd64
50+
4751
# pick one of the above kernels
4852
kernel:
4953
<<: *kernel-3-16
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include $(ONL)/make/pkg.mk
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!include $ONL/packages/base/any/kernels/lts/APKG.yml VERSION=6.1 ARCH=amd64 CONFIG=x86-64-all
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
linux-*
2+
kernel-*
3+
lib
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
KERNEL_BUILD_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
2+
KERNEL_ARCH := x86_64
3+
KERNEL_LTS_VERSION := 6.1
4+
KERNEL_CONFIG := x86_64-all
5+
include $(ONL)/packages/base/any/kernels/lts/builds/Makefile
6+
7+
setup::
8+
dpkg -l libelf-dev > /dev/null 2>&1 || sudo apt-get install libelf-dev

packages/base/amd64/upgrade/PKG.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ prerequisites:
55
- onl-kernel-4.14-lts-x86-64-all:amd64
66
- onl-kernel-4.19-lts-x86-64-all:amd64
77
- onl-kernel-5.4-lts-x86-64-all:amd64
8+
- onl-kernel-6.1-lts-x86-64-all:amd64
89
- onl-loader-initrd:amd64
910
stage: 3
1011

packages/base/amd64/upgrade/builds/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(eval $(call onlpm_find_file_add,X,onl-kernel-4.9-lts-x86-64-all:amd64,kernel-4
66
$(eval $(call onlpm_find_file_add,X,onl-kernel-4.14-lts-x86-64-all:amd64,kernel-4.14-lts-x86_64-all,FILES))
77
$(eval $(call onlpm_find_file_add,X,onl-kernel-4.19-lts-x86-64-all:amd64,kernel-4.19-lts-x86_64-all,FILES))
88
$(eval $(call onlpm_find_file_add,X,onl-kernel-5.4-lts-x86-64-all:amd64,kernel-5.4-lts-x86_64-all,FILES))
9+
$(eval $(call onlpm_find_file_add,X,onl-kernel-6.1-lts-x86-64-all:amd64,kernel-6.1-lts-x86_64-all,FILES))
910

1011
# Loader initrd and manifest -> $FILES
1112
$(eval $(call onlpm_find_file_add,X,onl-loader-initrd:amd64,onl-loader-initrd-amd64.cpio.gz,FILES))

0 commit comments

Comments
 (0)