Skip to content

Commit

Permalink
Port kernel patches to 4.19.0-6 kernel (sonic-net#121)
Browse files Browse the repository at this point in the history

- remove fix_ismt_alignment_issue.patch
  linux commit id: 5cd5f0bb0d9c32876b3d86b70fb45da10d028be7

- remove 0011-support-Broadcom-54616-Phy-for-Intel-igb-driver.patch
  linux commit id: eeb0149660a21c61122d4937bd406aa4f334c1e4

- remove driver-l3mdev-cgroup.patch
- remove config-l3mdev-cgroup.patch

- remove bridge-add-per-port-broadcast-flood-flag.patch
  linux commit id: 99f906e9ad7b6e79ffeda30f45906a8448b9d6a2

- remove 0025-net-udp_l3mdev_accept-support.patch
  linux commit id: 63a6fff353d01da5a22b72670c434bf12fa0e3b8

- remove kernel-enable-psample-and-act_sample-drivers.patch

- remove mellanox-backport-introduce-psample-a-new-genetlink-channel.patch
  linux commit id: 6ae0a6286171154661b74f7f550f9441c6008424

- remove mellanox-backport-introduce-tc-sample-action.patch
  linux commit id: 5c5670fae43027778e84b9d9ff3b9d91a10a8131

- remove 0000-net-Fix-netdev-adjacency-tracking.patch
  linux commit id: 67b62f98a1de962277b60d77c0c208b76867dbae
                   0f524a80ff35af8a7664d7661d948107da142e04
                   f1170fd462c67c4ae2f20734566d94e0f8f62f69
                   1a3f060c1a47dba4e12ac21ce62b57666b9c4e95
                   790510d99f39cee7f275d001aa5024032ed9bb48
                   453d39329ad03f9f6d93ec6d0d57bf7a1e2a20c7
                   e0e79c8e74b08976d9b45e52b704b9228c6965c7
                   b3208b2024c9089106df52ae25ebf39068d6f9fc
                   1cd127fc7d3a6d6a0fc9f9cca47ca3a16ee79679
                   dd82364c3ab93a96bb1e45d22106a4b1ea4bef39
                   cf2d67408b2f9a840f27d25a0219070b5b5deec4

- remove 0000-net-ipv6-ll-anycast-mcast-routes-on-dev.patch
  linux commit id: 4832c30d5458387ff2533ff66fbde26ad8bb5a2d

- remove 0001-net-ipv6-Allow-shorthand-delete-of-all-nexthops-in-m.patch
  linux commit id: 0ae8133586ad1c9be894411aaf8b17bb58c8efe5

- remove linux-4.13-thermal-intel_pch_thermal-Fix-enable-check-on.patch
  linux commit id: 595536e0b2475a9eac23709cd461143178c12e0e

- remove linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch
  linux commit id: a81114d03e4a529c4b68293249f75438b3c1783f

Signed-off-by: Guohan Lu <[email protected]>

* [Mellanox] Port the patches to 4.19 (sonic-net#14)

0001-v4.19-6-Mellanox-platform-Backport-patches-for-new-M.patch
0002-config-mellanox-configuration.patch
0003-mlxsw-minimal-Fix-validation-for-FW-minor-version.patch
0004-mlxsw-core-Add-the-hottest-thermal-zone-detection.patch
0005-hwmon-pmbus-core-Add-support-for-vid-mode-detection-.patch
0006-platform-mellanox-mlxreg-hotplug-Use-capability-r.patch

<linux/i2c/pmbus.h> -> <linux/pmbus.h>

Remove files which are no longer used.

Co-authored-by: stephens <[email protected]>
  • Loading branch information
lguohan and stephens authored Apr 12, 2020
1 parent 32963da commit 187bb4a
Show file tree
Hide file tree
Showing 113 changed files with 8,922 additions and 40,257 deletions.
24 changes: 12 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
SHELL = /bin/bash
.SHELLFLAGS += -e

KERNEL_ABI_MINOR_VERSION = 2
KVERSION_SHORT ?= 4.9.0-11-$(KERNEL_ABI_MINOR_VERSION)
KERNEL_ABI_MINOR_VERSION = 0
KVERSION_SHORT ?= 4.19.0-6-$(KERNEL_ABI_MINOR_VERSION)
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 4.9.189
KERNEL_SUBVERSION ?= 3+deb9u2
KERNEL_VERSION ?= 4.19.67
KERNEL_SUBVERSION ?= 2+deb10u2
kernel_procure_method ?= build
CONFIGURED_ARCH ?= amd64

LINUX_HEADER_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
LINUX_HEADER_AMD64 = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
LINUX_IMAGE = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb
LINUX_IMAGE = linux-image-$(KVERSION)-unsigned_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_$(CONFIGURED_ARCH).deb

MAIN_TARGET = $(LINUX_HEADER_COMMON)
DERIVED_TARGETS = $(LINUX_HEADER_AMD64) $(LINUX_IMAGE)
Expand Down Expand Up @@ -48,9 +48,9 @@ ORIG_FILE = linux_$(KERNEL_VERSION).orig.tar.xz
DEBIAN_FILE = linux_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION).debian.tar.xz
BUILD_DIR=linux-$(KERNEL_VERSION)

DSC_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.9.189-3+deb9u2.dsc"
DEBIAN_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.9.189-3+deb9u2.debian.tar.xz"
ORIG_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.9.189.orig.tar.xz"
DSC_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.19.67-2+deb10u2.dsc"
DEBIAN_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.19.67-2+deb10u2.debian.tar.xz"
ORIG_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.19.67.orig.tar.xz"

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the Debian kernel source
Expand All @@ -74,13 +74,13 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
debian/bin/gencontrol.py

# generate linux build file for amd64_none_amd64
fakeroot make -f debian/rules.gen setup_armhf_none_armmp
fakeroot make -f debian/rules.gen setup_arm64_none
# fakeroot make -f debian/rules.gen setup_armhf_none_armmp
# fakeroot make -f debian/rules.gen setup_arm64_none
fakeroot make -f debian/rules.gen setup_amd64_none_amd64

# Applying patches and configuration changes
git add debian/build/build_armhf_none_armmp/.config -f
git add debian/build/build_arm64_none_arm64/.config -f
# git add debian/build/build_armhf_none_armmp/.config -f
# git add debian/build/build_arm64_none_arm64/.config -f
git add debian/build/build_amd64_none_amd64/.config -f
git add debian/config.defines.dump -f
git add debian/control -f
Expand Down
Loading

0 comments on commit 187bb4a

Please sign in to comment.