diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-08-08 14:48:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-09 15:17:58 +0100 |
commit | ecab5d610b2921ab50524aaf5b1ebc78d22dc0c0 (patch) | |
tree | 3345dbe12526e0f3e9c24dde5c54311c42fea8f3 | |
parent | ae213b252fb0b87ec3daaa2c78b794a3e17addb6 (diff) | |
download | poky-ecab5d610b2921ab50524aaf5b1ebc78d22dc0c0.tar.gz |
uclibc_0.9.32: Sync mount.h from eglibc
mount.h has few more defines that are being used by newer
applications such as systemd
(From OE-Core rev: 866a34dd80228a0c10cbea5d7715e2acd6cea131)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch | 85 | ||||
-rw-r--r-- | meta/recipes-core/uclibc/uclibc_0.9.32.bb | 3 |
2 files changed, 87 insertions, 1 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch new file mode 100644 index 0000000000..3508e0ee24 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | Sync mount.h from glibc this is needed to get missing defines | ||
2 | that some apps e.g. systemd are depending on | ||
3 | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: git/include/sys/mount.h | ||
9 | =================================================================== | ||
10 | --- git.orig/include/sys/mount.h 2011-07-21 14:37:27.134255747 -0700 | ||
11 | +++ git/include/sys/mount.h 2011-07-21 14:39:53.844470932 -0700 | ||
12 | @@ -1,5 +1,5 @@ | ||
13 | /* Header file for mounting/unmount Linux filesystems. | ||
14 | - Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc. | ||
15 | + Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc. | ||
16 | This file is part of the GNU C Library. | ||
17 | |||
18 | The GNU C Library is free software; you can redistribute it and/or | ||
19 | @@ -47,23 +47,46 @@ | ||
20 | #define MS_REMOUNT MS_REMOUNT | ||
21 | MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */ | ||
22 | #define MS_MANDLOCK MS_MANDLOCK | ||
23 | - S_WRITE = 128, /* Write on file/directory/symlink. */ | ||
24 | -#define S_WRITE S_WRITE | ||
25 | - S_APPEND = 256, /* Append-only file. */ | ||
26 | -#define S_APPEND S_APPEND | ||
27 | - S_IMMUTABLE = 512, /* Immutable file. */ | ||
28 | -#define S_IMMUTABLE S_IMMUTABLE | ||
29 | + MS_DIRSYNC = 128, /* Directory modifications are synchronous. */ | ||
30 | +#define MS_DIRSYNC MS_DIRSYNC | ||
31 | MS_NOATIME = 1024, /* Do not update access times. */ | ||
32 | #define MS_NOATIME MS_NOATIME | ||
33 | MS_NODIRATIME = 2048, /* Do not update directory access times. */ | ||
34 | #define MS_NODIRATIME MS_NODIRATIME | ||
35 | MS_BIND = 4096, /* Bind directory at different place. */ | ||
36 | #define MS_BIND MS_BIND | ||
37 | + MS_MOVE = 8192, | ||
38 | +#define MS_MOVE MS_MOVE | ||
39 | + MS_REC = 16384, | ||
40 | +#define MS_REC MS_REC | ||
41 | + MS_SILENT = 32768, | ||
42 | +#define MS_SILENT MS_SILENT | ||
43 | + MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */ | ||
44 | +#define MS_POSIXACL MS_POSIXACL | ||
45 | + MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */ | ||
46 | +#define MS_UNBINDABLE MS_UNBINDABLE | ||
47 | + MS_PRIVATE = 1 << 18, /* Change to private. */ | ||
48 | +#define MS_PRIVATE MS_PRIVATE | ||
49 | + MS_SLAVE = 1 << 19, /* Change to slave. */ | ||
50 | +#define MS_SLAVE MS_SLAVE | ||
51 | + MS_SHARED = 1 << 20, /* Change to shared. */ | ||
52 | +#define MS_SHARED MS_SHARED | ||
53 | + MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */ | ||
54 | +#define MS_RELATIME MS_RELATIME | ||
55 | + MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */ | ||
56 | +#define MS_KERNMOUNT MS_KERNMOUNT | ||
57 | + MS_I_VERSION = 1 << 23, /* Update inode I_version field. */ | ||
58 | +#define MS_I_VERSION MS_I_VERSION | ||
59 | + MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */ | ||
60 | +#define MS_STRICTATIME MS_STRICTATIME | ||
61 | + MS_ACTIVE = 1 << 30, | ||
62 | +#define MS_ACTIVE MS_ACTIVE | ||
63 | + MS_NOUSER = 1 << 31 | ||
64 | +#define MS_NOUSER MS_NOUSER | ||
65 | }; | ||
66 | |||
67 | /* Flags that can be altered by MS_REMOUNT */ | ||
68 | -#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \ | ||
69 | - |MS_NODIRATIME) | ||
70 | +#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION) | ||
71 | |||
72 | |||
73 | /* Magic mount flag number. Has to be or-ed to the flag values. */ | ||
74 | @@ -100,8 +123,10 @@ | ||
75 | #define MNT_FORCE MNT_FORCE | ||
76 | MNT_DETACH = 2, /* Just detach from the tree. */ | ||
77 | #define MNT_DETACH MNT_DETACH | ||
78 | - MNT_EXPIRE = 4 /* Mark for expiry. */ | ||
79 | + MNT_EXPIRE = 4, /* Mark for expiry. */ | ||
80 | #define MNT_EXPIRE MNT_EXPIRE | ||
81 | + UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */ | ||
82 | +#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW | ||
83 | }; | ||
84 | |||
85 | |||
diff --git a/meta/recipes-core/uclibc/uclibc_0.9.32.bb b/meta/recipes-core/uclibc/uclibc_0.9.32.bb index 8dcb2605eb..235b436bc5 100644 --- a/meta/recipes-core/uclibc/uclibc_0.9.32.bb +++ b/meta/recipes-core/uclibc/uclibc_0.9.32.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SRCREV="9152c4d67c763fde5712e2d181d92c0d7e1e2ab9" | 1 | SRCREV="9152c4d67c763fde5712e2d181d92c0d7e1e2ab9" |
2 | 2 | ||
3 | require uclibc.inc | 3 | require uclibc.inc |
4 | PR = "${INC_PR}.2" | 4 | PR = "${INC_PR}.3" |
5 | PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" | 5 | PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" |
6 | 6 | ||
7 | SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \ | 7 | SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \ |
@@ -29,5 +29,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \ | |||
29 | file://uclibc-execvpe.patch \ | 29 | file://uclibc-execvpe.patch \ |
30 | file://uclibc_scheduler_update.patch \ | 30 | file://uclibc_scheduler_update.patch \ |
31 | file://sync_file_range2.patch \ | 31 | file://sync_file_range2.patch \ |
32 | file://mount.h-update.patch \ | ||
32 | " | 33 | " |
33 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |