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

syslinux: fix submodule clone #316878

Closed
wants to merge 2 commits into from

Conversation

SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jun 3, 2024

Description of changes

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.11 Release Notes (or backporting 23.11 and 24.05 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.

Copy link
Member

@raboof raboof left a comment

Choose a reason for hiding this comment

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

Tested that it works in a nix-shell (with unpackPhase and patchPhase). Not sure I understand the problem, but being able to manipulate gnu-efi-src might be nice anyway, so LGTM.

--replace /usr/include/ ""
--replace-fail /usr/include/ ""

# needs to be manually put in place because submodule hash contains an extra g in the beginning gd34132e
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure the g is the problem here: the error message in the current behavior has fatal: Fetched in submodule path 'gnu-efi', but it did not contain d34132e62f666904158c7ec2f1eef5a9d5281c36. Direct fetching of that commit failed., so it seems to get the git hash just fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

Then my best next guess is, that sourceforge is weird. I didn't want to click through many pages to find the old release.

@samueldr
Copy link
Member

samueldr commented Jun 3, 2024

Is there a linked issue? What problem does that solve?

I don't see a rationale anywhere about this, or a concise way to reproduce an issue.

gnu-efi-src = fetchFromGitHub {
owner = "ncroxon";
repo = "gnu-efi";
# see 363d61c4f112b972649b19d67e96b9321f738f00 in syslinux
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# see 363d61c4f112b972649b19d67e96b9321f738f00 in syslinux
# see 363d61c4f112b972649b19d67e96b9321f738f00 in syslinux
# https://repo.or.cz/syslinux.git/commitdiff/363d61c4f112b972649b19d67e96b9321f738f00

@samueldr samueldr mentioned this pull request Jun 3, 2024
13 tasks
@samueldr
Copy link
Member

samueldr commented Jun 3, 2024

I took some time into actually re-familiarizing myself with the derivation, then fixed the build so we use gnu-efi from Nixpkgs to build the EFI outputs. See #317030.

@SuperSandro2000 SuperSandro2000 deleted the syslinux-src branch June 4, 2024 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Minimal ISO runtime
Development

Successfully merging this pull request may close these issues.

3 participants