202211 #49
Closed
202211 #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Why I did it Currently, non upstream patches are applied only after upstream patches. Depends on sonic-net/sonic-linux-kernel#313. Can be merged in any order, preferably together - What I did it Non upstream Patches that reside in the sonic repo will not be saved in a tar file bur rather in a folder pointed out by EXTERNAL_KERNEL_PATCH_LOC. This is to make changes to the non upstream patches easily traceable. The build variable name is also updated to INCLUDE_EXTERNAL_PATCHES Files/folders expected under EXTERNAL_KERNEL_PATCH_LOC EXTERNAL_KERNEL_PATCH_LOC/ ├──── patches/ ├── 0001-xxxxx.patch ├── 0001-yyyyyyyy.patch ├── ............. ├──── series.patch series.patch should contain a diff that is applied on the sonic-linux-kernel/patch/series file. The diff should include all the non-upstream patches. How to verify it Build the Kernel and verified if all the patches are applied properly Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
…#14594) - Why I did it Facilitate Automatic integration of new hw-mgmt version into SONiC. Inputs to the Script: MLNX_HW_MANAGEMENT_VERSION Eg: 7.0040.5202 CREATE_BRANCH: (y|n) Creates a branch instead of a commit (optional, default: n) BRANCH_SONIC: Only relevant when CREATE_BRANCH is y. Default: master. Note: These should be provided through SONIC_OVERRIDE_BUILD_VARS parameter Output: Script creates a commit (in each of sonic-buildimage, sonic-linux-kernel) with all the changes required for upgrading the hw-management version to a version provided by MLNX_HW_MANAGEMENT_VERSION Brief Summary of the changes made: MLNX_HW_MANAGEMENT_VERSION flag in the hw-management.mk file hw-mgmt submodule is updated to the corresponding version Updates are made to non-upstream-patches/patches and series.patch file series, kconfig-inclusion and kconfig-exclusion files can be updated in the sonic-linux-kernel repo sonic-linux-kernel/patches folder is updated with the corresponding upstream patches Based on the inputs, there could be a branch seen in the local for each of the repo's. Branch is named as <branch>_<parent_commit>_integrate_<hw_mgmt_version> - How I did it Added a new make target which can be invoked by calling make integrate-mlnx-hw-mgmt user@server:/sonic-buildimage$ git rev-parse --abbrev-ref HEAD master_23193446a_integrate_7.0020.5052 user@server:/sonic-buildimage$ git log --oneline -n 2 f66e01867 (HEAD -> master_23193446a_integrate_V.7.0020.5052, show) Intgerate HW-MGMT V.7.0020.5052 Changes 2319344 (master_intg_hw_mgmt) Update logic user@server:/sonic-buildimage/src/sonic-linux-kernel$ git rev-parse --abbrev-ref HEAD master_6847319_integrate_7.0020.4104 user@server:/sonic-buildimage/src/sonic-linux-kernel$ git log --oneline -n 2 6094f71 (HEAD -> master_6847319_integrate_V.7.0020.5052) Intgerate HW-MGMT V.7.0020.5052 Changes 6847319 (origin/master, origin/HEAD) Read ID register for optoe1 to find pageable bit in optoe driver (sonic-net#308) Changes made will be summarized under sonic-buildimage/integrate-mlnx-hw-mgmt_user.out file. Debugging and troubleshooting output is written to sonic-buildimage/integrate-mlnx-hw-mgmt.log files User output file & stdout file: log_files.tar.gz Limitations: Assumes the changes would only work for amd64 Assumes the non-upstream patches in mellanox only belong to hw-mgmt - How to verify it Build the Kernel Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
…nic-net#14709) Fix the script to consider case sensitivity while writing the kconfig Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
vivekrnv
force-pushed
the
202211_9881dff_integrate_7.0020.4104
branch
from
9cddb97 to
7b1895c
Compare
vivekrnv
pushed a commit
that referenced
this pull request
Jun 28, 2023
…utomatically (sonic-net#15591) #### Why I did it src/sonic-host-services ``` * eab4a9e - (HEAD -> master, origin/master, origin/HEAD) [hostcfgd][dns] Subscribe to DNS_NAMESERVER table to react to static DNS configuration changes. (#49) (2 days ago) [Oleksandr Ivantsiv] ``` #### How I did it #### How to verify it #### Description for the changelog
vivekrnv
pushed a commit
that referenced
this pull request
Oct 13, 2023
…e latest HEAD automatically (sonic-net#15016) src/wpasupplicant/sonic-wpa-supplicant * a24412c25 - (HEAD -> 202205, origin/master, origin/HEAD, origin/202211, origin/202205, master) [mka]: Fix unexpected cleanup (#73) (8 days ago) [Ze Gan] * 26d1da0bc - [mka]: Fix re-establishment by reset MI (#72) (8 days ago) [Ze Gan] * f07e0a097 - [azp]: Update build pipeline to build for Bullseye (#70) (4 weeks ago) [Ze Gan] * 2c69e2cda - Use github code scanning instead of LGTM (#69) (6 months ago) [Liu Shilong] |\ | * 23abb04e5 - fix (6 months ago) [shilongliu] | * f34d68fe6 - libdbus-1-dev (6 months ago) [shilongliu] | * dc2dd881e - add dbus (6 months ago) [shilongliu] | * 5de037661 - use swsscommon packages (6 months ago) [shilongliu] | * 32c5a2729 - Use github code scanning instead of LGTM (6 months ago) [shilongliu] |/ * aa731b96f - [azp]: Install libyang in azure pipeline (#68) (8 months ago) [Hua Liu] * 71b635d74 - Revert "[Azp]: Upgrade Azp to bullseye (#49)" (#66) (9 months ago) [Ze Gan] * 7aa4e6fa4 - Adding Microsoft SECURITY.MD (#58) (9 months ago) [microsoft-github-policy-service[bot]]
vivekrnv
pushed a commit
that referenced
this pull request
Sep 20, 2024
…ly (sonic-net#19156) #### Why I did it src/dhcprelay ``` * c605cd4 - (HEAD -> 202311, origin/202311) [202311] Backport commit from master into 202311 (#49) (2 hours ago) [Yaqiang Zhu] ``` #### How I did it #### How to verify it #### Description for the changelog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Test PR Tile - SB