From 11fdad15c2c8f4b4be696008bac0841a271aa161 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Mar 2019 15:09:17 +0100 Subject: 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 ++++++++++++++ meta/recipes-extended/blktool/blktool_4-7.1.bb | 30 ++++++++++++++++++++++ meta/recipes-extended/blktool/blktool_4-7.bb | 29 --------------------- 3 files changed, 49 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch create mode 100644 meta/recipes-extended/blktool/blktool_4-7.1.bb delete mode 100644 meta/recipes-extended/blktool/blktool_4-7.bb (limited to 'meta/recipes-extended/blktool') 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.1.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb new file mode 100644 index 0000000000..cc24d3cdb2 --- /dev/null +++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "Tune low-level block device parameters" +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+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373" + +DEPENDS = "glib-2.0" + +SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/b/${BPN}/${BPN}_4.orig.tar.gz;name=tarball \ + 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 \ + " + +SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" +SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764" + +# for this package we're mostly interested in tracking debian patches, +# and not in the upstream version where all development has effectively stopped +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/blktool/" +UPSTREAM_CHECK_REGEX = "(?P((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" + +S = "${WORKDIR}/${BPN}-4.orig" + +inherit autotools pkgconfig diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.bb deleted file mode 100644 index 0e6f7ee6df..0000000000 --- a/meta/recipes-extended/blktool/blktool_4-7.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Tune low-level block device parameters" -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+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373" - -DEPENDS = "glib-2.0" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/b/${BPN}/${BPN}_4.orig.tar.gz;name=tarball \ - 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 \ - " - -SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" -SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764" - -# for this package we're mostly interested in tracking debian patches, -# and not in the upstream version where all development has effectively stopped -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/blktool/" -UPSTREAM_CHECK_REGEX = "(?P((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" - -S = "${WORKDIR}/${BPN}-4.orig" - -inherit autotools pkgconfig -- cgit 1.2.3-korg