Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

uboot: build failure with older versions #311614

Closed
wants to merge 1 commit into from

Conversation

gngram
Copy link
Contributor

@gngram gngram commented May 14, 2024

Description of changes

Fix for build failure with version older than v2023.07.
The patch 0001-configs-rpi-allow-for-bigger-kernels.patch is hardware specific. It tries to modify a file board/raspberrypi/rpi/rpi.env which doesn't exist in uboot older than v2023.07 thus the patch fails and so uboot build.

Moved the patch to hardware specific targets.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from samueldr, lopsided98 and dezgeg May 14, 2024 10:13
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels May 14, 2024
@gngram gngram requested a review from Mic92 May 14, 2024 11:06
- fix for build failure with version older than v2023.07

Signed-off-by: Ganga Ram <[email protected]>
@Mic92 Mic92 force-pushed the pr/builduboot-failure branch from f85106e to ffb92fa Compare May 14, 2024 12:43
Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. I will give the other uboot maintainers a bit to react here.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 15, 2024
@lopsided98
Copy link
Contributor

See #146634, #250268

gngram added a commit to gngram/nixos-hardware that referenced this pull request May 16, 2024
The buildUBoot function was originally intended for internal use and
is dedicated for Raspberry Pi platforms. With latest nixpkgs it is causing
build failure due to an Raspberry Pi patch.

This function has been removed from the U-Boot build configuration.

More Information:
NixOS/nixpkgs#311614
NixOS/nixpkgs#146634

Signed-off-by: Ganga Ram <[email protected]>
gngram added a commit to gngram/nixos-hardware that referenced this pull request May 16, 2024
The buildUBoot function is intended for internal use and is dedicated
for Raspberry Pi platforms. With latest nixpkgs it is causing
build failure in older uboot(prior to v2023.07) due to a Raspberry Pi patch.

Now this function is not used for the U-Boot build.

More Information:
NixOS/nixpkgs#311614
NixOS/nixpkgs#146634

Signed-off-by: Ganga Ram <[email protected]>
mergify bot pushed a commit to NixOS/nixos-hardware that referenced this pull request May 16, 2024
The buildUBoot function is intended for internal use and is dedicated
for Raspberry Pi platforms. With latest nixpkgs it is causing
build failure in older uboot(prior to v2023.07) due to a Raspberry Pi patch.

Now this function is not used for the U-Boot build.

More Information:
NixOS/nixpkgs#311614
NixOS/nixpkgs#146634

Signed-off-by: Ganga Ram <[email protected]>
@samueldr
Copy link
Member

The buildUBoot builder is only intended to be used to target the current mainline U-Boot version. As such, patches can and should be applied outright. It also helps ensure they do continuously apply and do not cause unexpected regressions for other systems.

I'm closing under the assumption that NixOS/nixos-hardware#947 was the alternative fix for your issue.

@samueldr samueldr closed this May 16, 2024
CHN-beta pushed a commit to CHN-beta/nixos-hardware that referenced this pull request May 21, 2024
The buildUBoot function is intended for internal use and is dedicated
for Raspberry Pi platforms. With latest nixpkgs it is causing
build failure in older uboot(prior to v2023.07) due to a Raspberry Pi patch.

Now this function is not used for the U-Boot build.

More Information:
NixOS/nixpkgs#311614
NixOS/nixpkgs#146634

Signed-off-by: Ganga Ram <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants