[toolchain] disable UCLIBC_HAS_XLOCALE and UCLIB_HAS_GLIBC_DIGIT_GROUPING if BUILD_NL...

[openwrt.git] / package / busybox / patches / 480-mount_union.patch

diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch
index e520d78..2f236a1 100644 (file)
--- a/package/busybox/patches/480-mount_union.patch
+++ b/package/busybox/patches/480-mount_union.patch
@@ -1,7 +1,7 @@
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c

-@@ -69,6 +69,10 @@
- #define MS_DIRSYNC      128     // Directory modifications are synchronous
+@@ -136,6 +136,10 @@
+ # include <rpc/pmap_clnt.h>

  #endif
  
 +#ifndef MS_UNION
  #endif
  
 +#ifndef MS_UNION


@@ -11,19 +11,19 @@
  
  #if defined(__dietlibc__)
  // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
  
  #if defined(__dietlibc__)
  // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)

-@@ -185,6 +189,7 @@ static const int32_t mount_options[] = {
+@@ -254,6 +258,7 @@ static const int32_t mount_options[] = {

                /* "rslave"      */ MS_SLAVE|MS_RECURSIVE,
                /* "rslave"      */ MS_SLAVE|MS_RECURSIVE,

-               /* "rprivate"    */ MS_SLAVE|MS_RECURSIVE,
+               /* "rprivate"    */ MS_PRIVATE|MS_RECURSIVE,

                /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
 +              /* "union"       */ MS_UNION,
        )
  
        // Always understood.
                /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
 +              /* "union"       */ MS_UNION,
        )
  
        // Always understood.

-@@ -239,6 +244,7 @@ static const char mount_option_str[] =
-               "rslave\0"
-               "rprivate\0"
-               "runbindable\0"
-+              "union" "\0"
+@@ -310,6 +315,7 @@ static const char mount_option_str[] =
+               "make-rslave\0"
+               "make-rprivate\0"
+               "make-runbindable\0"
++              "make-union\0"

        )
  
        // Always understood.
        )
  
        // Always understood.