diff options
| author | Shea Levy <shea@shealevy.com> | 2014-01-05 07:13:19 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-01-05 07:13:19 -0500 |
| commit | 139f8949e6a5898aa8f245b49c18a6c523dce24e (patch) | |
| tree | 07eaae3112af64386c3dea40e27a15a85f798f76 /pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch | |
| parent | 010e63c69d4e240d01e319af392fbf6b03cf7490 (diff) | |
| parent | ac2035287fbec30d92165fd3839d1bf71b8edd47 (diff) | |
| download | nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.gz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.bz2 nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.lz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.xz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.zst nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.zip | |
Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config kernel builds (see #412 for the last time). The set of working kernel packages is a superset of those that work on master, and as the only objection last time was the size of the $dev closure and now both $out and $dev combined are 20M smaller than $out on master (see message for ac2035287fbec30d92165fd3839d1bf71b8edd47), this should be unobjectionable. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch new file mode 100644 index 000000000000..d3e55fc8731d --- /dev/null +++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch @@ -0,0 +1,11 @@ +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 @@ + $(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 -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 |