Merge pull request #204080 from raphaelr/klibc
This commit is contained in:
commit
f8e94cca07
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }:
|
{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl, nixosTests }:
|
||||||
|
|
||||||
let
|
let
|
||||||
commonMakeFlags = [
|
commonMakeFlags = [
|
||||||
@ -9,11 +9,11 @@ in
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "klibc";
|
pname = "klibc";
|
||||||
version = "2.0.10";
|
version = "2.0.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
|
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
|
||||||
sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0=";
|
hash = "sha256-XrMOXh7HPcTjhMYLuUOvicUxdMgvh3Ev3TTdMoZNX2A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./no-reinstall-kernel-headers.patch ];
|
patches = [ ./no-reinstall-kernel-headers.patch ];
|
||||||
@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
|
|||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
# uses klibc's ipconfig
|
||||||
|
inherit (nixosTests) initrd-network-ssh;
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Minimalistic libc subset for initramfs usage";
|
description = "Minimalistic libc subset for initramfs usage";
|
||||||
homepage = "https://kernel.org/pub/linux/libs/klibc/";
|
homepage = "https://kernel.org/pub/linux/libs/klibc/";
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.install
|
diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
|
||||||
--- klibc-2.0.3-orig/scripts/Kbuild.install 2013-12-03 13:53:46.000000000 -0500
|
index 0788637f..6708e19f 100644
|
||||||
+++ klibc-2.0.3/scripts/Kbuild.install 2014-01-04 18:17:09.342609021 -0500
|
--- a/scripts/Kbuild.install
|
||||||
@@ -95,7 +95,6 @@
|
+++ b/scripts/Kbuild.install
|
||||||
|
@@ -102,7 +102,6 @@ header:
|
||||||
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
|
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
|
||||||
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
|
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
|
||||||
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
|
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
|
||||||
- $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
|
- $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
|
||||||
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
|
ifneq ($(srctree),$(objtree))
|
||||||
$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
|
$(Q)cp -rf $(srctree)/usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
|
||||||
$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user