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-27 23:26:01 +0000 |
| commit | 8de82c63fe49917c80d1b634819ae2001625a645 (patch) | |
| tree | 24589b24035117ca71b7cc3b4a783b332441bdf9 /meta/recipes-extended/blktool | |
| parent | 11fdad15c2c8f4b4be696008bac0841a271aa161 (diff) | |
| download | openembedded-core-contrib-8de82c63fe49917c80d1b634819ae2001625a645.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.
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')
| -rw-r--r-- | meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-extended/blktool/blktool_4-7.1.bb | 1 |
2 files changed, 0 insertions, 24 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 @@ -include <sys/sysmacros.h> for major/minor defintions - -Fixes - -| ../blktool-4.orig/blktool.c: In function 'detect_dev_class': -| ../blktool-4.orig/blktool.c:295:10: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration] -| switch (major(st_rdev)) { -| ^~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: blktool-4.orig/blktool.c -=================================================================== ---- blktool-4.orig.orig/blktool.c -+++ blktool-4.orig/blktool.c -@@ -27,6 +27,7 @@ - #include <linux/cdrom.h> - #include <linux/major.h> - #include <scsi/scsi.h> -+#include <sys/sysmacros.h> - - #include "blktool.h" - diff --git a/meta/recipes-extended/blktool/blktool_4-7.1.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb index cc24d3cdb2..ff2eaa5352 100644 --- a/meta/recipes-extended/blktool/blktool_4-7.1.bb +++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb @@ -14,7 +14,6 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/ file://0002-fix-string-error.patch \ file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \ file://0004-fix-ftbfs-glibc-2.28.patch \ - file://blktool-gnulib-makedev.patch \ " SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" |