diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-03-27 16:04:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-29 08:28:53 +0000 |
commit | a7f6451222c4b73de24221ca2c42b1dc01204a69 (patch) | |
tree | a04405d4966774f3ec09c58bd4a14b0912f1f314 /meta/recipes-extended/blktool/blktool | |
parent | db1566b85919957532c7a362381341224269dc74 (diff) | |
download | poky-a7f6451222c4b73de24221ca2c42b1dc01204a69.tar.gz |
blktool: remove a duplicate patch
blktool-gnulib-makedev.patch is actually doing the same
thing as 0004-fix-ftbfs-glibc-2.28.patch, so we end up
including the same file twice.
(From OE-Core rev: 8de82c63fe49917c80d1b634819ae2001625a645)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/blktool/blktool')
-rw-r--r-- | meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch b/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch deleted file mode 100644 index 6eea608b29..0000000000 --- a/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | include <sys/sysmacros.h> for major/minor defintions | ||
2 | |||
3 | Fixes | ||
4 | |||
5 | | ../blktool-4.orig/blktool.c: In function 'detect_dev_class': | ||
6 | | ../blktool-4.orig/blktool.c:295:10: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration] | ||
7 | | switch (major(st_rdev)) { | ||
8 | | ^~~~~ | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | Index: blktool-4.orig/blktool.c | ||
13 | =================================================================== | ||
14 | --- blktool-4.orig.orig/blktool.c | ||
15 | +++ blktool-4.orig/blktool.c | ||
16 | @@ -27,6 +27,7 @@ | ||
17 | #include <linux/cdrom.h> | ||
18 | #include <linux/major.h> | ||
19 | #include <scsi/scsi.h> | ||
20 | +#include <sys/sysmacros.h> | ||
21 | |||
22 | #include "blktool.h" | ||
23 | |||