summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-01-13 17:37:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:03 +0000
commit8c3276ecea38d4d67c22e6db49060b2d4b457278 (patch)
treea08abeadef1a30dff799b50755a33a4faf8ab33c /meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
parentb248e55c0c39a4d45adc0690f2eefb332ab233f5 (diff)
downloadpoky-8c3276ecea38d4d67c22e6db49060b2d4b457278.tar.gz
e2fsprogs: 1.42.9 -> 1.43 (master)
Upgrade to 1.43 (master) to make "mke2fs -d" support xattr, so that the layer which requires xattr such as meta-selinux can populate images easily. * Remove the following patches since they are alredy in the source. 0001-e2fsprogs-fix-cross-compilation-problem.patch 0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch 0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch 0002-misc-create_inode.c-copy-files-recursively.patch 0003-misc-create_inode.c-create-special-file.patch 0004-misc-create_inode.c-create-symlink.patch 0005-misc-create_inode.c-copy-regular-file.patch 0006-misc-create_inode.c-create-directory.patch 0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch 0008-mke2fs.c-add-an-option-d-root-directory.patch 0009-misc-create_inode.c-handle-hardlinks.patch 0010-debugfs-use-the-functions-in-misc-create_inode.c.patch 0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch 0012-Fix-musl-build-failures.patch CVE-2015-0247.patch copy-in-create-hardlinks-with-the-correct-directory-.patch fix-icache.patch misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch * Remove cache_inode.patch since it is not needed any more * Updated mkdir.patch and ptest.patch * Add --enable-libblkid to EXTRA_OECONF since libblkid is not created by default. * Time of core-image-sato-sdk do_rootfs: - Before upgrade real 3m18.508s user 7m42.088s sys 1m1.984s - After upgrade real 3m21.552s user 7m38.496s sys 1m0.644s The are nearly the same * The "fsck -f" shows the image is OK, and also can boot. [YOCTO #8622] (From OE-Core rev: a1f235ad736d322bb50eb4a4293b6b2f4e5200aa) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
deleted file mode 100644
index 0b8008dfc9..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From c6ff7feb9038d6e8aaffe2e69b205ad5fa33df2f Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Mon, 18 Aug 2014 21:02:56 +0200
4Subject: [PATCH] Fix musl build failures
5
6In lib/ext2fs/unix_io.c, __u64 should be used instead of __uint64_t. This type
7is guaranteed by the e2fsprogs build system.
8(795c02def3681a99cc792a5ebc162d06f8a1eeb7)
9
10In misc/create_inode.c, <limits.h> is needed for the definition of PATH_MAX.
11(bbccc6f3c6a106721fb6f1ef4df6bc32c7986235)
12
13Both of these fixes have been made upstream with the git commit IDs given but
14those are larger commits containing other changes not needed here.
15
16Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
17
18Upstream-Status: Backport
19---
20 lib/ext2fs/unix_io.c | 6 +++---
21 misc/create_inode.c | 1 +
22 2 files changed, 4 insertions(+), 3 deletions(-)
23
24diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
25index 19be630..0cc0f52 100644
26--- a/lib/ext2fs/unix_io.c
27+++ b/lib/ext2fs/unix_io.c
28@@ -931,10 +931,10 @@ static errcode_t unix_discard(io_channel channel, unsigned long long block,
29
30 if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
31 #ifdef BLKDISCARD
32- __uint64_t range[2];
33+ __u64 range[2];
34
35- range[0] = (__uint64_t)(block) * channel->block_size;
36- range[1] = (__uint64_t)(count) * channel->block_size;
37+ range[0] = (__u64)(block) * channel->block_size;
38+ range[1] = (__u64)(count) * channel->block_size;
39
40 ret = ioctl(data->dev, BLKDISCARD, &range);
41 #else
42diff --git a/misc/create_inode.c b/misc/create_inode.c
43index 6d8de04..fcec5aa 100644
44--- a/misc/create_inode.c
45+++ b/misc/create_inode.c
46@@ -1,4 +1,5 @@
47 #include "create_inode.h"
48+#include <limits.h>
49
50 #if __STDC_VERSION__ < 199901L
51 # if __GNUC__ >= 2
52--
531.9.1
54