From 07091eed111c2ed57b844ba7348a2368e511fef9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 17 Nov 2007 14:05:32 +0000 Subject: [PATCH] Make kernel builder compatible with 2.6.24-rc2 svn path=/nixpkgs/branches/stdenv-updates/; revision=9732 --- pkgs/os-specific/linux/kernel/builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 3512a74c1965..af5aa8de8c20 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -66,6 +66,7 @@ installPhase() { cp arch/$arch/boot/bzImage $out/vmlinuz fi + sed -e '/-b $(INSTALL_MOD_PATH)/d' -i Makefile # Install the modules in $out/lib/modules with matching paths # in modules.dep (i.e., refererring to $out/lib/modules, not # /lib/modules). The depmod_opts= is to prevent the kernel @@ -95,7 +96,7 @@ installPhase() { if test "$arch" != um; then # copy all Makefiles and Kconfig files ln -s $out/lib/modules/$version/build $out/lib/modules/$version/source - cp --parents `find -type f -name Makefile -o -name "Kconfig*"` $out/lib/modules/$version/build + cp --parents `find -type f -name Makefile-\* -o -name "Kconfig*"` $out/lib/modules/$version/build cp Module.symvers $out/lib/modules/$version/build # weed out unneeded stuff