fix update-svn

diff --git a/Makefile b/Makefile
index 68ad1ef68495352e7ee0547e6267e4be25987e6f..cb32ae49f344702a77d1e58426fc235a9ce254dd 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,6 @@ update-neutrino:
 update-svn:
        cd $(SVN_COOLSTREAM) && $(SVN) up *
        cd $(SVN_CROSSENVIROMENT) && $(SVN) up *
-       cd $(SVN_THIRDPARTY)/applications/tools/busybox-1.2.0 && $(SVN) up *
        cd $(SVN_THIRDPARTY)/applications/tools/hotplug && $(SVN) up *
        cd $(SVN_THIRDPARTY)/applications/plugins/links && $(SVN) up *
        cd $(SVN_THIRDPARTY)/libraries && $(SVN) up *
@@ -114,6 +113,7 @@ update-svn:
        $(MAKE) $(GIT_LIBRARIES)/ffmpeg
        $(MAKE) $(GIT_LIBRARIES)/OpenThreads
        $(MAKE) $(GIT_DRIVERS)
+       $(MAKE) $(GIT_KERNEL)
        $(MAKE) $(GIT_PLUGINS)
 
 update-svn-target:
@@ -213,7 +213,7 @@ wittinobi-all-new:
 
 # prerequisites.mk
 prerequisites:
-       $(MAKE) $(SOURCE_DIR)/neutrino-hd $(SVN_COOLSTREAM) $(SVN_CROSSENVIROMENT) $(SVN_THIRDPARTY)/applications/tools/busybox-1.2.0 $(SVN_THIRDPARTY)/applications/tools/hotplug $(SVN_THIRDPARTY)/applications/plugins/links $(SVN_THIRDPARTY)/libraries $(SVN_THIRDPARTY)/lib $(SVN_THIRDPARTY)/drivers $(SVN_THIRDPARTY)/bootloader $(GIT_LIBRARIES)/dvbsi $(GIT_LIBRARIES)/ffmpeg $(GIT_LIBRARIES)/OpenThreads $(GIT_DRIVERS) $(GIT_KERNEL) $(GIT_PLUGINS)
+       $(MAKE) $(SOURCE_DIR)/neutrino-hd $(SVN_COOLSTREAM) $(SVN_CROSSENVIROMENT) $(SVN_THIRDPARTY)/applications/tools/hotplug $(SVN_THIRDPARTY)/applications/plugins/links $(SVN_THIRDPARTY)/libraries $(SVN_THIRDPARTY)/lib $(SVN_THIRDPARTY)/drivers $(SVN_THIRDPARTY)/bootloader $(GIT_LIBRARIES)/dvbsi $(GIT_LIBRARIES)/ffmpeg $(GIT_LIBRARIES)/OpenThreads $(GIT_DRIVERS) $(GIT_KERNEL) $(GIT_PLUGINS)
 
 # bootstrap.mk
 bootstrap:

diff --git a/make/applications.mk b/make/applications.mk
index a6c6c6ada61ca2431760d12b0303a456fe69a680..ac92f1bf6bb1118d2b3f7a3fe3ae403b37066931 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -30,16 +30,6 @@ $(D)/procps-new: $(D)/libncurses-new $(ARCHIVE)/procps-3.2.8.tar.gz | $(TARGETPR
        $(REMOVE)/procps-3.2.8
        touch $@
 
-$(D)/busybox-old: | $(TARGETPREFIX)
-       tar -C $(SOURCE_DIR)/svn/THIRDPARTY/applications/tools -cp busybox-1.2.0 --exclude=.svn | tar -C $(BUILD_TMP) -x
-       pushd $(BUILD_TMP)/busybox-1.2.0 && \
-               cp $(SOURCE_DIR)/svn/THIRDPARTY/applications/tools/busybox-1.2.0/config.coolstream .config && \
-               sed -i -e 's#^CONFIG_PREFIX.*#CONFIG_PREFIX="$(TARGETPREFIX)"#' .config && \
-               $(MAKE) all  CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)" && \
-               $(MAKE) install CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)"
-       $(REMOVE)/busybox-1.2.0
-       touch $@
-
 $(D)/busybox: $(ARCHIVE)/busybox-1.17.1.tar.bz2 | $(TARGETPREFIX)
        $(UNTAR)/busybox-1.17.1.tar.bz2
        pushd $(BUILD_TMP)/busybox-1.17.1 && \

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 874af1dbfd9b29b4d4fb98a28ab903c16ebae514..6024e9cdc86f788c08a557a2bdddddca7993b811 100755 (executable)
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -69,7 +69,7 @@ $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis: | $(TARGETPREFIX)
 
 $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis: | $(TARGETPREFIX)
        mkdir -p $@
