colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #204080 from raphaelr/klibc

Browse Source
This commit is contained in:
Sandro 2022-12-02 21:43:32 +01:00 committed by GitHub
commit f8e94cca07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/klibc/default.nix
View File

@ -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/";

15
pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
View File

@ -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