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 | |
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')
4 files changed, 97 insertions, 85 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch b/meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch new file mode 100644 index 0000000000..d1093f21ef --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
3 | |||
4 | From e3b6cb87e0ba1304fa07ec316784de1c6243b28e Mon Sep 17 00:00:00 2001 | ||
5 | From: Karel Zak <kzak@redhat.com> | ||
6 | Date: Mon, 13 May 2013 10:54:41 +0200 | ||
7 | Subject: [PATCH] lib/loopdev: fix loopcxt_check_size() to work with blkdevs | ||
8 | |||
9 | The loopcxt_check_size() is workaround for kernels < v3.9, kernel has | ||
10 | been fixed by commit 541c742a7559eb65f0e36d3e2338c2ca532a3e61. | ||
11 | |||
12 | The function sets loopdev size according to backing file size. The | ||
13 | problem is that the backing file could be a block device where | ||
14 | stat.st_size is zero, so we have to use blkdev_get_size() for block | ||
15 | devices. | ||
16 | |||
17 | Addresses: https://bugs.archlinux.org/task/35193 | ||
18 | Reported-by: Dave Reisner <d@falconindy.com> | ||
19 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
20 | --- | ||
21 | lib/loopdev.c | 16 +++++++++++++++- | ||
22 | 1 file changed, 15 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/lib/loopdev.c b/lib/loopdev.c | ||
25 | index c35e306..3b65b5d 100644 | ||
26 | --- a/lib/loopdev.c | ||
27 | +++ b/lib/loopdev.c | ||
28 | @@ -1097,7 +1097,17 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd) | ||
29 | if (fstat(file_fd, &st)) | ||
30 | return -errno; | ||
31 | |||
32 | - expected_size = st.st_size; | ||
33 | + if (S_ISBLK(st.st_mode)) { | ||
34 | + if (blkdev_get_size(file_fd, | ||
35 | + (unsigned long long *) &expected_size)) | ||
36 | + return -errno; | ||
37 | + } else | ||
38 | + expected_size = st.st_size; | ||
39 | + | ||
40 | + if (expected_size == 0 || expected_size <= lc->info.lo_offset) { | ||
41 | + DBG(lc, loopdev_debug("failed to determine expected size")); | ||
42 | + return 0; /* ignore this error */ | ||
43 | + } | ||
44 | |||
45 | if (lc->info.lo_offset > 0) | ||
46 | expected_size -= lc->info.lo_offset; | ||
47 | @@ -1113,6 +1123,10 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd) | ||
48 | return -errno; | ||
49 | |||
50 | if (expected_size != size) { | ||
51 | + DBG(lc, loopdev_debug("warning: loopdev and expected " | ||
52 | + "size dismatch (%ju/%ju)", | ||
53 | + size, expected_size)); | ||
54 | + | ||
55 | if (loopcxt_set_capacity(lc)) { | ||
56 | /* ioctl not available */ | ||
57 | if (errno == ENOTTY || errno == EINVAL) | ||
58 | -- | ||
59 | 1.8.2.3 | ||
60 | |||
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 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/mbsalign-license.patch b/meta/recipes-core/util-linux/util-linux/mbsalign-license.patch deleted file mode 100644 index b2c3652088..0000000000 --- a/meta/recipes-core/util-linux/util-linux/mbsalign-license.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | |||
2 | Upstream-Status: Backport | ||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Notes from Pdraig (via email) : | ||
6 | |||
7 | Actually LGPLv2+ is most appropriate for that. | ||
8 | The intent is that it's licensed under the LGPL anyway: | ||
9 | |||
10 | $ gnulib/gnulib-tool --local-dir gl --extract-license mbsalign | ||
11 | LGPL | ||
12 | |||
13 | When extracting this to util-linux I should have adjusted | ||
14 | the boilerplate default license in the file (which gnulib-tool | ||
15 | can do on import). | ||
16 | |||
17 | |||
18 | From 16d8546964db1f6a27ae0f1d1cd24ce42704111d Mon Sep 17 00:00:00 2001 | ||
19 | From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> | ||
20 | Date: Fri, 15 Mar 2013 09:48:37 +0000 | ||
21 | Subject: [PATCH] lib/mbsalign: correct license header from GPLv[23] to | ||
22 | LGPLv2+ | ||
23 | |||
24 | * lib/mbsalign.c: s/GPLv3/LGPLv2+/ | ||
25 | * include/mbsalign.h: s/GPLv2/LGPLv2+/ | ||
26 | * README.licensing: Remove mention GPLv3 as it's not actually used. | ||
27 | --- | ||
28 | README.licensing | 2 -- | ||
29 | include/mbsalign.h | 4 ++-- | ||
30 | lib/mbsalign.c | 4 ++-- | ||
31 | 3 files changed, 4 insertions(+), 6 deletions(-) | ||
32 | |||
33 | diff --git a/README.licensing b/README.licensing | ||
34 | index b29883c..ab60004 100644 | ||
35 | --- a/README.licensing | ||
36 | +++ b/README.licensing | ||
37 | @@ -2,8 +2,6 @@ | ||
38 | The project util-linux doesn't use the same license for all of the code. | ||
39 | There is code under: | ||
40 | |||
41 | - * GPLv3+ (GNU General Public License version 3, or any later version) | ||
42 | - | ||
43 | * GPLv2+ (GNU General Public License version 2, or any later version) | ||
44 | |||
45 | * GPLv2 (GNU General Public License version 2) | ||
46 | diff --git a/include/mbsalign.h b/include/mbsalign.h | ||
47 | index fd957b3..8c9f2db 100644 | ||
48 | --- a/include/mbsalign.h | ||
49 | +++ b/include/mbsalign.h | ||
50 | @@ -2,8 +2,8 @@ | ||
51 | Copyright (C) 2009-2010 Free Software Foundation, Inc. | ||
52 | |||
53 | This program is free software: you can redistribute it and/or modify | ||
54 | - it under the terms of the GNU General Public License as published by | ||
55 | - the Free Software Foundation, either version 2 of the License, or | ||
56 | + it under the terms of the GNU Lesser General Public License as published by | ||
57 | + the Free Software Foundation, either version 2.1 of the License, or | ||
58 | (at your option) any later version. | ||
59 | |||
60 | This program is distributed in the hope that it will be useful, | ||
61 | diff --git a/lib/mbsalign.c b/lib/mbsalign.c | ||
62 | index d97bbd5..05c4650 100644 | ||
63 | --- a/lib/mbsalign.c | ||
64 | +++ b/lib/mbsalign.c | ||
65 | @@ -2,8 +2,8 @@ | ||
66 | Copyright (C) 2009-2010 Free Software Foundation, Inc. | ||
67 | |||
68 | This program is free software: you can redistribute it and/or modify | ||
69 | - it under the terms of the GNU General Public License as published by | ||
70 | - the Free Software Foundation, either version 3 of the License, or | ||
71 | + it under the terms of the GNU Lesser General Public License as published by | ||
72 | + the Free Software Foundation, either version 2.1 of the License, or | ||
73 | (at your option) any later version. | ||
74 | |||
75 | This program is distributed in the hope that it will be useful, | ||
76 | -- | ||
77 | 1.7.7.6 | ||
78 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch index 5b743cbc76..5031a7313e 100644 --- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch +++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch | |||
@@ -14,6 +14,7 @@ make[3]: *** [cache.lo] Error 1 | |||
14 | 14 | ||
15 | 15 | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
17 | 18 | ||
18 | Upstream-Status: Pending | 19 | Upstream-Status: Pending |
19 | Index: util-linux-2.22.1/configure.ac | 20 | Index: util-linux-2.22.1/configure.ac |
@@ -22,10 +23,10 @@ Index: util-linux-2.22.1/configure.ac | |||
22 | +++ util-linux-2.22.1/configure.ac | 23 | +++ util-linux-2.22.1/configure.ac |
23 | @@ -372,7 +372,7 @@ esac | 24 | @@ -372,7 +372,7 @@ esac |
24 | 25 | ||
25 | 26 | AC_MSG_CHECKING([whether program_invocation_short_name is defined]) | |
26 | AC_MSG_CHECKING(whether program_invocation_short_name is defined) | 27 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
27 | -AC_TRY_COMPILE([#include <argp.h>], | 28 | - #include <argp.h> |
28 | +AC_TRY_COMPILE([#include <errno.h>], | 29 | + #include <errno.h> |
29 | [program_invocation_short_name = "test";], | 30 | ]], [[ |
30 | AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, | 31 | program_invocation_short_name = "test"; |
31 | [Define if program_invocation_short_name is defined]) | 32 | ]])], [ |