Provision the ability to apply the non upstream patches in any order#313
Merged
saiarcot895 merged 4 commits intosonic-net:masterfrom Apr 5, 2023
Merged
Provision the ability to apply the non upstream patches in any order#313saiarcot895 merged 4 commits intosonic-net:masterfrom
saiarcot895 merged 4 commits intosonic-net:masterfrom
Conversation
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Contributor
Author
|
@saiarcot895, @keboliu Please review |
8 tasks
saiarcot895
reviewed
Mar 31, 2023
saiarcot895
reviewed
Mar 31, 2023
Makefile
Outdated
| fi | ||
|
|
||
| # Precedence is given for external URL | ||
| if [ -z ${EXTERNAL_KERNEL_PATCH_URL} ] && [ x${INCLUDE_EXTERNAL_PATCHES} == xy ]; then |
Contributor
There was a problem hiding this comment.
I think we had a discussion on the variable naming in #296, but since this is being renamed to INCLUDE_EXTERNAL_PATCHES, can EXTERNAL_KERNEL_PATCH_URL fall under that, such that if INCLUDE_EXTERNAL_PATCHES is set to n, then nothing happens, even if EXTERNAL_KERNEL_PATCH_URL is specified?
Contributor
Author
There was a problem hiding this comment.
That means user has to provide both EXTERNAL_KERNEL_PATCH_URL & INCLUDE_EXTERNAL_PATCHES, if they wish to use non-upstream patches from an external URL. Why have two control options? INCLUDE_EXTERNAL_PATCHES is for locally saved non-up patches. atleast that's how i thought of
Contributor
Author
There was a problem hiding this comment.
@saiarcot895 Do you think it makes more sense to make INCLUDE_EXTERNAL_PATCHES a mandatory parameter.
Contributor
There was a problem hiding this comment.
My thought was that because of the name INCLUDE_EXTERNAL_PATCHES, it is a parameter whether to include external patches at all, and that EXTERNAL_KERNEL_PATCH_URL is one source of those external patches.
Contributor
Author
There was a problem hiding this comment.
Hmm, will update it then
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
saiarcot895
approved these changes
Apr 5, 2023
Contributor
Author
|
Request for 202211 |
vivekrnv
added a commit
to vivekrnv/sonic-buildimage
that referenced
this pull request
Apr 5, 2023
Update sonic-linux-kernel submodule pointer to include the following: * 6f38dca Provision the ability to apply the non upstream patches in any order ([sonic-net#313](sonic-net/sonic-linux-kernel#313)) * fbd307e Fix unable to probe emc2301/2/3 ([sonic-net#312](sonic-net/sonic-linux-kernel#312)) Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
8 tasks
Collaborator
|
@saiarcot895 @StormLiangMS Can you please add request for 202211 tag? |
Collaborator
|
@StormLiangMS would you please help to cherry-pick? |
liat-grozovik
pushed a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Apr 10, 2023
- 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>
StormLiangMS
pushed a commit
that referenced
this pull request
Apr 13, 2023
…313) * Provision the ability to apply the patches in any order Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Make INCLUDE_EXTERNAL_PATCHES a mandatory parameter Signed-off-by: Vivek Reddy <vkarri@nvidia.com> --------- Signed-off-by: Vivek Reddy <vkarri@nvidia.com> Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Apr 13, 2023
- 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>
vivekrnv
added a commit
to vivekrnv/sonic-buildimage
that referenced
this pull request
Apr 26, 2023
- 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>
vivekrnv
added a commit
to vivekrnv/sonic-linux-kernel
that referenced
this pull request
May 19, 2023
…onic-net#313) * Provision the ability to apply the patches in any order Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Make INCLUDE_EXTERNAL_PATCHES a mandatory parameter Signed-off-by: Vivek Reddy <vkarri@nvidia.com> --------- Signed-off-by: Vivek Reddy <vkarri@nvidia.com> Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Currently, non upstream patches are applied only after upstream patches.
What i Did
EXTERNAL_KERNEL_PATCH_LOC. The build variable name is also updated toINCLUDE_EXTERNAL_PATCHESINCLUDE_EXTERNAL_PATCHESwill be a mandatory parameter to include NON_UPSTREAM_PATCHES