Updated to busybox-1.14.3 and fixed for 2.7 branch (verified compilation and tested...

diff --git a/Makefile b/Makefile
index beba480740f6496f695050b2d999936159d9a39f..09c0b3bb0cf8a5038e7d702e0c056f3e19638218 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ KERNEL_PATH = $(TOPDIR)/../kernel/$(DEVICE)
 KERNEL_VERSION = $(shell grep '^KERNEL_VERSION = ' $(KERNEL_PATH)/Makefile | sed 's|KERNEL_VERSION = ||')
 
 BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
-BUSYBOX_VERSION  = 1.14.1
+BUSYBOX_VERSION  = 1.14.3
 
 .PHONY: all check-root busybox initrd clean distclean
 
@@ -28,14 +28,17 @@ dist-clean: busybox-distclean initrd-distclean
 check-root:
        @if [ "$$UID" != "0" ]; then \
                echo "You need to be root to do this."; \
+    echo "Now you should run 'make initrd' as root to finish compilation or 'sudo make initrd'."; \
                exit 1; \
        fi
 
 $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2:
        wget -P $(WORK) -c http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
 
-$(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config
+$(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config $(WORK)/busybox-$(BUSYBOX_VERSION)-make382.patch
        tar -C $(WORK) -xvjf $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
+       cd $(WORK)/busybox-$(BUSYBOX_VERSION) && \
+               patch -p1 -i $(WORK)/busybox-$(BUSYBOX_VERSION)-make382.patch
        cp -v $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config $(WORK)/busybox-$(BUSYBOX_VERSION)/.config
        touch $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
 

diff --git a/busybox-1.14.1.config b/busybox-1.14.3.config
similarity index 100%
rename from busybox-1.14.1.config
rename to busybox-1.14.3.config

diff --git a/filesystem/crux b/filesystem/crux
index 36004740dbd37eac54d494e757572c19ff4f97da..04ec127e1ca2159c7f38e0020b8e1f738257dda7 100755 (executable)
--- a/filesystem/crux
+++ b/filesystem/crux
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-echo "CRUX 2.6"
+echo "CRUX 2.7"
 
 # End of file

diff --git a/work/busybox-1.14.3-make382.patch b/work/busybox-1.14.3-make382.patch
new file mode 100644 (file)
index 0000000..7f7febb
--- /dev/null
+++ b/work/busybox-1.14.3-make382.patch
@@ -0,0 +1,20 @@
+--- busybox-1.14.1/Makefile    2009-05-27 16:02:33.000000000 +0000
++++ busybox-1.14.1_new/Makefile        2011-05-13 09:31:29.000000000 +0000
+@@ -419,7 +419,7 @@
+ -include $(srctree)/arch/$(ARCH)/Makefile
+ export KBUILD_DEFCONFIG
+ 
+-config %config: scripts_basic outputmakefile FORCE
++%config: scripts_basic outputmakefile FORCE
+       $(Q)mkdir -p include
+       $(Q)$(MAKE) $(build)=scripts/kconfig $@
+       $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+@@ -1267,7 +1267,7 @@
+       $(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)
+ %.ko: prepare scripts FORCE
\ No newline at end of file