diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-03-02 17:14:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 17:14:06 +0100 |
| commit | 70325e63d8a056f8efaab1e47992eb15d2c62232 (patch) | |
| tree | 698be23fdf134133caf1f0a1757debfa4488820f /pkgs/os-specific/linux | |
| parent | 5ecf20ff8f8ed58f2f7cda311186890ba0d1e881 (diff) | |
| parent | 589789997fe882668eae25f1f0578230d8576506 (diff) | |
| download | nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.tar nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.tar.gz nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.tar.bz2 nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.tar.lz nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.tar.xz nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.tar.zst nixlib-70325e63d8a056f8efaab1e47992eb15d2c62232.zip | |
Merge pull request #79532 from NixOS/fix-predictable-ifnames-in-initrd
nixos/stage-1: fix predictable interface names in initrd
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 8e224c8f33b8..a92970726dca 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders, perl }: +{ lib, stdenv, fetchurl, linuxHeaders, perl }: let commonMakeFlags = [ @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb"; + sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb"; }; patches = [ ./no-reinstall-kernel-headers.patch ]; @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { dir=$out/lib/klibc/bin.static mkdir $dir cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ - cp usr/dash/sh $dir/ for file in ${linuxHeaders}/include/*; do ln -sv $file $out/lib/klibc/include @@ -43,6 +42,10 @@ stdenv.mkDerivation rec { ''; 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; }; } 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 d3e55fc8731d..709dd30f8c7e 100644 --- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch +++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch @@ -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)lib $(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)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 |