Skip to content

Commit

Permalink
Kernel ABI update from version 6 to version 6-2 (sonic-net#145)
Browse files Browse the repository at this point in the history
By changing the kernel ABI from version 6 to version 6-2, this will allow
to disable the kernel ABI check which Debian performs at the very end of
the kernel build.
  • Loading branch information
olivier-singla authored Jun 12, 2020
1 parent a37a8bf commit 0776e9f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SHELL = /bin/bash
.SHELLFLAGS += -e

KERNEL_ABI_MINOR_VERSION = 0
KERNEL_ABI_MINOR_VERSION = 2
KVERSION_SHORT ?= 4.19.0-6-$(KERNEL_ABI_MINOR_VERSION)
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 4.19.67
Expand Down
30 changes: 30 additions & 0 deletions patch/preconfig/packaging-update-abiname-to-6-2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Update debian abiname to 6-2

From: Olivier Singla <olivier.singla@broadcom.com>


diff --git a/debian/config/defines b/debian/config/defines
index 9c85fab..3563e79 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,5 +1,5 @@
[abi]
-abiname: 6
+abiname: 6-2
ignore-changes:
__cpuhp_*
bpf_analyzer

diff --git a/debian/control.md5sum b/debian/control.md5sum
index 594492a..3f598c8 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -25,7 +25,7 @@ eda4623fb10d5ba1cefa8502ebaeb0fd debian/templates/control.image-dbg.in
0c86e2579f89e94a6cd144eb98593a5b debian/templates/control.extra.in
fe4456d48e3218fb8980c8577d03a7ae debian/templates/control.config.in
103ea5fb237e376b511ba638afc41837 debian/templates/control.headers.arch.in
-55e418f2d36dd4465141b93d5901ca04 debian/config/defines
+cd65d8ea2035508cd6f5e4c205678aea debian/config/defines
151f2a989308056668d9a162a321c32a debian/config/i386/defines
d08ab699e6a25ec0da4cb70efc0f2288 debian/config/ppc64el/defines
32e264f468daa991fa1bafce9e1eee3c debian/config/mips64el/defines
1 change: 1 addition & 0 deletions patch/preconfig/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
packaging-update-abiname-to-6-2.patch

0 comments on commit 0776e9f

Please sign in to comment.