Skip to content

Commit

Permalink
Merge pull request sonic-net#227 from saiarcot895/bullseye-upgrade-base
Browse files Browse the repository at this point in the history
Upgrade kernel from 4.19.152 to 5.10.46
  • Loading branch information
lguohan authored Oct 16, 2021
2 parents 95fb735 + 38bf553 commit 2b2e597
Show file tree
Hide file tree
Showing 124 changed files with 5,058 additions and 15,214 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ SHELL = /bin/bash
.SHELLFLAGS += -e

KERNEL_ABI_MINOR_VERSION = 2
KVERSION_SHORT ?= 4.19.0-12-$(KERNEL_ABI_MINOR_VERSION)
KVERSION_SHORT ?= 5.10.0-8-$(KERNEL_ABI_MINOR_VERSION)
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 4.19.152
KERNEL_SUBVERSION ?= 1
KERNEL_VERSION ?= 5.10.46
KERNEL_SUBVERSION ?= 4
kernel_procure_method ?= build
CONFIGURED_ARCH ?= amd64

Expand Down Expand Up @@ -91,6 +91,8 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
git add debian/control -f
git add debian/rules.gen -f
git add debian/tests/control -f
git add debian/*.maintscript -f
git add debian/*.bug-presubj -f
git commit -m "unmodified debian source"

# Learning new git repo head (above commit) by calling stg repair.
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stages:
- template: .azure-pipelines/build-template.yml
parameters:
arch: amd64
sonic_slave: sonic-slave-buster
sonic_slave: sonic-slave-bullseye
artifact_name: sonic-linux-kernel

- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
Expand All @@ -24,13 +24,13 @@ stages:
arch: armhf
timeout: 1440
pool: sonicbld_8c
sonic_slave: sonic-slave-buster-armhf
sonic_slave: sonic-slave-bullseye-armhf
artifact_name: sonic-linux-kernel.armhf

- template: .azure-pipelines/build-template.yml
parameters:
arch: arm64
timeout: 1440
pool: sonicbld_8c
sonic_slave: sonic-slave-buster-arm64
sonic_slave: sonic-slave-bullseye-arm64
artifact_name: sonic-linux-kernel.arm64
Loading

0 comments on commit 2b2e597

Please sign in to comment.