diff options
Diffstat (limited to 'external/poky/meta/recipes-extended/blktool')
| -rw-r--r-- | external/poky/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch | 19 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch | 23 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/blktool/blktool_4-7.1.bb (renamed from external/poky/meta/recipes-extended/blktool/blktool_4-7.bb) | 2 |
3 files changed, 20 insertions, 24 deletions
diff --git a/external/poky/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch b/external/poky/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch new file mode 100644 index 00000000..65bca651 --- /dev/null +++ b/external/poky/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch @@ -0,0 +1,19 @@ +Description: Fix FTBFS with glibc 2.28 +Author: Adrian Bunk <bunk@debian.org> +Bug-Debian: https://bugs.debian.org/917055 + +This patch is taken from +http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- blktool-4.orig/blktool.c ++++ blktool-4/blktool.c +@@ -18,6 +18,7 @@ + #include <unistd.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #include <fcntl.h> + #include <errno.h> + #include <getopt.h> diff --git a/external/poky/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch b/external/poky/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch deleted file mode 100644 index 6eea608b..00000000 --- a/external/poky/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/external/poky/meta/recipes-extended/blktool/blktool_4-7.bb b/external/poky/meta/recipes-extended/blktool/blktool_4-7.1.bb index 0e6f7ee6..ff2eaa53 100644 --- a/external/poky/meta/recipes-extended/blktool/blktool_4-7.bb +++ b/external/poky/meta/recipes-extended/blktool/blktool_4-7.1.bb @@ -13,7 +13,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/ file://0001-fix-typos-in-manpage.patch \ file://0002-fix-string-error.patch \ file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \ - file://blktool-gnulib-makedev.patch \ + file://0004-fix-ftbfs-glibc-2.28.patch \ " SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" |