From 1a2a69e042fbd21a1e8898a61de0315698dc77a7 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 2 Jun 2016 13:49:34 +0300 Subject: 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 Signed-off-by: Richard Purdie --- .../0001-mkfs.fat-fix-incorrect-int-type.patch | 46 ---------------------- .../dosfstools/dosfstools/largefile.patch | 19 --------- .../dosfstools/dosfstools_3.0.28.bb | 31 --------------- meta/recipes-devtools/dosfstools/dosfstools_4.0.bb | 25 ++++++++++++ 4 files changed, 25 insertions(+), 96 deletions(-) delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/0001-mkfs.fat-fix-incorrect-int-type.patch delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/largefile.patch delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb create mode 100644 meta/recipes-devtools/dosfstools/dosfstools_4.0.bb (limited to 'meta/recipes-devtools/dosfstools') 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 @@ -From 3b95786af13e28157d889bd90a384ee255f2d91d Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 16 Aug 2015 15:55:43 +0200 -Subject: [PATCH] mkfs.fat: fix incorrect int type - -u_int32_t is not a stanard type, while uint32_t is. This fixes builds -with the musl C library, which only defines so-called "clean" headers; -build failures are like (back-quotes and elision manually added for -readability): - - http://autobuild.buildroot.org/results/a09/a0923d7f6d4dbae02eba4c5024bbdae3a52aa85a/build-end.log - - /home/peko/autobuild/instance-1/output/host/usr/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE \ - -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -D_LARGEFILE_SOURCE \ - -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -c -o mkfs.fat.o src/mkfs.fat.c - src/mkfs.fat.c: In function 'main': - src/mkfs.fat.c:1415:18: error: 'u_int32_t' undeclared (first use in this function) - volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); [...] - ^ - src/mkfs.fat.c:1415:18: note: each undeclared identifier is reported only once for each - function it appears in - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Andreas Bombe ---- -Upstream-Status: Backport - - src/mkfs.fat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c -index b38d116..dddbe24 100644 ---- a/src/mkfs.fat.c -+++ b/src/mkfs.fat.c -@@ -1412,7 +1412,7 @@ int main(int argc, char **argv) - - gettimeofday(&create_timeval, NULL); - create_time = create_timeval.tv_sec; -- volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); /* Default volume ID = creation time, fudged for more uniqueness */ -+ volume_id = (uint32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); /* Default volume ID = creation time, fudged for more uniqueness */ - check_atari(); - - printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n"); --- -2.7.0 - 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 @@ -defer setting largefile flags to build makery -in a cross build we can not do runtime config tests - -Signed-off-by: Khem Raj -Upstream-Status: Inappropriate[Cross compile Specific] -Index: dosfstools-3.0.28/Makefile -=================================================================== ---- dosfstools-3.0.28.orig/Makefile -+++ dosfstools-3.0.28/Makefile -@@ -27,8 +27,7 @@ SBINDIR = $(PREFIX)/sbin - DOCDIR = $(PREFIX)/share/doc - MANDIR = $(PREFIX)/share/man - --#OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --OPTFLAGS = -O2 -fomit-frame-pointer -D_GNU_SOURCE $(shell getconf LFS_CFLAGS) -+OPTFLAGS = -O2 -fomit-frame-pointer - #WARNFLAGS = -Wall -pedantic -std=c99 - WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings - DEBUGFLAGS = -g diff --git a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb b/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb deleted file mode 100644 index 6fc3e41dfe..0000000000 --- a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb +++ /dev/null @@ -1,31 +0,0 @@ -# dosfstools OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Copyright (C) 2015, Sören Brinkmann All Rights Reserved -# Released under the MIT license (see packages/COPYING) -SUMMARY = "DOS FAT Filesystem Utilities" -HOMEPAGE = "https://github.com/dosfstools/dosfstools" - -SECTION = "base" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v3.0.28/dosfstools-3.0.28.tar.xz \ - file://largefile.patch \ - file://0001-mkfs.fat-fix-incorrect-int-type.patch \ - " -SRC_URI[md5sum] = "6a047a6c65186b9ebb1853709adb36db" -SRC_URI[sha256sum] = "ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2" - -UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases" - -CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}" - -FILES_${PN} = "${base_sbindir}" -FILES_${PN}-doc = "${mandir} ${docdir}" - -do_install () { - oe_runmake "PREFIX=${D}${prefix}" "SBINDIR=${D}${base_sbindir}" \ - "MANDIR=${D}${mandir}" "DOCDIR=${D}${docdir}" install -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/dosfstools/dosfstools_4.0.bb b/meta/recipes-devtools/dosfstools/dosfstools_4.0.bb new file mode 100644 index 0000000000..e7b1f61096 --- /dev/null +++ b/meta/recipes-devtools/dosfstools/dosfstools_4.0.bb @@ -0,0 +1,25 @@ +# dosfstools OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Copyright (C) 2015, Sören Brinkmann All Rights Reserved +# Released under the MIT license (see packages/COPYING) +SUMMARY = "DOS FAT Filesystem Utilities" +HOMEPAGE = "https://github.com/dosfstools/dosfstools" + +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.xz \ + " +SRC_URI[md5sum] = "20f8388b99702f276c973d228c7cff45" +SRC_URI[sha256sum] = "9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf" + +UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-udev --enable-compat-symlinks" + +CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf