diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 23:13:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 23:13:21 +0000 |
| commit | 30892ab9fd596d3cc02854f7cc368679e933feb6 (patch) | |
| tree | c380f537a9343f1ee454bd414c3c4e9dd4ef5d7e /pkgs/misc/busybox | |
| parent | dc19818cc75f6905de651dc559158ba5ef1eab9f (diff) | |
| download | nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.tar nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.tar.gz nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.tar.bz2 nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.tar.lz nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.tar.xz nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.tar.zst nixlib-30892ab9fd596d3cc02854f7cc368679e933feb6.zip | |
Updating busybox and adding a patch that allows it to build with make 3.82
svn path=/nixpkgs/branches/stdenv-updates/; revision=23345
Diffstat (limited to 'pkgs/misc/busybox')
| -rw-r--r-- | pkgs/misc/busybox/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/misc/busybox/make-3.82.patch | 29 |
2 files changed, 35 insertions, 4 deletions
diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index f4980935c86c..c40ff9b80759 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -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} diff --git a/pkgs/misc/busybox/make-3.82.patch b/pkgs/misc/busybox/make-3.82.patch new file mode 100644 index 000000000000..eb95ae3b833e --- /dev/null +++ b/pkgs/misc/busybox/make-3.82.patch @@ -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 |