aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/480-mount_union.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-21 11:45:10 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-21 11:45:10 +0000
commit5636037cff0f19ceb15c88999bbd1a77ada0d6fe (patch)
treed64d03946f18be6a7657bb93e91d216ffabc9a2f /package/busybox/patches/480-mount_union.patch
parent55f65c5c1dd4ccade263cbfedf8faad80a95904a (diff)
downloadupstream-5636037cff0f19ceb15c88999bbd1a77ada0d6fe.tar.gz
upstream-5636037cff0f19ceb15c88999bbd1a77ada0d6fe.tar.bz2
upstream-5636037cff0f19ceb15c88999bbd1a77ada0d6fe.zip
busybox: remove two obsolete patches
They either work around missing implementations in uClibc 0.9.30 and earlier and add already present functionality. Closes #11210, #11211. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 35710
Diffstat (limited to 'package/busybox/patches/480-mount_union.patch')
-rw-r--r--package/busybox/patches/480-mount_union.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch
deleted file mode 100644
index 2f236a1528..0000000000
--- a/package/busybox/patches/480-mount_union.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/util-linux/mount.c
-+++ b/util-linux/mount.c
-@@ -136,6 +136,10 @@
- # include <rpc/pmap_clnt.h>
- #endif
-
-+#ifndef MS_UNION
-+#define MS_UNION 0x100 /* 256: Mount on top of a union */
-+#endif
-+
-
- #if defined(__dietlibc__)
- // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
-@@ -254,6 +258,7 @@ static const int32_t mount_options[] = {
- /* "rslave" */ MS_SLAVE|MS_RECURSIVE,
- /* "rprivate" */ MS_PRIVATE|MS_RECURSIVE,
- /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
-+ /* "union" */ MS_UNION,
- )
-
- // Always understood.
-@@ -310,6 +315,7 @@ static const char mount_option_str[] =
- "make-rslave\0"
- "make-rprivate\0"
- "make-runbindable\0"
-+ "make-union\0"
- )
-
- // Always understood.