Skip to content

kexec-tools: fix static build#422618

Merged
ConnorBaker merged 1 commit intoNixOS:stagingfrom
jmbaur:kexec-tools-static
Jul 7, 2025
Merged

kexec-tools: fix static build#422618
ConnorBaker merged 1 commit intoNixOS:stagingfrom
jmbaur:kexec-tools-static

Conversation

@jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Jul 5, 2025

As per the comment in kexec-tools source, ZSTD_isFrame is a

/*
 * Reimplementation of private function available if zstd is
 * statically linked. Remove when it becomes public.
 */

This patch pulls in a fix that allows for these duplicate symbols to link successfully.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@jmbaur jmbaur requested a review from ConnorBaker July 5, 2025 06:09
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 5, 2025
As per the comment in kexec-tools source, `ZSTD_isFrame` is a

```c
/*
 * Reimplementation of private function available if zstd is
 * statically linked. Remove when it becomes public.
 */
```

This patch pulls in a fix that allows for these duplicate symbols to
link successfully.
@jmbaur jmbaur force-pushed the kexec-tools-static branch from 196194f to bc884bc Compare July 5, 2025 23:51
@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 6, 2025
@jmbaur jmbaur changed the base branch from master to staging July 7, 2025 02:28
@nixpkgs-ci nixpkgs-ci bot closed this Jul 7, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Jul 7, 2025
@ConnorBaker
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 422618 --package kexec-tools
Commit: bc884bc5f6a06f4133eb2a8ab3430e08bf1f3b03


x86_64-linux

✅ 1 package built:
  • kexec-tools

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 7, 2025
@ConnorBaker
Copy link
Contributor

The test doesn't evaluate, but that's broken on master as well and out of scope of this PR. @jmbaur has made a fix here: #423097.

@ConnorBaker ConnorBaker merged commit 1cf013f into NixOS:staging Jul 7, 2025
48 of 52 checks passed
@jmbaur jmbaur deleted the kexec-tools-static branch July 7, 2025 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants