diff options
| author | Raphael Robatsch <raphael-git@tapesoftware.net> | 2022-12-01 22:05:47 +0000 |
|---|---|---|
| committer | Raphael Robatsch <raphael-git@tapesoftware.net> | 2022-12-02 10:30:19 +0100 |
| commit | 6ace70150e0ded515f9bdf78c6ebe8f389739067 (patch) | |
| tree | 6a7162662de1187634705e573743f1be2197ba58 /pkgs/os-specific/linux/klibc | |
| parent | b72b8b94cf0c012b0252a9100a636cad69696666 (diff) | |
| download | nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.tar nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.tar.gz nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.tar.bz2 nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.tar.lz nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.tar.xz nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.tar.zst nixpkgs-6ace70150e0ded515f9bdf78c6ebe8f389739067.zip | |
klibc: 2.0.10 -> 2.0.11
Changelog: https://lists.zytor.com/archives/klibc/2022-October/004689.html
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 47cf03a3a87..bc2160c8484 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -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 ]; 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 709dd30f8c7..bf46a17f3d7 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 |