Hi,
this patch fixes fuse24 parallel build.
-Raphael
diff -pruN fuse24.orig//Makefile fuse24/Makefile
--- fuse24.orig//Makefile 2010-03-08 18:00:23.000000000 +0100
+++ fuse24/Makefile 2010-03-08 17:59:52.000000000 +0100
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2008 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -11,12 +11,14 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.5.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
PKG_SOURCE_URL:=...@sf/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/fuse24/Default
@@ -26,10 +28,10 @@ define Package/fuse24/Default
endef
define Package/fuse24/Default/description
- FUSE for kernel 2.4 (Filesystem in UserSpacE) contains only the kernel module.
- The libraries and utilities can be compiled from a recent FUSE version (package fuse).
- For details see:
- http://apps.sourceforge.net/mediawiki/fuse/index.php?title=FAQ#What_version_of_FUSE_do_I_need_to_use_FUSE_with_Linux_2.4.3F
+FUSE for kernel 2.4 (Filesystem in UserSpacE) contains only the kernel module.
+The libraries and utilities can be compiled from a recent FUSE version (package
+fuse). For details see:
+http://apps.sourceforge.net/mediawiki/fuse/index.php?title=FAQ#What_version_of_FUSE_do_I_need_to_use_FUSE_with_Linux_2.4.3F
endef
define KernelPackage/fuse24
@@ -38,12 +40,12 @@ $(call Package/fuse24/Default)
DEPENDS:=...@linux_2_4
TITLE+= (kernel module)
FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,80,fuse)
+ AUTOLOAD:=$(call AutoLoad,80,fuse)
endef
define KernelPackage/fuse24/description
$(call Package/fuse24/Default/description)
- This package contains the FUSE kernel 2.4 module.
+This package contains the FUSE kernel 2.4 module.
endef
define KernelPackage/fuse24/install
@@ -96,20 +98,13 @@ define Build/Configure
);
endef
-define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
- mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
-endef
+MAKE_ARGS += ARCH="$(LINUX_KARCH)" \
+ CROSS_COMPILE="$(TARGET_CROSS)"
define Build/InstallDev
- mkdir -p $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
- mkdir -p $(1)/usr/lib/pkgconfig
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
