From 11fdad15c2c8f4b4be696008bac0841a271aa161 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Mar 2019 15:09:17 +0100 Subject: [PATCH] blktool: update to 4-7.1 This update adds a patch from Debian to match the latest version there. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../blktool/0004-fix-ftbfs-glibc-2.28.patch | 19 +++++++++++++++++++ .../{blktool_4-7.bb => blktool_4-7.1.bb} | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch rename meta/recipes-extended/blktool/{blktool_4-7.bb => blktool_4-7.1.bb} (96%) 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 @@ +Description: Fix FTBFS with glibc 2.28 +Author: Adrian Bunk +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 +--- blktool-4.orig/blktool.c ++++ blktool-4/blktool.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb similarity index 96% rename from meta/recipes-extended/blktool/blktool_4-7.bb rename to 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/ 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://0004-fix-ftbfs-glibc-2.28.patch \ file://blktool-gnulib-makedev.patch \ " -- 2.40.1