From 96d396033d082871cc975277a78f7bf3eccfe877 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 30 Aug 2005 11:26:29 +0000 Subject: add missing patch (from Christian) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1793 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/fuse/patches/111-uclibc_changes.patch | 112 ++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 package/fuse/patches/111-uclibc_changes.patch (limited to 'package/fuse/patches/111-uclibc_changes.patch') diff --git a/package/fuse/patches/111-uclibc_changes.patch b/package/fuse/patches/111-uclibc_changes.patch new file mode 100644 index 000000000..2c85e988e --- /dev/null +++ b/package/fuse/patches/111-uclibc_changes.patch @@ -0,0 +1,112 @@ +diff -ruw fuse-2.3.0.org/lib/mount.c fuse-2.3.0/lib/mount.c +--- fuse-2.3.0.org/lib/mount.c 2005-02-02 12:14:44.000000000 +0100 ++++ fuse-2.3.0/lib/mount.c 2005-08-26 09:23:11.000000000 +0200 +@@ -6,6 +6,13 @@ + See the file COPYING.LIB. + */ + ++#include ++#ifdef HAVE_FEATURES_H ++#include ++#endif ++/* Remove this when config.h is updated with HAVE_FEATURES_H */ ++#include ++ + #include "fuse.h" + #include "fuse_compat.h" + +@@ -92,10 +99,11 @@ + return -1; + } + +-#ifndef USE_UCLIBC +- pid = fork(); +-#else ++#if defined(__UCLIBC__) && \ ++ (!defined(__ARCH_HAS_MMU__) && !defined(__UCLIBC_HAS_MMU__)) + pid = vfork(); ++#else ++ pid = fork(); + #endif + if(pid == -1) { + perror("fuse: fork() failed"); +diff -ruw fuse-2.3.0.org/util/fusermount.c fuse-2.3.0/util/fusermount.c +--- fuse-2.3.0.org/util/fusermount.c 2005-05-17 18:54:17.000000000 +0200 ++++ fuse-2.3.0/util/fusermount.c 2005-08-26 09:20:12.000000000 +0200 +@@ -17,6 +17,17 @@ + */ + + #include ++#ifdef HAVE_FEATURES_H ++#include ++#endif ++/* Remove this when config.h is updated with HAVE_FEATURES_H */ ++#include ++ ++#ifdef __UCLIBC__ ++/* Most embedded systems with uclibc have read-only root filesystem. Should ++ * replace this into a parameter --disable-mtab instead */ ++#define READONLY_MTAB 1 ++#endif + + #include + #include +@@ -40,7 +51,12 @@ + #define FUSE_COMMFD_ENV "_FUSE_COMMFD" + + #define FUSE_DEV_OLD "/proc/fs/fuse/dev" ++#ifdef __UCLIBC__ ++/* /dev is mounted as devfs in OpenWRT, and device is created here */ ++#define FUSE_DEV_NEW "/dev/misc/fuse" ++#else + #define FUSE_DEV_NEW "/dev/fuse" ++#endif + #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version" + #define FUSE_CONF "/etc/fuse.conf" + #define FUSE_MAJOR 10 +@@ -89,7 +105,7 @@ + return res; + } + +-#ifndef USE_UCLIBC ++#ifndef READONLY_MTAB + /* use a lock file so that multiple fusermount processes don't try and + modify the mtab file at once! */ + static int lock_mtab() +@@ -701,7 +717,12 @@ + return fd; + } + ++#ifdef __UCLIBC__ ++/* /dev is writeable on openwrt distribution */ ++#define FUSE_TMP_DIRNAME "/dev/.fuse_devXXXXXX" ++#else + #define FUSE_TMP_DIRNAME "/tmp/.fuse_devXXXXXX" ++#endif + #define FUSE_TMP_DEVNAME "/fuse" + + static int try_open_new_temp(dev_t devnum, char **devp) +@@ -761,17 +782,19 @@ + pid_t pid; + + fd = try_open_fuse_device(devp); ++ //fprintf(stderr, "open_fuse_device: try_open_fuse_device() ret=%d\n", fd); + if (fd >= 0) + return fd; + +-#ifndef USE_UCLIBC +- pid = fork(); +-#else ++#if defined(__UCLIBC__) && \ ++ (!defined(__ARCH_HAS_MMU__) && !defined(__UCLIBC_HAS_MMU__)) + pid = vfork(); ++#else ++ pid = fork(); + #endif + if (pid == 0) { + setuid(0); +- execl("/sbin/modprobe", "/sbin/modprobe", "fuse", NULL); ++ execl("/sbin/insmod", "/sbin/insmod", "fuse", NULL); + exit(1); + } + if (pid != -1) -- cgit v1.2.3 From 0f38239fa27ff22335d1ce052030593a5c1e4de9 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 20 Oct 2005 03:00:29 +0000 Subject: update fuse to new upstream release (v2.4.1) (thanks to Christian Magnusson) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2186 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/fuse/patches/111-uclibc_changes.patch | 104 +------------------------- 1 file changed, 4 insertions(+), 100 deletions(-) (limited to 'package/fuse/patches/111-uclibc_changes.patch') diff --git a/package/fuse/patches/111-uclibc_changes.patch b/package/fuse/patches/111-uclibc_changes.patch index 2c85e988e..69730758e 100644 --- a/package/fuse/patches/111-uclibc_changes.patch +++ b/package/fuse/patches/111-uclibc_changes.patch @@ -1,57 +1,7 @@ -diff -ruw fuse-2.3.0.org/lib/mount.c fuse-2.3.0/lib/mount.c ---- fuse-2.3.0.org/lib/mount.c 2005-02-02 12:14:44.000000000 +0100 -+++ fuse-2.3.0/lib/mount.c 2005-08-26 09:23:11.000000000 +0200 -@@ -6,6 +6,13 @@ - See the file COPYING.LIB. - */ - -+#include -+#ifdef HAVE_FEATURES_H -+#include -+#endif -+/* Remove this when config.h is updated with HAVE_FEATURES_H */ -+#include -+ - #include "fuse.h" - #include "fuse_compat.h" - -@@ -92,10 +99,11 @@ - return -1; - } - --#ifndef USE_UCLIBC -- pid = fork(); --#else -+#if defined(__UCLIBC__) && \ -+ (!defined(__ARCH_HAS_MMU__) && !defined(__UCLIBC_HAS_MMU__)) - pid = vfork(); -+#else -+ pid = fork(); - #endif - if(pid == -1) { - perror("fuse: fork() failed"); -diff -ruw fuse-2.3.0.org/util/fusermount.c fuse-2.3.0/util/fusermount.c ---- fuse-2.3.0.org/util/fusermount.c 2005-05-17 18:54:17.000000000 +0200 -+++ fuse-2.3.0/util/fusermount.c 2005-08-26 09:20:12.000000000 +0200 -@@ -17,6 +17,17 @@ - */ - - #include -+#ifdef HAVE_FEATURES_H -+#include -+#endif -+/* Remove this when config.h is updated with HAVE_FEATURES_H */ -+#include -+ -+#ifdef __UCLIBC__ -+/* Most embedded systems with uclibc have read-only root filesystem. Should -+ * replace this into a parameter --disable-mtab instead */ -+#define READONLY_MTAB 1 -+#endif - - #include - #include -@@ -40,7 +51,12 @@ +diff -ruw fuse-2.4.0/util/fusermount.c.org fuse-2.4.0/util/fusermount.c +--- fuse-2.4.0/util/fusermount.c.org 2005-10-14 11:34:06.000000000 +0200 ++++ fuse-2.4.0/util/fusermount.c 2005-10-14 11:56:26.000000000 +0200 +@@ -42,7 +42,12 @@ #define FUSE_COMMFD_ENV "_FUSE_COMMFD" #define FUSE_DEV_OLD "/proc/fs/fuse/dev" @@ -63,50 +13,4 @@ diff -ruw fuse-2.3.0.org/util/fusermount.c fuse-2.3.0/util/fusermount.c +#endif #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version" #define FUSE_CONF "/etc/fuse.conf" - #define FUSE_MAJOR 10 -@@ -89,7 +105,7 @@ - return res; - } - --#ifndef USE_UCLIBC -+#ifndef READONLY_MTAB - /* use a lock file so that multiple fusermount processes don't try and - modify the mtab file at once! */ - static int lock_mtab() -@@ -701,7 +717,12 @@ - return fd; - } -+#ifdef __UCLIBC__ -+/* /dev is writeable on openwrt distribution */ -+#define FUSE_TMP_DIRNAME "/dev/.fuse_devXXXXXX" -+#else - #define FUSE_TMP_DIRNAME "/tmp/.fuse_devXXXXXX" -+#endif - #define FUSE_TMP_DEVNAME "/fuse" - - static int try_open_new_temp(dev_t devnum, char **devp) -@@ -761,17 +782,19 @@ - pid_t pid; - - fd = try_open_fuse_device(devp); -+ //fprintf(stderr, "open_fuse_device: try_open_fuse_device() ret=%d\n", fd); - if (fd >= 0) - return fd; - --#ifndef USE_UCLIBC -- pid = fork(); --#else -+#if defined(__UCLIBC__) && \ -+ (!defined(__ARCH_HAS_MMU__) && !defined(__UCLIBC_HAS_MMU__)) - pid = vfork(); -+#else -+ pid = fork(); - #endif - if (pid == 0) { - setuid(0); -- execl("/sbin/modprobe", "/sbin/modprobe", "fuse", NULL); -+ execl("/sbin/insmod", "/sbin/insmod", "fuse", NULL); - exit(1); - } - if (pid != -1) -- cgit v1.2.3 From 737022a15e9e7b872ffd8220604f29c6e4bc399d Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 13 Apr 2006 22:20:15 +0000 Subject: remove lots of non-essential packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3641 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/fuse/patches/111-uclibc_changes.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 package/fuse/patches/111-uclibc_changes.patch (limited to 'package/fuse/patches/111-uclibc_changes.patch') diff --git a/package/fuse/patches/111-uclibc_changes.patch b/package/fuse/patches/111-uclibc_changes.patch deleted file mode 100644 index 69730758e..000000000 --- a/package/fuse/patches/111-uclibc_changes.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruw fuse-2.4.0/util/fusermount.c.org fuse-2.4.0/util/fusermount.c ---- fuse-2.4.0/util/fusermount.c.org 2005-10-14 11:34:06.000000000 +0200 -+++ fuse-2.4.0/util/fusermount.c 2005-10-14 11:56:26.000000000 +0200 -@@ -42,7 +42,12 @@ - #define FUSE_COMMFD_ENV "_FUSE_COMMFD" - - #define FUSE_DEV_OLD "/proc/fs/fuse/dev" -+#ifdef __UCLIBC__ -+/* /dev is mounted as devfs in OpenWRT, and device is created here */ -+#define FUSE_DEV_NEW "/dev/misc/fuse" -+#else - #define FUSE_DEV_NEW "/dev/fuse" -+#endif - #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version" - #define FUSE_CONF "/etc/fuse.conf" - -- cgit v1.2.3 From 46a635746c320950c7edabc1d1a0c12960c0c0e7 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 17 Jun 2006 08:34:53 +0000 Subject: move fuse from target/linux/package/ to package/, update to v2.5.3, add userland lib, util and dev stuff from trunk. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3966 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/fuse/patches/111-uclibc_changes.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 package/fuse/patches/111-uclibc_changes.patch (limited to 'package/fuse/patches/111-uclibc_changes.patch') diff --git a/package/fuse/patches/111-uclibc_changes.patch b/package/fuse/patches/111-uclibc_changes.patch new file mode 100644 index 000000000..69730758e --- /dev/null +++ b/package/fuse/patches/111-uclibc_changes.patch @@ -0,0 +1,16 @@ +diff -ruw fuse-2.4.0/util/fusermount.c.org fuse-2.4.0/util/fusermount.c +--- fuse-2.4.0/util/fusermount.c.org 2005-10-14 11:34:06.000000000 +0200 ++++ fuse-2.4.0/util/fusermount.c 2005-10-14 11:56:26.000000000 +0200 +@@ -42,7 +42,12 @@ + #define FUSE_COMMFD_ENV "_FUSE_COMMFD" + + #define FUSE_DEV_OLD "/proc/fs/fuse/dev" ++#ifdef __UCLIBC__ ++/* /dev is mounted as devfs in OpenWRT, and device is created here */ ++#define FUSE_DEV_NEW "/dev/misc/fuse" ++#else + #define FUSE_DEV_NEW "/dev/fuse" ++#endif + #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version" + #define FUSE_CONF "/etc/fuse.conf" + -- cgit v1.2.3