From patchwork Mon Aug 7 14:19:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 798652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xR05q3Dd0z9s76; Tue, 8 Aug 2017 00:19:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1deisO-0005bp-EY; Mon, 07 Aug 2017 14:19:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1deisK-0005bZ-0t for kernel-team@lists.ubuntu.com; Mon, 07 Aug 2017 14:19:20 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1deisJ-0006no-MO; Mon, 07 Aug 2017 14:19:19 +0000 From: Colin King To: kernel-team@lists.ubuntu.com Subject: [PATCH][ARTFUL] UBUNTU: [debian] use all rather than amd64 dkms debs for sync Date: Mon, 7 Aug 2017 15:19:19 +0100 Message-Id: <20170807141919.17190-1-colin.king@canonical.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Colin Ian King Use the all arch deb rather than amd64 for the zfs and spl dkms deb sync Signed-off-by: Colin Ian King --- debian/scripts/misc/update-zfs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/scripts/misc/update-zfs.sh b/debian/scripts/misc/update-zfs.sh index b1a95cbfca41..be93503be611 100755 --- a/debian/scripts/misc/update-zfs.sh +++ b/debian/scripts/misc/update-zfs.sh @@ -3,13 +3,13 @@ # Update spl/zfs from the Ubuntu archive. You will have to manually check # to see if the version has been updated. # -SPL_MAJOR_VER=${_SPL_MAJOR_VER:-0.6.5.4} +SPL_MAJOR_VER=${_SPL_MAJOR_VER:-0.6.5.11} SPL_MINOR_VER=${_SPL_MINOR_VER:-0ubuntu1} -SPL_DKMS=${_SPL_DKMS:-http://archive.ubuntu.com/ubuntu/pool/universe/s/spl-linux/spl-dkms_${SPL_MAJOR_VER}-${SPL_MINOR_VER}_amd64.deb} +SPL_DKMS=${_SPL_DKMS:-http://archive.ubuntu.com/ubuntu/pool/universe/s/spl-linux/spl-dkms_${SPL_MAJOR_VER}-${SPL_MINOR_VER}_all.deb} -ZFS_MAJOR_VER=${_ZFS_MAJOR_VER:-0.6.5.4} +ZFS_MAJOR_VER=${_ZFS_MAJOR_VER:-0.6.5.11} ZFS_MINOR_VER=${_ZFS_MINOR_VER:-0ubuntu1} -ZFS_DKMS=${_ZFS_DKMS:-http://archive.ubuntu.com/ubuntu/pool/universe/z/zfs-linux/zfs-dkms_${ZFS_MAJOR_VER}-${ZFS_MINOR_VER}_amd64.deb} +ZFS_DKMS=${_ZFS_DKMS:-http://archive.ubuntu.com/ubuntu/pool/universe/z/zfs-linux/zfs-dkms_${ZFS_MAJOR_VER}-${ZFS_MINOR_VER}_all.deb} function update_from_archive {