diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-21 20:39:52 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-21 20:39:52 +0000 |
| commit | 7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7 (patch) | |
| tree | fb5d12ad50bdc9dad10e4c381b78ce3ccaec5c72 /pkgs | |
| parent | 13a8b34a81632aa8c23293c5646d43cab724e878 (diff) | |
| download | nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.tar nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.tar.gz nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.tar.bz2 nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.tar.lz nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.tar.xz nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.tar.zst nixpkgs-7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7.zip | |
Updating busybox.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24800
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/busybox/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/misc/busybox/make-3.82.patch | 29 |
2 files changed, 4 insertions, 37 deletions
diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index c40ff9b8075..67ea1c1fa9a 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -20,10 +20,8 @@ let echo "parseconfig: removing $NAME" sed -i /^$NAME=/d .config - if test "$OPTION" != n; then - echo "parseconfig: setting $NAME=$OPTION" - echo "$NAME=$OPTION" >> .config - fi + echo "parseconfig: setting $NAME=$OPTION" + echo "$NAME=$OPTION" >> .config done set +x } @@ -41,15 +39,13 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.17.1"; + name = "busybox-1.17.3"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0r6i76lad5w359pw93i9wrq2a1pxk8xw6xr4cq71n5by1n0pg4dz"; + sha256 = "1whza71p28r243j0qil1ari6p779h84ix1ikmmsqs1hsyrs04byy"; }; - 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 deleted file mode 100644 index eb95ae3b833..00000000000 --- a/pkgs/misc/busybox/make-3.82.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 |