diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-07-05 10:29:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch) | |
tree | cde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch | |
parent | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff) | |
download | poky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz |
busybox: upgrade to stable 1.21.1
Merged or backported patches are dropped.
The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's
about the -P option behavior, and it's not accepted, so I dropped
this patch too.
(From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch b/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch deleted file mode 100644 index 8696427ee8..0000000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Add support for the "strictatime" mount option. | ||
2 | |||
3 | Upstream-Status: Backport [9ad8979ff15e1b894ee1f4bb6a2535a1a2c20d65] | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | Index: busybox-1.20.2/util-linux/mount.c | ||
7 | =================================================================== | ||
8 | --- busybox-1.20.2.orig/util-linux/mount.c 2012-07-02 15:08:25.000000000 +0100 | ||
9 | +++ busybox-1.20.2/util-linux/mount.c 2013-03-22 15:37:31.340277463 +0000 | ||
10 | @@ -113,6 +113,12 @@ | ||
11 | #ifndef MS_RELATIME | ||
12 | # define MS_RELATIME (1 << 21) | ||
13 | #endif | ||
14 | +#ifndef MS_STRICTATIME | ||
15 | +# define MS_STRICTATIME (1 << 24) | ||
16 | +#endif | ||
17 | + | ||
18 | +/* Any ~MS_FOO value has this bit set: */ | ||
19 | +#define BB_MS_INVERTED_VALUE (1u << 31) | ||
20 | |||
21 | #include "libbb.h" | ||
22 | #if ENABLE_FEATURE_MOUNT_LABEL | ||
23 | @@ -239,6 +245,7 @@ | ||
24 | /* "nomand" */ ~MS_MANDLOCK, | ||
25 | /* "relatime" */ MS_RELATIME, | ||
26 | /* "norelatime" */ ~MS_RELATIME, | ||
27 | + /* "strictatime" */ MS_STRICTATIME, | ||
28 | /* "loud" */ ~MS_SILENT, | ||
29 | /* "rbind" */ MS_BIND|MS_RECURSIVE, | ||
30 | |||
31 | @@ -295,6 +302,7 @@ | ||
32 | "nomand\0" | ||
33 | "relatime\0" | ||
34 | "norelatime\0" | ||
35 | + "strictatime\0" | ||
36 | "loud\0" | ||
37 | "rbind\0" | ||
38 | |||
39 | @@ -466,8 +474,8 @@ | ||
40 | // Find this option in mount_options | ||
41 | for (i = 0; i < ARRAY_SIZE(mount_options); i++) { | ||
42 | if (strcasecmp(option_str, options) == 0) { | ||
43 | - long fl = mount_options[i]; | ||
44 | - if (fl < 0) | ||
45 | + unsigned long fl = mount_options[i]; | ||
46 | + if (fl & BB_MS_INVERTED_VALUE) | ||
47 | flags &= fl; | ||
48 | else | ||
49 | flags |= fl; | ||