-       cp -a $(SOURCE_DIR)/git/DRIVERS/drivers/2.6.34.13-nevis/* $@/
+       cp -a $(SOURCE_DIR)/git/DRIVERS/drivers/2.6.35.14-nevis/* $@/
 
 $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis: | $(TARGETPREFIX)
        mkdir -p $@

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index c590883f787c29b327a280abba1898550e3be289..56f544a1b63b5bdfb6bcbd0bb07e56bc0f30d1e9 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -103,26 +103,14 @@ $(SVN_CROSSENVIROMENT):
        mkdir -p $(shell dirname $@)
        cd $(shell dirname $@) && $(SVNCO)/CROSSENVIROMENT
 
-$(SVN_THIRDPARTY)/applications/tools/busybox-1.2.0:
-       mkdir -p $(shell dirname $@)
-       cd $(shell dirname $@) && $(SVNCO)/THIRDPARTY/applications/tools/busybox-1.2.0
-
 $(SVN_THIRDPARTY)/applications/tools/hotplug:
        mkdir -p $(shell dirname $@)
        cd $(shell dirname $@) && $(SVNCO)/THIRDPARTY/applications/tools/hotplug
 
-$(SVN_THIRDPARTY)/applications/plugins/lbreakout2-2.6:
-       mkdir -p $(shell dirname $@)
-       cd $(shell dirname $@) && $(SVNCO)/THIRDPARTY/applications/plugins/lbreakout2-2.6
-
 $(SVN_THIRDPARTY)/applications/plugins/links:
        mkdir -p $(shell dirname $@)
        cd $(shell dirname $@) && $(SVNCO)/THIRDPARTY/applications/plugins/links
 
-$(SVN_THIRDPARTY)/applications/plugins/ltris-1.0.13:
-       mkdir -p $(shell dirname $@)
-       cd $(shell dirname $@) && $(SVNCO)/THIRDPARTY/applications/plugins/ltris-1.0.13
-
 $(SVN_THIRDPARTY)/libraries:
        mkdir -p $(shell dirname $@)
        cd $(shell dirname $@) && $(SVNCO)/THIRDPARTY/libraries
@@ -217,11 +205,8 @@ $(GIT_PLUGINS):
 PHONY += $(SOURCE_DIR)/neutrino-hd
 PHONY += $(SVN_COOLSTREAM)
 PHONY += $(SVN_CROSSENVIROMENT)
-PHONY += $(SVN_THIRDPARTY)/applications/tools/busybox-1.2.0
 PHONY += $(SVN_THIRDPARTY)/applications/tools/hotplug
-PHONY += $(SVN_THIRDPARTY)/applications/plugins/lbreakout2-2.6
 PHONY += $(SVN_THIRDPARTY)/applications/plugins/links
-PHONY += $(SVN_THIRDPARTY)/applications/plugins/ltris-1.0.13
 PHONY += $(SVN_THIRDPARTY)/libraries
 PHONY += $(SVN_THIRDPARTY)/lib
 PHONY += $(SVN_THIRDPARTY)/drivers