diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-03-27 15:09:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-29 08:28:53 +0000 |
commit | db1566b85919957532c7a362381341224269dc74 (patch) | |
tree | 53a1df242f907004ba0b9558fe0984fbbb3fcd95 /meta | |
parent | 0b8f0200f9422c9ef35750d4ceeafdee9fae1070 (diff) | |
download | poky-db1566b85919957532c7a362381341224269dc74.tar.gz |
blktool: update to 4-7.1
This update adds a patch from Debian to match the latest version there.
(From OE-Core rev: 11fdad15c2c8f4b4be696008bac0841a271aa161)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch | 19 | ||||
-rw-r--r-- | meta/recipes-extended/blktool/blktool_4-7.1.bb (renamed from meta/recipes-extended/blktool/blktool_4-7.bb) | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch new file mode 100644 index 0000000000..65bca65100 --- /dev/null +++ b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Description: Fix FTBFS with glibc 2.28 | ||
2 | Author: Adrian Bunk <bunk@debian.org> | ||
3 | Bug-Debian: https://bugs.debian.org/917055 | ||
4 | |||
5 | This patch is taken from | ||
6 | http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz | ||
7 | |||
8 | Upstream-Status: Inappropriate [upstream is dead] | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- blktool-4.orig/blktool.c | ||
11 | +++ blktool-4/blktool.c | ||
12 | @@ -18,6 +18,7 @@ | ||
13 | #include <unistd.h> | ||
14 | #include <sys/stat.h> | ||
15 | #include <sys/ioctl.h> | ||
16 | +#include <sys/sysmacros.h> | ||
17 | #include <fcntl.h> | ||
18 | #include <errno.h> | ||
19 | #include <getopt.h> | ||
diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb index 0e6f7ee6df..cc24d3cdb2 100644 --- a/meta/recipes-extended/blktool/blktool_4-7.bb +++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/ | |||
13 | file://0001-fix-typos-in-manpage.patch \ | 13 | file://0001-fix-typos-in-manpage.patch \ |
14 | file://0002-fix-string-error.patch \ | 14 | file://0002-fix-string-error.patch \ |
15 | file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \ | 15 | file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \ |
16 | file://0004-fix-ftbfs-glibc-2.28.patch \ | ||
16 | file://blktool-gnulib-makedev.patch \ | 17 | file://blktool-gnulib-makedev.patch \ |
17 | " | 18 | " |
18 | 19 | ||