From e6f9c9776441080d46807457a864250df372a85f Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 24 Sep 2019 07:42:02 -0400 Subject: zfs-dkms: update patch links and checksums force-pushed PR branch means commits no longer exist -- grab them from the master branch instead, with identical .patch contents (except for leading commit id) --- .SRCINFO | 12 ++++++------ PKGBUILD | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index af3ae19..b2fdfda 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -12,22 +12,22 @@ pkgbase = zfs-dkms replaces = spl-dkms source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.1/zfs-0.8.1.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.1/zfs-0.8.1.tar.gz.asc - source = https://github.com/zfsonlinux/zfs/pull/9161/commits/d4b15200e75a37da053589aa2ddff06872302ac2.patch - source = https://github.com/zfsonlinux/zfs/pull/9161/commits/ee1848356f32e31f001ca96cc68e06a445f72108.patch + source = https://github.com/zfsonlinux/zfs/commit/041205afee7e151a0ac10c9b5314186cf65417dc.patch + source = https://github.com/zfsonlinux/zfs/commit/e7a99dab2b065ac2f8736a65d1b226d21754d771.patch source = 0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799 sha256sums = SKIP - sha256sums = c65c950abda42fb91fb99c6c916a50720a522c53e01a872f9310a4719bae9e2a - sha256sums = 19f798a29c00874874751880f1146c5849b8ebdb6233d8ae923f9fdd4661de19 + sha256sums = 38bc398be920b62f63275268068e326dbee50bc26363c8e136fa0e1aee3a69b5 + sha256sums = dba82a102bbbc7ab32af4f90a863d7566f8844f8571975bf30817f9a9cacd3e3 sha256sums = 37b84048ebb0c64c6e8a2186dbb0789978890bf816d6f454cb99b51d5ecf9590 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b b2sums = SKIP - b2sums = a8acfad7924ce07ac6bf4569a5262a351ee8de757fb1efd0f54db50590f22922f99e4547973aa9d1ed589e2866a09135627edc64a5593472315ef819a27e544b - b2sums = 850bd5226fba2a14acb4c1e808ebfd0bac3ba7dda576a20b4d20dbd29ee05a098ec3fda2d2b905f0751595fb6fdf0dc4137986a596441ee9ad6bc4c41ee98c36 + b2sums = 352fdf46212afcc6fb376251442398011cc1a511efb36d0af730078559cee4d120a955f81f4878aa977bed85ef5d7599272b0433640f8a3d9bea8c6d57191479 + b2sums = 2af677303b5af602cc65c1b732b63493e15e8d314f08c419a81d8fe3aedaeb7cf3bfb918196d4b9cfc6f86c2bcd2f11c242ee36cb0d9f4a57466e81cd3848bf9 b2sums = 17011f106c74196fa2d430b329223f955a4bcb14a37f1ac44636f71095d3123ecf97d9f0340b3bb6850b3baafc5a1744b8ec2fd46348045c58e2d55a3dab68ce b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 diff --git a/PKGBUILD b/PKGBUILD index 6a7f270..6062389 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,20 +13,20 @@ conflicts=('spl-dkms') provides=("${pkgname%-dkms}" 'spl-dkms') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} - "https://github.com/zfsonlinux/zfs/pull/9161/commits/d4b15200e75a37da053589aa2ddff06872302ac2.patch" - "https://github.com/zfsonlinux/zfs/pull/9161/commits/ee1848356f32e31f001ca96cc68e06a445f72108.patch" + "https://github.com/zfsonlinux/zfs/commit/041205afee7e151a0ac10c9b5314186cf65417dc.patch" + "https://github.com/zfsonlinux/zfs/commit/e7a99dab2b065ac2f8736a65d1b226d21754d771.patch" "0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799' 'SKIP' - 'c65c950abda42fb91fb99c6c916a50720a522c53e01a872f9310a4719bae9e2a' - '19f798a29c00874874751880f1146c5849b8ebdb6233d8ae923f9fdd4661de19' + '38bc398be920b62f63275268068e326dbee50bc26363c8e136fa0e1aee3a69b5' + 'dba82a102bbbc7ab32af4f90a863d7566f8844f8571975bf30817f9a9cacd3e3' '37b84048ebb0c64c6e8a2186dbb0789978890bf816d6f454cb99b51d5ecf9590' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b' 'SKIP' - 'a8acfad7924ce07ac6bf4569a5262a351ee8de757fb1efd0f54db50590f22922f99e4547973aa9d1ed589e2866a09135627edc64a5593472315ef819a27e544b' - '850bd5226fba2a14acb4c1e808ebfd0bac3ba7dda576a20b4d20dbd29ee05a098ec3fda2d2b905f0751595fb6fdf0dc4137986a596441ee9ad6bc4c41ee98c36' + '352fdf46212afcc6fb376251442398011cc1a511efb36d0af730078559cee4d120a955f81f4878aa977bed85ef5d7599272b0433640f8a3d9bea8c6d57191479' + '2af677303b5af602cc65c1b732b63493e15e8d314f08c419a81d8fe3aedaeb7cf3bfb918196d4b9cfc6f86c2bcd2f11c242ee36cb0d9f4a57466e81cd3848bf9' '17011f106c74196fa2d430b329223f955a4bcb14a37f1ac44636f71095d3123ecf97d9f0340b3bb6850b3baafc5a1744b8ec2fd46348045c58e2d55a3dab68ce' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) @@ -39,8 +39,8 @@ prepare() { # backport fixes for building on linux 5.3 # https://github.com/zfsonlinux/zfs/issues/9332 - patch -p1 -i ../d4b15200e75a37da053589aa2ddff06872302ac2.patch - patch -p1 -i ../ee1848356f32e31f001ca96cc68e06a445f72108.patch + patch -p1 -i ../041205afee7e151a0ac10c9b5314186cf65417dc.patch + patch -p1 -i ../e7a99dab2b065ac2f8736a65d1b226d21754d771.patch patch -p1 -i ../0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch # remove unneeded sections from module build -- cgit v1.2.1