diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-09-03 09:48:15 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:52:53 +0100 |
commit | a7c71aba7e62ed419bde6a3aa2b1cb770ae3c615 (patch) | |
tree | 460247248f296e9b47a5112496663f126fd1099c /meta/recipes-core | |
parent | 015521182c3e555dfe447bfb3fe49fa80a102601 (diff) | |
download | poky-a7c71aba7e62ed419bde6a3aa2b1cb770ae3c615.tar.gz |
uclibc-0.9.33: Update to latest on 0.9.33 branch
Apply mount.h sync patch which is needed for
systemd to work.
(From OE-Core rev: dc7e857f2cf16aad859b6a245c29b3958cd065ea)
Signed-off-by: Khem Raj <raj.khem@gmail.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')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-0.9.33.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-0.9.33/mount.h-update.patch | 83 | ||||
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-0.9.33/posix_fallocate.patch | 37 |
3 files changed, 104 insertions, 21 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33.inc b/meta/recipes-core/uclibc/uclibc-0.9.33.inc index f03dd2ec6c..653f3c6206 100644 --- a/meta/recipes-core/uclibc/uclibc-0.9.33.inc +++ b/meta/recipes-core/uclibc/uclibc-0.9.33.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | SRCREV="7810e4f8027b5c4c8ceec6fefec4eb779362ebb5" | 1 | SRCREV = "fec308fdfaf9f557ef5fb17c308c48259012b825" |
2 | 2 | ||
3 | PR = "${INC_PR}.2" | 3 | PR = "${INC_PR}.3" |
4 | 4 | ||
5 | SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \ | 5 | SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \ |
6 | file://uClibc.machine \ | 6 | file://uClibc.machine \ |
@@ -17,6 +17,7 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \ | |||
17 | file://dup3.patch \ | 17 | file://dup3.patch \ |
18 | file://define-MSG_CMSG_CLOEXEC.patch \ | 18 | file://define-MSG_CMSG_CLOEXEC.patch \ |
19 | file://posix_fallocate.patch \ | 19 | file://posix_fallocate.patch \ |
20 | file://mount.h-update.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/mount.h-update.patch new file mode 100644 index 0000000000..41a410c84c --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-0.9.33/mount.h-update.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
2 | Upstream-Status: Pending | ||
3 | |||
4 | sync mount.h with glibc | ||
5 | |||
6 | Index: git/include/sys/mount.h | ||
7 | =================================================================== | ||
8 | --- git.orig/include/sys/mount.h 2012-08-23 21:26:51.038825295 -0700 | ||
9 | +++ git/include/sys/mount.h 2012-08-23 21:27:09.914826014 -0700 | ||
10 | @@ -1,5 +1,5 @@ | ||
11 | /* Header file for mounting/unmount Linux filesystems. | ||
12 | - Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc. | ||
13 | + Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc. | ||
14 | This file is part of the GNU C Library. | ||
15 | |||
16 | The GNU C Library is free software; you can redistribute it and/or | ||
17 | @@ -47,23 +47,46 @@ | ||
18 | #define MS_REMOUNT MS_REMOUNT | ||
19 | MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */ | ||
20 | #define MS_MANDLOCK MS_MANDLOCK | ||
21 | - S_WRITE = 128, /* Write on file/directory/symlink. */ | ||
22 | -#define S_WRITE S_WRITE | ||
23 | - S_APPEND = 256, /* Append-only file. */ | ||
24 | -#define S_APPEND S_APPEND | ||
25 | - S_IMMUTABLE = 512, /* Immutable file. */ | ||
26 | -#define S_IMMUTABLE S_IMMUTABLE | ||
27 | + MS_DIRSYNC = 128, /* Directory modifications are synchronous. */ | ||
28 | +#define MS_DIRSYNC MS_DIRSYNC | ||
29 | MS_NOATIME = 1024, /* Do not update access times. */ | ||
30 | #define MS_NOATIME MS_NOATIME | ||
31 | MS_NODIRATIME = 2048, /* Do not update directory access times. */ | ||
32 | #define MS_NODIRATIME MS_NODIRATIME | ||
33 | MS_BIND = 4096, /* Bind directory at different place. */ | ||
34 | #define MS_BIND MS_BIND | ||
35 | + MS_MOVE = 8192, | ||
36 | +#define MS_MOVE MS_MOVE | ||
37 | + MS_REC = 16384, | ||
38 | +#define MS_REC MS_REC | ||
39 | + MS_SILENT = 32768, | ||
40 | +#define MS_SILENT MS_SILENT | ||
41 | + MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */ | ||
42 | +#define MS_POSIXACL MS_POSIXACL | ||
43 | + MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */ | ||
44 | +#define MS_UNBINDABLE MS_UNBINDABLE | ||
45 | + MS_PRIVATE = 1 << 18, /* Change to private. */ | ||
46 | +#define MS_PRIVATE MS_PRIVATE | ||
47 | + MS_SLAVE = 1 << 19, /* Change to slave. */ | ||
48 | +#define MS_SLAVE MS_SLAVE | ||
49 | + MS_SHARED = 1 << 20, /* Change to shared. */ | ||
50 | +#define MS_SHARED MS_SHARED | ||
51 | + MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */ | ||
52 | +#define MS_RELATIME MS_RELATIME | ||
53 | + MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */ | ||
54 | +#define MS_KERNMOUNT MS_KERNMOUNT | ||
55 | + MS_I_VERSION = 1 << 23, /* Update inode I_version field. */ | ||
56 | +#define MS_I_VERSION MS_I_VERSION | ||
57 | + MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */ | ||
58 | +#define MS_STRICTATIME MS_STRICTATIME | ||
59 | + MS_ACTIVE = 1 << 30, | ||
60 | +#define MS_ACTIVE MS_ACTIVE | ||
61 | + MS_NOUSER = 1 << 31 | ||
62 | +#define MS_NOUSER MS_NOUSER | ||
63 | }; | ||
64 | |||
65 | /* Flags that can be altered by MS_REMOUNT */ | ||
66 | -#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \ | ||
67 | - |MS_NODIRATIME) | ||
68 | +#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION) | ||
69 | |||
70 | |||
71 | /* Magic mount flag number. Has to be or-ed to the flag values. */ | ||
72 | @@ -100,8 +123,10 @@ | ||
73 | #define MNT_FORCE MNT_FORCE | ||
74 | MNT_DETACH = 2, /* Just detach from the tree. */ | ||
75 | #define MNT_DETACH MNT_DETACH | ||
76 | - MNT_EXPIRE = 4 /* Mark for expiry. */ | ||
77 | + MNT_EXPIRE = 4, /* Mark for expiry. */ | ||
78 | #define MNT_EXPIRE MNT_EXPIRE | ||
79 | + UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */ | ||
80 | +#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW | ||
81 | }; | ||
82 | |||
83 | |||
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/posix_fallocate.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/posix_fallocate.patch index 6dfd16fd96..b55fbbd6e0 100644 --- a/meta/recipes-core/uclibc/uclibc-0.9.33/posix_fallocate.patch +++ b/meta/recipes-core/uclibc/uclibc-0.9.33/posix_fallocate.patch | |||
@@ -101,8 +101,8 @@ Upstream-Status: Pending | |||
101 | 101 | ||
102 | Index: git/include/fcntl.h | 102 | Index: git/include/fcntl.h |
103 | =================================================================== | 103 | =================================================================== |
104 | --- git.orig/include/fcntl.h 2012-06-26 14:51:04.000000000 -0700 | 104 | --- git.orig/include/fcntl.h 2012-09-02 17:00:26.000000000 -0700 |
105 | +++ git/include/fcntl.h 2012-06-26 14:51:36.361767240 -0700 | 105 | +++ git/include/fcntl.h 2012-09-02 17:01:51.567076705 -0700 |
106 | @@ -210,9 +210,7 @@ | 106 | @@ -210,9 +210,7 @@ |
107 | 107 | ||
108 | #endif | 108 | #endif |
@@ -116,22 +116,21 @@ Index: git/include/fcntl.h | |||
116 | 116 | ||
117 | Index: git/libc/sysdeps/linux/common/Makefile.in | 117 | Index: git/libc/sysdeps/linux/common/Makefile.in |
118 | =================================================================== | 118 | =================================================================== |
119 | --- git.orig/libc/sysdeps/linux/common/Makefile.in 2012-06-26 14:51:04.000000000 -0700 | 119 | --- git.orig/libc/sysdeps/linux/common/Makefile.in 2012-09-02 17:00:26.000000000 -0700 |
120 | +++ git/libc/sysdeps/linux/common/Makefile.in 2012-06-26 14:52:33.153769997 -0700 | 120 | +++ git/libc/sysdeps/linux/common/Makefile.in 2012-09-02 17:03:02.739079369 -0700 |
121 | @@ -81,7 +81,8 @@ | 121 | @@ -81,7 +81,7 @@ |
122 | sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \ | 122 | sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \ |
123 | sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c | 123 | sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c |
124 | # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait | 124 | # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait |
125 | -CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c | 125 | -CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c |
126 | +CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c \ | 126 | +CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c posix_fallocate.c posix_fallocate64.c |
127 | + posix_fallocate.c posix_fallocate64.c | ||
128 | CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c | 127 | CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c |
129 | CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c | 128 | CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c |
130 | CSRC-$(UCLIBC_HAS_XATTR) += xattr.c | 129 | CSRC-$(UCLIBC_HAS_XATTR) += xattr.c |
131 | Index: git/libc/sysdeps/linux/common/bits/kernel-features.h | 130 | Index: git/libc/sysdeps/linux/common/bits/kernel-features.h |
132 | =================================================================== | 131 | =================================================================== |
133 | --- git.orig/libc/sysdeps/linux/common/bits/kernel-features.h 2012-06-26 14:51:04.000000000 -0700 | 132 | --- git.orig/libc/sysdeps/linux/common/bits/kernel-features.h 2012-09-02 17:00:26.000000000 -0700 |
134 | +++ git/libc/sysdeps/linux/common/bits/kernel-features.h 2012-06-26 14:51:36.361767240 -0700 | 133 | +++ git/libc/sysdeps/linux/common/bits/kernel-features.h 2012-09-02 17:01:51.567076705 -0700 |
135 | @@ -494,6 +494,14 @@ | 134 | @@ -494,6 +494,14 @@ |
136 | # define __ASSUME_PRIVATE_FUTEX 1 | 135 | # define __ASSUME_PRIVATE_FUTEX 1 |
137 | #endif | 136 | #endif |
@@ -150,7 +149,7 @@ Index: git/libc/sysdeps/linux/common/bits/kernel-features.h | |||
150 | Index: git/libc/sysdeps/linux/common/posix_fallocate.c | 149 | Index: git/libc/sysdeps/linux/common/posix_fallocate.c |
151 | =================================================================== | 150 | =================================================================== |
152 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 151 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
153 | +++ git/libc/sysdeps/linux/common/posix_fallocate.c 2012-06-26 14:51:36.373767243 -0700 | 152 | +++ git/libc/sysdeps/linux/common/posix_fallocate.c 2012-09-02 17:01:51.579076667 -0700 |
154 | @@ -0,0 +1,43 @@ | 153 | @@ -0,0 +1,43 @@ |
155 | +/* vi: set sw=4 ts=4: */ | 154 | +/* vi: set sw=4 ts=4: */ |
156 | +/* | 155 | +/* |
@@ -198,7 +197,7 @@ Index: git/libc/sysdeps/linux/common/posix_fallocate.c | |||
198 | Index: git/libc/sysdeps/linux/common/posix_fallocate64.c | 197 | Index: git/libc/sysdeps/linux/common/posix_fallocate64.c |
199 | =================================================================== | 198 | =================================================================== |
200 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 199 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
201 | +++ git/libc/sysdeps/linux/common/posix_fallocate64.c 2012-06-26 14:51:36.373767243 -0700 | 200 | +++ git/libc/sysdeps/linux/common/posix_fallocate64.c 2012-09-02 17:01:51.579076667 -0700 |
202 | @@ -0,0 +1,39 @@ | 201 | @@ -0,0 +1,39 @@ |
203 | +/* vi: set sw=4 ts=4: */ | 202 | +/* vi: set sw=4 ts=4: */ |
204 | +/* | 203 | +/* |
@@ -241,8 +240,8 @@ Index: git/libc/sysdeps/linux/common/posix_fallocate64.c | |||
241 | +#endif | 240 | +#endif |
242 | Index: git/libc/sysdeps/linux/common/stubs.c | 241 | Index: git/libc/sysdeps/linux/common/stubs.c |
243 | =================================================================== | 242 | =================================================================== |
244 | --- git.orig/libc/sysdeps/linux/common/stubs.c 2012-06-26 14:51:04.000000000 -0700 | 243 | --- git.orig/libc/sysdeps/linux/common/stubs.c 2012-09-02 17:00:26.000000000 -0700 |
245 | +++ git/libc/sysdeps/linux/common/stubs.c 2012-06-26 14:53:48.997773660 -0700 | 244 | +++ git/libc/sysdeps/linux/common/stubs.c 2012-09-02 17:01:51.579076667 -0700 |
246 | @@ -209,6 +209,10 @@ | 245 | @@ -209,6 +209,10 @@ |
247 | make_stub(madvise) | 246 | make_stub(madvise) |
248 | #endif | 247 | #endif |
@@ -256,8 +255,8 @@ Index: git/libc/sysdeps/linux/common/stubs.c | |||
256 | #endif | 255 | #endif |
257 | Index: git/test/.gitignore | 256 | Index: git/test/.gitignore |
258 | =================================================================== | 257 | =================================================================== |
259 | --- git.orig/test/.gitignore 2012-06-26 14:51:04.000000000 -0700 | 258 | --- git.orig/test/.gitignore 2012-09-02 17:00:26.000000000 -0700 |
260 | +++ git/test/.gitignore 2012-06-26 14:51:36.373767243 -0700 | 259 | +++ git/test/.gitignore 2012-09-02 17:01:51.579076667 -0700 |
261 | @@ -302,6 +302,7 @@ | 260 | @@ -302,6 +302,7 @@ |
262 | unistd/getopt | 261 | unistd/getopt |
263 | unistd/getopt_long | 262 | unistd/getopt_long |
@@ -268,8 +267,8 @@ Index: git/test/.gitignore | |||
268 | unistd/vfork | 267 | unistd/vfork |
269 | Index: git/test/unistd/Makefile.in | 268 | Index: git/test/unistd/Makefile.in |
270 | =================================================================== | 269 | =================================================================== |
271 | --- git.orig/test/unistd/Makefile.in 2012-06-26 14:51:05.000000000 -0700 | 270 | --- git.orig/test/unistd/Makefile.in 2012-09-02 17:00:26.000000000 -0700 |
272 | +++ git/test/unistd/Makefile.in 2012-06-26 14:51:36.373767243 -0700 | 271 | +++ git/test/unistd/Makefile.in 2012-09-02 17:01:51.579076667 -0700 |
273 | @@ -4,6 +4,9 @@ | 272 | @@ -4,6 +4,9 @@ |
274 | ifeq ($(UCLIBC_HAS_LFS),) | 273 | ifeq ($(UCLIBC_HAS_LFS),) |
275 | TESTS_DISABLED := tst-preadwrite64 | 274 | TESTS_DISABLED := tst-preadwrite64 |
@@ -283,7 +282,7 @@ Index: git/test/unistd/Makefile.in | |||
283 | Index: git/test/unistd/tst-posix_fallocate.c | 282 | Index: git/test/unistd/tst-posix_fallocate.c |
284 | =================================================================== | 283 | =================================================================== |
285 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 284 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
286 | +++ git/test/unistd/tst-posix_fallocate.c 2012-06-26 14:51:36.373767243 -0700 | 285 | +++ git/test/unistd/tst-posix_fallocate.c 2012-09-02 17:01:51.579076667 -0700 |
287 | @@ -0,0 +1,121 @@ | 286 | @@ -0,0 +1,121 @@ |
288 | +#include <fcntl.h> | 287 | +#include <fcntl.h> |
289 | +#include <sys/stat.h> | 288 | +#include <sys/stat.h> |