move package/linux into target/linux, use wbx' new kernel code. support building images with more than one kernel, split kernel module parts off of packages that use their own kernel modules (fuse, shfs, openswan). some cleanup in the image building process in target/. image builder is disabled for now, needs some fixing.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1085 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/fuse/Config.in

@@ -1,39 +1,14 @@
 config BR2_PACKAGE_FUSE
 	bool
 	default n
-	depends BR2_PACKAGE_KMOD_FUSE
+	depends BR2_PACKAGE_LIBFUSE
 
-config BR2_PACKAGE_KMOD_FUSE
-	select BR2_PACKAGE_FUSE
-	prompt "kmod-fuse - FUSE kernel module"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_FUSE
-	help
-	  With FUSE it is possible to implement a fully functional 
-	  filesystem in a userspace program.
-	  
-	  Features include:
-	  
-	   * Simple library API
-	   * Simple installation (no need to patch or recompile the kernel)
-	   * Secure implementation
-	   * Userspace - kernel interface is very efficient
-	   * Usable by non privileged users
-	   * Runs on Linux kernels 2.4.X and 2.6.X
-	   * Has proven very stable over time
-	  
-	  
-	  http://fuse.sourceforge.net/
-	  
-	  This package contains the fuse.o kernel module.
-	  
 
 config BR2_PACKAGE_LIBFUSE
 	prompt "libfuse - FUSE library"
 	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_KMOD_FUSE
+	select BR2_PACKAGE_KMOD_FUSE
 	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  With FUSE it is possible to implement a fully functional 

package/fuse/Makefile

@@ -16,7 +16,6 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
@@ -69,12 +68,6 @@ $(PKG_BUILD_DIR)/.built:
 		all install
 	touch $@
 
-$(IPKG_KMOD_FUSE):
-	mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
-	cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.o \
-	 $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
-	$(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
-
 $(IPKG_LIBFUSE):
 	mkdir -p $(IDIR_LIBFUSE)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/

package/fuse/ipkg/kmod-fuse.control

@@ -1,8 +0,0 @@
-Package: kmod-fuse
-Priority: optional
-Section: kernel
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/fuse2/
-Description: Filesystem in Userspace (kernel module)