Fuse bereinigt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@786 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/fuse b/lfs/fuse
index 68b3e131dfce583beb02ba6a18a5b4d2813e9e28..ac6b15c4e884303354ef48f8f706c0190cd43317 100644 (file)
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -32,11 +32,7 @@ THISAPP    = fuse-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-       TARGET = $(DIR_INFO)/$(THISAPP)-smp
-else
-       TARGET = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -79,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --with-kernel=/usr/src/linux
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index 1edaed64453b0ac141758cef40383761b8bc4dcb..6b04f4d7e3a77e7d8d4f561e731cce552b5c2f29 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -330,12 +330,10 @@ buildipfire() {
   ipfiremake ipp2p                     SMP=1
   ipfiremake r8169                     SMP=1
   ipfiremake zaptel                    SMP=1
-  ipfiremake fuse                              SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake r8169
   ipfiremake zaptel
-  ipfiremake fuse
   ipfiremake pkg-config
   ipfiremake cpio
   ipfiremake klibc
@@ -380,6 +378,7 @@ buildipfire() {
   ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake sysfsutils
+  ipfiremake fuse
   ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate