Skip to content

buster#121

Merged
lguohan merged 2 commits intosonic-net:masterfrom
lguohan:buster
Apr 12, 2020
Merged

buster#121
lguohan merged 2 commits intosonic-net:masterfrom
lguohan:buster

Conversation

@lguohan
Copy link
Copy Markdown
Contributor

@lguohan lguohan commented Jan 30, 2020

Signed-off-by: Guohan Lu gulv@microsoft.com

DhanaDell
DhanaDell previously approved these changes Jan 31, 2020
View reviewed changes
@lguohan lguohan force-pushed the buster branch 6 times, most recently from 088dbd6 to 3e2b5cf Compare February 2, 2020 22:38
@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Mar 20, 2020

@antony-rheneus, i ma having some issue to build arm kernel on 4.19. It seems something changed in the debian packaging. as you can see I commented the arm build line in the Makefile. Can you take a look at it?

@antony-rheneus
Copy link
Copy Markdown
Contributor

antony-rheneus commented Mar 20, 2020

@antony-rheneus, i ma having some issue to build arm kernel on 4.19. It seems something changed in the debian packaging. as you can see I commented the arm build line in the Makefile. Can you take a look at it?

Ok sure.

@antony-rheneus
Copy link
Copy Markdown
Contributor

antony-rheneus commented Mar 20, 2020 •
edited
Loading

@antony-rheneus, i ma having some issue to build arm kernel on 4.19. It seems something changed in the debian packaging. as you can see I commented the arm build line in the Makefile. Can you take a look at it?

Ok sure.

Overriding DEB_HOST_ARCH= to the target architecture, resolves the debian dh make.

diff --git a/Makefile b/Makefile
@@ -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_amd64_none_amd64
+       fakeroot make -f debian/rules.gen DEB_HOST_ARCH=armhf setup_armhf_none_armmp
+       fakeroot make -f debian/rules.gen DEB_HOST_ARCH=arm64 setup_arm64_none
+       fakeroot make -f debian/rules.gen DEB_HOST_ARCH=amd64 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

@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Apr 12, 2020

retest this please

5 similar comments
@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Apr 12, 2020

retest this please

@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Apr 12, 2020

retest this please

@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Apr 12, 2020

retest this please

@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Apr 12, 2020

retest this please

@lguohan
Copy link
Copy Markdown
Contributor Author

lguohan commented Apr 12, 2020

retest this please

lguohan and others added 2 commits April 12, 2020 03:42
@lguohan
port patches to 4.19.0-6 kernel
d999c64 
- 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 <gulv@microsoft.com>
@stephenxs @lguohan
[Mellanox] Port the patches to 4.19 (#14)
e87e0cc 
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 <stephens@contoso.com>
@lguohan lguohan merged commit 187bb4a into sonic-net:master Apr 12, 2020
@lguohan lguohan deleted the buster branch April 12, 2020 05:44
@antony-rheneus antony-rheneus mentioned this pull request May 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@DhanaDell DhanaDell DhanaDell left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lguohan @antony-rheneus @DhanaDell @stephenxs