fix kmod-fuse build on 2.4

[openwrt.git] / target / linux / package / fuse / Makefile

diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile
index 39f5f38..e9922bc 100644 (file)
--- a/target/linux/package/fuse/Makefile
+++ b/target/linux/package/fuse/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 PKG_NAME:=fuse
 include ../../rules.mk
 
 PKG_NAME:=fuse

-PKG_VERSION:=2.4.1
+PKG_VERSION:=2.5.2

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c
+PKG_MD5SUM:=ea565debe6c7486963bef05c45c50361

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


@@ -15,13 +15,9 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
-

 include $(TOPDIR)/package/rules.mk
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
+$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))

 
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); \
 
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); \


@@ -60,7 +56,7 @@ $(PKG_BUILD_DIR)/.configured:
                        --disable-util \
                        --disable-example \
                        --disable-auto-modprobe \
                        --disable-util \
                        --disable-example \
                        --disable-auto-modprobe \

-                       --with-kernel=$(KERNEL_DIR) \
+                       --with-kernel=$(LINUX_DIR) \

                        --disable-mtab \
        );
        touch $@
                        --disable-mtab \
        );
        touch $@


@@ -69,6 +65,7 @@ $(PKG_BUILD_DIR)/.built:
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                ARCH="$(LINUX_KARCH)" \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                ARCH="$(LINUX_KARCH)" \

+               CROSS_COMPILE="$(TARGET_CROSS)" \

                PATH="$(TARGET_PATH)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                SUBDIRS="kernel" \
                PATH="$(TARGET_PATH)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                SUBDIRS="kernel" \


@@ -77,7 +74,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_KMOD_FUSE):
        mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
 
 $(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.$(LINUX_KMOD_SUFFIX) \
+       $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \

                $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
 
                $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)