ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Updating busybox and adding a patch that allows it to build with make 3.82

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23345
This commit is contained in:
Lluís Batlle i Rossell 2010-08-21 23:13:21 +00:00
parent dc19818cc7
commit 30892ab9fd
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/busybox/default.nix
View File

@ -40,14 +40,16 @@ let
in
stdenv.mkDerivation {
name = "busybox-1.16.0";
stdenv.mkDerivation rec {
name = "busybox-1.17.1";
src = fetchurl {
url = http://busybox.net/downloads/busybox-1.16.0.tar.bz2;
sha256 = "1n738zk01yi2sjrx2y36hpzxbslas8b91vzykcifr0p1j7ym0lim";
url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "0r6i76lad5w359pw93i9wrq2a1pxk8xw6xr4cq71n5by1n0pg4dz";
};
patches = [ ./make-3.82.patch ];
configurePhase = ''
make defconfig
${configParser}

29
pkgs/misc/busybox/make-3.82.patch Normal file
View File

@ -0,0 +1,29 @@
--- busybox/Makefile 2010-08-19 10:38:51.000000000 +0200
+++ busybox-make382/Makefile 2010-08-19 14:46:03.000000000 +0200
@@ -433,7 +433,12 @@
-include $(srctree)/arch/$(ARCH)/Makefile
export KBUILD_DEFCONFIG
-config %config: scripts_basic outputmakefile gen_build_files FORCE
+config: scripts_basic outputmakefile gen_build_files FORCE
+ $(Q)mkdir -p include
+ $(Q)$(MAKE) $(build)=scripts/kconfig $@
+ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+
+%config: scripts_basic outputmakefile gen_build_files FORCE
$(Q)mkdir -p include
$(Q)$(MAKE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@ -1285,7 +1290,11 @@
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
# Modules
-/ %/: prepare scripts FORCE
+%/: prepare scripts FORCE
+ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ $(build)=$(build-dir)
+
+/: prepare scripts FORCE
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)
%.ko: prepare scripts FORCE