summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-15 19:00:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:24 +0100
commitc94d444c79b5389dc28c6e3f2ef8c2ef2ee6f830 (patch)
tree41c2aa9a109b5ae5dfc25758719af524a36ec545 /meta
parent5688e6c739767e65946d852edf695e871dcfbfc3 (diff)
downloadpoky-c94d444c79b5389dc28c6e3f2ef8c2ef2ee6f830.tar.gz
dosfstools: Fix build with musl
We need to pass _GNU_SOURCE and include fcntl.h Change-Id: Ice0597ddac3b275400880d85793ece4b300bec9b (From OE-Core rev: 022a96c7a396bd6bbf499984f4ea8639111fe3b7) 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/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch41
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools_2.11.bb5
2 files changed, 45 insertions, 1 deletions
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch b/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch
new file mode 100644
index 0000000000..06f5b7a960
--- /dev/null
+++ b/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch
@@ -0,0 +1,41 @@
1From b7c42c6a9829bea911b22201edd7df2a9bec1a14 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:52:34 -0700
4Subject: [PATCH] Include fcntl.h for getting loff_t definition
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 dosfsck/dosfsck.h | 2 ++
11 dosfsck/lfn.c | 1 +
12 2 files changed, 3 insertions(+)
13
14diff --git a/dosfsck/dosfsck.h b/dosfsck/dosfsck.h
15index d9314b1..2076d5f 100644
16--- a/dosfsck/dosfsck.h
17+++ b/dosfsck/dosfsck.h
18@@ -50,6 +50,8 @@
19 #define CT_LE_L(v) (v)
20 #endif /* __BIG_ENDIAN */
21
22+#include <fcntl.h>
23+
24 #define VFAT_LN_ATTR (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
25
26 /* ++roman: Use own definition of boot sector structure -- the kernel headers'
27diff --git a/dosfsck/lfn.c b/dosfsck/lfn.c
28index 9b2cfc3..bb04fda 100644
29--- a/dosfsck/lfn.c
30+++ b/dosfsck/lfn.c
31@@ -7,6 +7,7 @@
32 #include <string.h>
33 #include <limits.h>
34 #include <time.h>
35+#include <fcntl.h>
36
37 #include "common.h"
38 #include "io.h"
39--
402.1.4
41
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
index d1c24b8748..beec488c09 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
@@ -17,7 +17,9 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.src.tar.gz/407d4
17 file://dosfstools-msdos_fs-types.patch \ 17 file://dosfstools-msdos_fs-types.patch \
18 file://include-linux-types.patch \ 18 file://include-linux-types.patch \
19 file://nofat32_autoselect.patch \ 19 file://nofat32_autoselect.patch \
20 file://fix_populated_dosfs_creation.patch " 20 file://fix_populated_dosfs_creation.patch \
21 file://0001-Include-fcntl.h-for-getting-loff_t-definition.patch \
22 "
21 23
22SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6" 24SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6"
23SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484" 25SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484"
@@ -26,6 +28,7 @@ SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c
26# add this in here to for sure allow for big files. 28# add this in here to for sure allow for big files.
27# 29#
28CFLAGS_append = " -D_FILE_OFFSET_BITS=64" 30CFLAGS_append = " -D_FILE_OFFSET_BITS=64"
31CFLAGS_append_libc-musl = " -D_GNU_SOURCE"
29 32
30do_install () { 33do_install () {
31 oe_runmake "PREFIX=${D}" "SBINDIR=${D}${base_sbindir}" \ 34 oe_runmake "PREFIX=${D}" "SBINDIR=${D}${base_sbindir}" \