diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-02 21:43:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-02 21:43:32 +0100 |
| commit | f8e94cca07722ecb29a69c003202724392581a6c (patch) | |
| tree | e29031f7d5090ef17cb9dcb490f4effb2ada1629 /pkgs/os-specific | |
| parent | bf5af33cd6b1b2979e68764e7f7dfd204cac8fd8 (diff) | |
| parent | 0cccb224ee5c2d4632170836d5d183347784d38d (diff) | |
| download | nixlib-f8e94cca07722ecb29a69c003202724392581a6c.tar nixlib-f8e94cca07722ecb29a69c003202724392581a6c.tar.gz nixlib-f8e94cca07722ecb29a69c003202724392581a6c.tar.bz2 nixlib-f8e94cca07722ecb29a69c003202724392581a6c.tar.lz nixlib-f8e94cca07722ecb29a69c003202724392581a6c.tar.xz nixlib-f8e94cca07722ecb29a69c003202724392581a6c.tar.zst nixlib-f8e94cca07722ecb29a69c003202724392581a6c.zip | |
Merge pull request #204080 from raphaelr/klibc
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch | 15 |
2 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 47cf03a3a87f..1a194421a6bc 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }: +{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl, nixosTests }: let commonMakeFlags = [ @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0="; + hash = "sha256-XrMOXh7HPcTjhMYLuUOvicUxdMgvh3Ev3TTdMoZNX2A="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = { + # uses klibc's ipconfig + inherit (nixosTests) initrd-network-ssh; + }; + meta = { description = "Minimalistic libc subset for initramfs usage"; homepage = "https://kernel.org/pub/linux/libs/klibc/"; diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch index 709dd30f8c7e..bf46a17f3d7d 100644 --- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch +++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch @@ -1,11 +1,12 @@ -diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.install ---- klibc-2.0.3-orig/scripts/Kbuild.install 2013-12-03 13:53:46.000000000 -0500 -+++ klibc-2.0.3/scripts/Kbuild.install 2014-01-04 18:17:09.342609021 -0500 -@@ -95,7 +95,6 @@ +diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install +index 0788637f..6708e19f 100644 +--- a/scripts/Kbuild.install ++++ b/scripts/Kbuild.install +@@ -102,7 +102,6 @@ header: $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 + ifneq ($(srctree),$(objtree)) + $(Q)cp -rf $(srctree)/usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. + endif |