public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating busybox. 

svn path=/nixpkgs/branches/stdenv-updates/; revision=24800
This commit is contained in:
Lluís Batlle i Rossell 2010-11-21 20:39:52 +00:00
parent 13a8b34a81
commit 7715dc2beb
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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}

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

@ -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