summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-02 13:49:34 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 13:13:30 +0100
commit1a2a69e042fbd21a1e8898a61de0315698dc77a7 (patch)
treee7e48c9bc68cb139d77f816dcf64d54f473d1f7a
parent469e56b1a7c8da38cb4c572c5609c86b8c9768dd (diff)
downloadpoky-1a2a69e042fbd21a1e8898a61de0315698dc77a7.tar.gz
dosfstools: Upgrade 3.0.28 -> 4.0
* Build system is now autotools * Patches are no longer required * Enable compatibility symlinks (From OE-Core rev: 5d73c59d0c9af90774411f981a3b0b7e09ce6d9e) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch46
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools/largefile.patch19
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools_4.0.bb (renamed from meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb)18
3 files changed, 6 insertions, 77 deletions
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch b/meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch
deleted file mode 100644
index 3497ca5409..0000000000
--- a/meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 3b95786af13e28157d889bd90a384ee255f2d91d Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Sun, 16 Aug 2015 15:55:43 +0200
4Subject: [PATCH] mkfs.fat: fix incorrect int type
5
6u_int32_t is not a stanard type, while uint32_t is. This fixes builds
7with the musl C library, which only defines so-called "clean" headers;
8build failures are like (back-quotes and elision manually added for
9readability):
10
11 http://autobuild.buildroot.org/results/a09/a0923d7f6d4dbae02eba4c5024bbdae3a52aa85a/build-end.log
12
13 /home/peko/autobuild/instance-1/output/host/usr/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE \
14 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -D_LARGEFILE_SOURCE \
15 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -c -o mkfs.fat.o src/mkfs.fat.c
16 src/mkfs.fat.c: In function 'main':
17 src/mkfs.fat.c:1415:18: error: 'u_int32_t' undeclared (first use in this function)
18 volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); [...]
19 ^
20 src/mkfs.fat.c:1415:18: note: each undeclared identifier is reported only once for each
21 function it appears in
22
23Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
24Signed-off-by: Andreas Bombe <aeb@debian.org>
25---
26Upstream-Status: Backport
27
28 src/mkfs.fat.c | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
32index b38d116..dddbe24 100644
33--- a/src/mkfs.fat.c
34+++ b/src/mkfs.fat.c
35@@ -1412,7 +1412,7 @@ int main(int argc, char **argv)
36
37 gettimeofday(&create_timeval, NULL);
38 create_time = create_timeval.tv_sec;
39- volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); /* Default volume ID = creation time, fudged for more uniqueness */
40+ volume_id = (uint32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); /* Default volume ID = creation time, fudged for more uniqueness */
41 check_atari();
42
43 printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n");
44--
452.7.0
46
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/largefile.patch b/meta/recipes-devtools/dosfstools/dosfstools/largefile.patch
deleted file mode 100644
index 7f7d8359df..0000000000
--- a/meta/recipes-devtools/dosfstools/dosfstools/largefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1defer setting largefile flags to build makery
2in a cross build we can not do runtime config tests
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Inappropriate[Cross compile Specific]
6Index: dosfstools-3.0.28/Makefile
7===================================================================
8--- dosfstools-3.0.28.orig/Makefile
9+++ dosfstools-3.0.28/Makefile
10@@ -27,8 +27,7 @@ SBINDIR = $(PREFIX)/sbin
11 DOCDIR = $(PREFIX)/share/doc
12 MANDIR = $(PREFIX)/share/man
13
14-#OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
15-OPTFLAGS = -O2 -fomit-frame-pointer -D_GNU_SOURCE $(shell getconf LFS_CFLAGS)
16+OPTFLAGS = -O2 -fomit-frame-pointer
17 #WARNFLAGS = -Wall -pedantic -std=c99
18 WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings
19 DEBUGFLAGS = -g
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb b/meta/recipes-devtools/dosfstools/dosfstools_4.0.bb
index 6fc3e41dfe..e7b1f61096 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_4.0.bb
@@ -9,23 +9,17 @@ SECTION = "base"
9LICENSE = "GPLv3" 9LICENSE = "GPLv3"
10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11 11
12SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v3.0.28/dosfstools-3.0.28.tar.xz \ 12SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.xz \
13 file://largefile.patch \
14 file://0001-mkfs.fat-fix-incorrect-int-type.patch \
15 " 13 "
16SRC_URI[md5sum] = "6a047a6c65186b9ebb1853709adb36db" 14SRC_URI[md5sum] = "20f8388b99702f276c973d228c7cff45"
17SRC_URI[sha256sum] = "ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2" 15SRC_URI[sha256sum] = "9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf"
18 16
19UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases" 17UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases"
20 18
21CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}" 19inherit autotools pkgconfig
22 20
23FILES_${PN} = "${base_sbindir}" 21EXTRA_OECONF = "--without-udev --enable-compat-symlinks"
24FILES_${PN}-doc = "${mandir} ${docdir}"
25 22
26do_install () { 23CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}"
27 oe_runmake "PREFIX=${D}${prefix}" "SBINDIR=${D}${base_sbindir}" \
28 "MANDIR=${D}${mandir}" "DOCDIR=${D}${docdir}" install
29}
30 24
31BBCLASSEXTEND = "native" 25BBCLASSEXTEND = "native"