Upstream the script thats used to generate patch for AST2700#568
Open
chander-nexthop wants to merge 4 commits into
Open
Upstream the script thats used to generate patch for AST2700#568chander-nexthop wants to merge 4 commits into
chander-nexthop wants to merge 4 commits into
Conversation
… 2700 2. Script to generate the patch that adds support for Aspeed AST2700 SOC. The script will generate the patch in WORK_DIR/aspeed-ast2700-support-new.patch This needs to be moved to patches-sonic/aspeed-ast2700-support.patch. Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
Thank you for sharing the script. Please make this two merge/pull requests. |
Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
Author
Done. |
chander-nexthop
changed the title
saiarcot895
reviewed
May 12, 2026
| else | ||
| echo "Warning: Patch file not found: $line" | ||
| fi | ||
| done < <(head -228 "$KERNEL_DIR/patches-sonic/series") |
Contributor
There was a problem hiding this comment.
Why the first 228 lines specifically?
There was a problem hiding this comment.
Thank you @saiarcot895 for pointing it out . It a hardcoded cutoff for the pre aspeed section of the series file . it is replaced in the latest commit with an aspeed section skip so it adapts as patches are added or reordered.
saiarcot895
reviewed
May 12, 2026
Comment on lines
+176
to
+242
| cat > "$WORK_DIR/smart_merge.py" << 'PYTHON_EOF' | ||
| #!/usr/bin/env python3 | ||
| """ | ||
| Smart merge for Kconfig/Makefile files. | ||
| Uses a common ancestor approach: extract Aspeed additions from diff, | ||
| add them to SONiC base at correct locations while preserving order. | ||
| """ | ||
| import sys | ||
| import re | ||
| import difflib | ||
|
|
||
| def smart_merge(sonic_file, aspeed_file, target_file): | ||
| # Aspeed-related patterns | ||
| aspeed_patterns = [ | ||
| re.compile(r'aspeed', re.IGNORECASE), | ||
| re.compile(r'ast2[567]00', re.IGNORECASE), | ||
| re.compile(r'ast1[78]00', re.IGNORECASE), | ||
| re.compile(r'AST2700_IRQ'), | ||
| re.compile(r'ARCH_ASPEED'), | ||
| ] | ||
|
|
||
| def is_aspeed_related(text): | ||
| return any(pattern.search(text) for pattern in aspeed_patterns) | ||
|
|
||
| # Read files | ||
| with open(sonic_file, 'r') as f: | ||
| sonic_lines = f.readlines() | ||
|
|
||
| with open(aspeed_file, 'r') as f: | ||
| aspeed_lines = f.readlines() | ||
|
|
||
| # Use difflib to get a proper sequence matcher | ||
| matcher = difflib.SequenceMatcher(None, sonic_lines, aspeed_lines) | ||
|
|
||
| result = [] | ||
|
|
||
| for tag, i1, i2, j1, j2 in matcher.get_opcodes(): | ||
| if tag == 'equal': | ||
| # Common lines - keep them | ||
| result.extend(sonic_lines[i1:i2]) | ||
| elif tag == 'delete': | ||
| # Lines deleted in aspeed - KEEP THEM (preserve SONiC content) | ||
| result.extend(sonic_lines[i1:i2]) | ||
| elif tag == 'insert': | ||
| # Lines added in aspeed - check if Aspeed-related | ||
| new_lines = aspeed_lines[j1:j2] | ||
| aspeed_related = any(is_aspeed_related(line) for line in new_lines) | ||
| if aspeed_related: | ||
| # Add these lines | ||
| result.extend(new_lines) | ||
| # Otherwise skip (non-Aspeed additions) | ||
| elif tag == 'replace': | ||
| # Lines changed - keep SONiC version, then add Aspeed additions if any | ||
| result.extend(sonic_lines[i1:i2]) | ||
| new_lines = aspeed_lines[j1:j2] | ||
| aspeed_related = any(is_aspeed_related(line) for line in new_lines) | ||
| if aspeed_related: | ||
| # Also add the Aspeed replacements | ||
| result.extend(new_lines) | ||
|
|
||
| # Write result | ||
| with open(target_file, 'w') as f: | ||
| f.writelines(result) | ||
|
|
||
| if __name__ == '__main__': | ||
| smart_merge(sys.argv[1], sys.argv[2], sys.argv[3]) | ||
| PYTHON_EOF |
Contributor
There was a problem hiding this comment.
Suggestion for the future: split this into a separate file just for editing/review purposes.
There was a problem hiding this comment.
it is taken care @saiarcot895 . extracted into scripts/smart_merge.py now. Thank you.
Signed-off-by: Chinmoy Dey <chinmoy@nexthop.ai>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
paulmenzel
suggested changes
May 12, 2026
Contributor
paulmenzel
left a comment
paulmenzel
left a comment
There was a problem hiding this comment.
700 lines is quite much. Why can’t nexthop not publish a git repository with the all the SONiC patches applied, and the Aspeed patches on top? (SONiC should also publish it’s own Linux kernel git archive with the patches applied.)
| # Example, run with ASPEED_TAG=v00.07.02 ./scripts/generate-aspeed-patch.sh | ||
| ASPEED_BRANCH="${ASPEED_TAG:-aspeed-master-v6.12}" | ||
| ASPEED_REPO="https://github.com/AspeedTech-BMC/linux.git" | ||
| WORK_DIR="/tmp/aspeed-patch-gen" |
Contributor
There was a problem hiding this comment.
Please consider $TMPDIR.
| OUTPUT_PATCH="$WORK_DIR/aspeed-ast2700-support-new.patch" | ||
|
|
||
| # Read kernel version from Makefile | ||
| KERNEL_VERSION=$(grep "^KERNEL_VERSION" "$KERNEL_DIR/Makefile" | cut -d= -f2 | tr -d ' ') |
Contributor
There was a problem hiding this comment.
sed -n 's/^KERNEL_VERSION\s*=\s*//p' "$KERNEL_DIR/Makefile"
| fi | ||
| mkdir -p "$SONIC_SRC" | ||
| cd "$SONIC_SRC" | ||
| wget -q "$SONIC_KERNEL_URL" |
Contributor
There was a problem hiding this comment.
Why redownload it each time?
| wget -q "$SONIC_KERNEL_URL" | ||
| tar -xf "linux_${KERNEL_VERSION}.orig.tar.xz" --strip-components=1 | ||
| rm "linux_${KERNEL_VERSION}.orig.tar.xz" | ||
| echo "SONiC kernel source ready: $(du -sh $SONIC_SRC | cut -f1)" |
Contributor
There was a problem hiding this comment.
Explicitly mention the size?
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.
As discussed in the SONiC-BMC work group meeting yesterday I am submitting the script that I use to generate the patch file to add support for AST 2700 to the SONiC Linux Kernel. The script by default will create the patch based on the current top-of-tree in aspeed-master-v6.12. This can be overridded by running the script with the env var ASPEED_TAG, ex "ASPEED_TAG=v00.07.02 ./scripts/generate-aspeed-patch.sh"