diff options
author | Jonathan Liu <net147@gmail.com> | 2013-05-18 12:34:40 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 14:14:38 +0100 |
commit | bd85102951517e1dd30e214c7d04516c04609932 (patch) | |
tree | 0b815893321aa4967065787a4c51e3c84841f048 /meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch | |
parent | fe715c4d1b376b08dda36ac017c3f392fcc55870 (diff) | |
download | poky-bd85102951517e1dd30e214c7d04516c04609932.tar.gz |
util-linux: Update to 2.23
Remove license patch as it is integrated upstream.
Add backports of upstream loopdev regression fixes.
Updated uclibc-__progname-conflict.patch because it didn't apply.
Added bash-completion and partx sub-packages.
(From OE-Core rev: 54629315502247c5751c351b5792838f86dd1ea8)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch b/meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch new file mode 100644 index 0000000000..3382e7fc1d --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
3 | |||
4 | From b048b8af3a5568c90f6e0c2d56f6cb399dedb0d1 Mon Sep 17 00:00:00 2001 | ||
5 | From: Karel Zak <kzak@redhat.com> | ||
6 | Date: Mon, 13 May 2013 11:00:47 +0200 | ||
7 | Subject: [PATCH] losetup: use warn_size() for regular files only | ||
8 | |||
9 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
10 | --- | ||
11 | sys-utils/losetup.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c | ||
15 | index ccf120e..b44c9e5 100644 | ||
16 | --- a/sys-utils/losetup.c | ||
17 | +++ b/sys-utils/losetup.c | ||
18 | @@ -380,7 +380,7 @@ static void warn_size(const char *filename, uint64_t size) | ||
19 | struct stat st; | ||
20 | |||
21 | if (!size) { | ||
22 | - if (stat(filename, &st)) | ||
23 | + if (stat(filename, &st) || S_ISBLK(st.st_mode)) | ||
24 | return; | ||
25 | size = st.st_size; | ||
26 | } | ||
27 | -- | ||
28 | 1.8.2.3 | ||
29 | |||