Support Fedora 44 and Ubuntu 26.04 [WIP] #6803
There are no files selected for viewing
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
Submodule buildroot
updated
2150 files
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| openpower-pnor: use python3 to run sbeOpDistribute.py | ||
|
|
||
|
|
||
| python2 is unavailable on modern host distros; sbeOpDistribute.py is | ||
| python3-compatible, so invoke it with python3 during image assembly. | ||
|
|
||
| Signed-off-by: Trung Le <trung.le@ruby-journal.com> | ||
|
|
||
| --- a/update_image.pl | ||
| +++ b/update_image.pl | ||
| @@ -278,7 +278,7 @@ | ||
| if ($release eq "p9") { | ||
| my $hw_ref_image = $wink_binary_filename; | ||
| $hw_ref_image =~ s/.hdr.bin.ecc//; | ||
| - run_command("python2 $sbe_binary_dir/sbeOpDistribute.py --install --buildSbePart $hb_image_dir/buildSbePart.pl --hw_ref_image $hcode_dir/$hw_ref_image.bin --sbe_binary_filename $sbe_binary_filename --scratch_dir $scratch_dir --sbe_binary_dir $sbe_binary_dir"); | ||
| + run_command("python3 $sbe_binary_dir/sbeOpDistribute.py --install --buildSbePart $hb_image_dir/buildSbePart.pl --hw_ref_image $hcode_dir/$hw_ref_image.bin --sbe_binary_filename $sbe_binary_filename --scratch_dir $scratch_dir --sbe_binary_dir $sbe_binary_dir"); | ||
| } | ||
| else { | ||
| run_command("cp $hb_binary_dir/$sbe_binary_filename $scratch_dir/"); | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| sbe: use python3 for build scripts | ||
|
|
||
|
|
||
| GCC/host distros no longer ship python2. The SBE build invokes python2 | ||
| for buildInfo.py / securityRegListGen.py and via #!/usr/bin/python2 | ||
| shebangs; these scripts are python3-compatible, so call python3. | ||
|
|
||
| Signed-off-by: Trung Le <trung.le@ruby-journal.com> | ||
|
|
||
| --- a/src/build/Makefile | ||
| +++ b/src/build/Makefile | ||
| @@ -244,7 +244,7 @@ | ||
|
|
||
| # Create build Info file | ||
| buildInfo: | ||
| - python2 buildInfo.py $(GENFILES_DIR) | ||
| + python3 buildInfo.py $(GENFILES_DIR) | ||
|
|
||
| buildtag: | ||
| ./updateBuildTag.py $(P9_XIP_TOOL) $(IMG_DIR) $(IMAGE_NAME) | ||
| @@ -321,7 +321,7 @@ | ||
|
|
||
| # generate whitelist and blacklist security algorithm | ||
| security: $(OBJDIR) | ||
| - python2 $(SECURITY_SRC_DIR)/securityRegListGen.py -f $(SECURITY_LIST) -o $(GENFILES_DIR) | ||
| + python3 $(SECURITY_SRC_DIR)/securityRegListGen.py -f $(SECURITY_LIST) -o $(GENFILES_DIR) | ||
|
|
||
| # Build hwp_error_info.H. If the script fails then print the contents of | ||
| # the header and then delete whatever garbage the script left to force it to | ||
| --- a/src/build/buildInfo.py | ||
| +++ b/src/build/buildInfo.py | ||
| @@ -1,4 +1,4 @@ | ||
| -#!/usr/bin/python2 | ||
| +#!/usr/bin/python3 | ||
| # IBM_PROLOG_BEGIN_TAG | ||
| # This is an automatically generated prolog. | ||
| # | ||
| --- a/src/build/parsAndCutElf.py | ||
| +++ b/src/build/parsAndCutElf.py | ||
| @@ -1,4 +1,4 @@ | ||
| -#!/usr/bin/python2 | ||
| +#!/usr/bin/python3 | ||
| # IBM_PROLOG_BEGIN_TAG | ||
| # This is an automatically generated prolog. | ||
| # | ||
| --- a/src/build/updateBuildTag.py | ||
| +++ b/src/build/updateBuildTag.py | ||
| @@ -1,4 +1,4 @@ | ||
| -#!/usr/bin/python2 | ||
| +#!/usr/bin/python3 | ||
| # IBM_PROLOG_BEGIN_TAG | ||
| # This is an automatically generated prolog. | ||
| # | ||
| --- a/src/boot/sbeCompression.py | ||
| +++ b/src/boot/sbeCompression.py | ||
| @@ -1,4 +1,4 @@ | ||
| -#!/usr/bin/python2 | ||
| +#!/usr/bin/python3 | ||
| # IBM_PROLOG_BEGIN_TAG | ||
| # This is an automatically generated prolog. | ||
| # | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| skiboot: link final elf with -z notext for newer binutils | ||
|
|
||
| skiboot is a self-relocating PIE and processes its own relocations at | ||
| boot, so it legitimately contains text relocations. binutils >= 2.39 | ||
| promotes "read-only segment has dynamic relocations" from a warning to a | ||
| hard error by default (e.g. binutils 2.46 on Fedora 44 / Ubuntu 26.04, | ||
| 2.44 on Debian 13), breaking the final link. Pass -z notext to allow it. | ||
|
|
||
| Upstream: https://github.com/open-power/skiboot (Makefile.main) | ||
| Signed-off-by: Trung Le <trung.le@ruby-journal.com> | ||
|
|
||
| diff --git a/Makefile.main b/Makefile.main | ||
| index a06d79fe..22a9cdee 100644 | ||
| --- a/Makefile.main | ||
| +++ b/Makefile.main | ||
| @@ -197,6 +197,10 @@ LDFLAGS_FINAL = -m elf64lppc --no-multi-toc -N --build-id=none --whole-archive | ||
| LDFLAGS_FINAL += -static -nostdlib -pie -Ttext-segment=$(LD_TEXT) --oformat=elf64-powerpc | ||
| LDFLAGS_FINAL += --orphan-handling=warn | ||
| LDFLAGS_FINAL += $(call try-ldflag,$(LD),--no-warn-rwx-segments) | ||
| +# skiboot is a self-relocating PIE and processes its own relocations at boot, | ||
| +# so it legitimately has text relocations. binutils >= 2.39 turns "read-only | ||
| +# segment has dynamic relocations" into a hard error by default; allow it. | ||
| +LDFLAGS_FINAL += $(call try-ldflag,$(LD),-z notext) | ||
|
|
||
| LDRFLAGS=-melf64ppc | ||
| # Debug stuff |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once open-power/occ#37 is merged, we could remove this wrapper