diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-01-17 19:01:05 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-19 11:34:12 +0000 |
commit | c2a74cc1482c614c5b4f997e903ab5c5c258778d (patch) | |
tree | 8dd7afc91193ee7f9a15e90766f67e500945442b /meta | |
parent | 89705eadb48a373ddf6488f323bda0f18237954a (diff) | |
download | poky-c2a74cc1482c614c5b4f997e903ab5c5c258778d.tar.gz |
e2fsprogs_1.42.bb: Fix build fallout for uclibc
e2fsprogs 1.42 onwards uses fallocate() which uclibc
does not implement(yet). In most of places its use
is controlled and it only used when configure detects
fallocate being present but in this one case it missed
to check for fallocate being available so here we
add the check
(From OE-Core rev: 1625faad281eeef3931573908c557362236dcd47)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch | 22 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch new file mode 100644 index 0000000000..4d952a5df7 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | We assume that fallocate is supported somehow | ||
2 | but we need to check if we have fallocate() | ||
3 | this problem shows up on uclibc systems since | ||
4 | uclibc does not have fallocate() implemented | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c | ||
11 | =================================================================== | ||
12 | --- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800 | ||
13 | +++ e2fsprogs-1.42/lib/ext2fs/unix_io.c 2012-01-17 17:25:37.338783680 -0800 | ||
14 | @@ -895,7 +895,7 @@ | ||
15 | goto unimplemented; | ||
16 | #endif | ||
17 | } else { | ||
18 | -#ifdef FALLOC_FL_PUNCH_HOLE | ||
19 | +#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE | ||
20 | /* | ||
21 | * If we are not on block device, try to use punch hole | ||
22 | * to reclaim free space. | ||
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb index 9ff85a2d51..f6759aa7d4 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | |||
@@ -1,8 +1,9 @@ | |||
1 | require e2fsprogs.inc | 1 | require e2fsprogs.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | SRC_URI += "file://quotefix.patch \ | 5 | SRC_URI += "file://quotefix.patch \ |
6 | file://fallocate.patch \ | ||
6 | file://acinclude.m4" | 7 | file://acinclude.m4" |
7 | 8 | ||
8 | SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" | 9 | SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" |