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

klibc: 2.0.4 -> 2.0.7

Browse Source
This commit is contained in:
Franz Pletz 2020-02-08 14:30:51 +01:00
parent ea7d02406b
commit 4ba8086aa1
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, linuxHeaders, perl }: { lib, stdenv, fetchurl, linuxHeaders, perl }:
let let
commonMakeFlags = [ commonMakeFlags = [
@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "klibc"; pname = "klibc";
version = "2.0.4"; version = "2.0.7";
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 = "7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb"; sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb";
}; };
patches = [ ./no-reinstall-kernel-headers.patch ]; patches = [ ./no-reinstall-kernel-headers.patch ];
@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
dir=$out/lib/klibc/bin.static dir=$out/lib/klibc/bin.static
mkdir $dir mkdir $dir
cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/
cp usr/dash/sh $dir/
for file in ${linuxHeaders}/include/*; do for file in ${linuxHeaders}/include/*; do
ln -sv $file $out/lib/klibc/include ln -sv $file $out/lib/klibc/include
@ -43,6 +42,10 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
platforms = [ "x86_64-linux" ]; description = "Minimalistic libc subset for initramfs usage";
homepage = "https://kernel.org/pub/linux/libs/klibc/";
maintainers = with lib.maintainers; [ fpletz ];
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
}; };
} }

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

@ -5,7 +5,7 @@ diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.in
$(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)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install - $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
$(Q)chmod -R a+rX $(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 $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1