diff options
Diffstat (limited to 'meta/recipes-extended/blktool')
| -rw-r--r-- | meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch | 2 | ||||
| -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) | 3 |
5 files changed, 24 insertions, 4 deletions
diff --git a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch b/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch index fee368dac2..25a2fabe15 100644 --- a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch +++ b/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch @@ -7,7 +7,7 @@ This patch is taken from ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- blktool.8 | 4 ++-- diff --git a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch b/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch index d08aba5f05..401e41e3ed 100644 --- a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch +++ b/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch @@ -7,7 +7,7 @@ This patch is taken from ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- util.c | 2 +- diff --git a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch b/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch index d7ed0b9f4d..d1f1e797fe 100644 --- a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch +++ b/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch @@ -14,7 +14,7 @@ This patch is taken from ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- blktool.c | 11 +++++++++-- 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 <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/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb index 4551c3233e..bb44befb56 100644 --- a/meta/recipes-extended/blktool/blktool_4-7.bb +++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "blktool is used for querying and/or changing settings \ of a block device. It is like hdparm but a more general tool, as it \ works on SCSI, IDE and SATA devices." HOMEPAGE = "http://packages.debian.org/unstable/admin/blktool" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373" @@ -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 \ " SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" |