Fix the mac80211 installation, remove the in-kernel mac80211 package, thanks to Danie...

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index d310e92..afdaa77 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,16 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse

-PKG_VERSION:=2.6.1
+PKG_VERSION:=2.6.5

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)

-PKG_MD5SUM:=13e1873086a1d7a95f470bbc7428c528
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=66bd30503df55a87b9868835ca5a45bc

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -35,33 +31,52 @@ define Package/fuse-utils
   $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities

+  DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6

   TITLE+= (utilities)
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE utilities.
 endef
 
   TITLE+= (utilities)
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE utilities.
 endef
 

-define Package/kmod-fuse
+define KernelPackage/fuse
+  SUBMENU:=Filesystems

   $(call Package/fuse/Default)
   $(call Package/fuse/Default)

-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
+  DEPENDS:=@LINUX_2_6

   TITLE+= (kernel module)
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE kernel module.
   TITLE+= (kernel module)
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE kernel module.

+  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)

   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)

+  AUTOLOAD:=$(call AutoLoad,80,fuse)

 endef
 
 define Package/libfuse
   $(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries
 endef
 
 define Package/libfuse
   $(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries

+  DEPENDS:=@LINUX_2_6

   TITLE+= (library)
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE shared library, needed by other programs.
 endef
 
   TITLE+= (library)
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE shared library, needed by other programs.
 endef
 

+CONFIGURE_VARS += \
+        kernsrcver="$(LINUX_VERSION)"
+
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --disable-rpath \
+       --enable-kernel-module \
+       --enable-lib \
+       --enable-util \
+       --disable-example \
+       --disable-auto-modprobe \
+       --with-kernel="$(LINUX_DIR)" \
+       --disable-mtab
+

 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                touch configure.in ; \
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                touch configure.in ; \


@@ -69,39 +84,8 @@ define Build/Configure
                touch Makefile.in ; \
                touch include/config.h.in ; \
                touch configure ; \
                touch Makefile.in ; \
                touch include/config.h.in ; \
                touch configure ; \

-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_LARGEFILE) \
-                       $(DISABLE_NLS) \
-                       --enable-shared \
-                       --enable-static \
-                       --disable-rpath \
-                       --enable-kernel-module \
-                       --enable-lib \
-                       --enable-util \
-                       --disable-example \
-                       --disable-auto-modprobe \
-                       --with-kernel="$(LINUX_DIR)" \
-                       --disable-mtab \
-       );
+       )
+       $(call Build/Configure/Default)

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -109,6 +93,8 @@ define Build/Compile
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

+               AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
+               EXTRA_DIST="" \

                all install
 endef
 
                all install
 endef
 


@@ -134,21 +120,11 @@ define Package/fuse-utils/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 

-define Package/kmod-fuse/install
-       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
-               $(1)/lib/modules/$(LINUX_VERSION)/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
-endef
-

 define Package/libfuse/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,fuse-utils))
 define Package/libfuse/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,fuse-utils))

-$(eval $(call BuildPackage,kmod-fuse))

 $(eval $(call BuildPackage,libfuse))
 $(eval $(call BuildPackage,libfuse))

+$(eval $(call KernelPackage,fuse))