From unknown Fri Mar 29 08:00:47 2024 X-Loop: owner@bugs.devuan.org Subject: bug#14: Updated Patches and Debian LSB_Release Check Reply-To: Chris Dos , 14@bugs.devuan.org Resent-From: Chris Dos Resent-To: devuan-bugs@lists.dyne.org Resent-CC: KatolaZ Resent-Date: Sun, 03 Jun 2018 14:33:02 UTC Resent-Message-ID: Resent-Sender: owner@bugs.devuan.org X-Devuan-PR-Message: report 14 X-Devuan-PR-Package: zfs X-Devuan-PR-Keywords: ascii Received: via spool by 14-submit@bugs.devuan.org id=B14.152803620415916 (code B ref 14); Sun, 03 Jun 2018 14:33:02 UTC Received: (at 14) by bugs.devuan.org; 3 Jun 2018 14:30:04 +0000 Delivered-To: devuanbugs@dyne.org Received: from tupac3.dyne.org [195.169.149.119] by fulcanelli with IMAP (fetchmail-6.3.26) for (single-drop); Sun, 03 Jun 2018 16:30:04 +0200 (CEST) Received: from windwalker.chrisdos.com (windwalker.chrisdos.com [71.33.251.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by vm6.ganeti.dyne.org (Postfix) with ESMTPS id 611B3F6085A for <14@bugs.devuan.org>; Sun, 3 Jun 2018 16:26:43 +0200 (CEST) Authentication-Results: vm6.ganeti.dyne.org; dkim=pass (1024-bit key; unprotected) header.d=chrisdos.com header.i=@chrisdos.com header.b="IJJqrNhT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chrisdos.com header.i=@chrisdos.com header.b="dtbzNgoO"; dkim-atps=neutral Received: from localhost (localhost.localdomain [127.0.0.1]) by windwalker.chrisdos.com (Postfix) with ESMTP id E8848AEFD8 for <14@bugs.devuan.org>; Sun, 3 Jun 2018 08:24:28 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=chrisdos.com; s=windwalker-dkim; t=1528035868; bh=knMTCr/QhxeqkHhQwL85XbhQLkFgSeB42DQrmCfyeWE=; h=To:From:Subject:Date:From; b=IJJqrNhTyd72dUV9JofOrwEzmKND7sgDpASHmbFCk30TF1snW+mgXsghexb5zk4Gv OAm+pvcuD2YayD817qwRJeoCLT0LFXZJYDR+/r/B2Hrz7haVqMORrk0PkC0mQDDNbz UJgG5IRiyuqRshOvgbCuYB5TP0tvoG6ian6QxPZg= X-Virus-Scanned: Debian amavisd-new at windwalker.chrisdos.com Received: from windwalker.chrisdos.com ([127.0.0.1]) by localhost (windwalker.chrisdos.com [127.0.0.1]) (amavisd-new, port 10026) with SMTP id PmbPqHysal11 for <14@bugs.devuan.org>; Sun, 3 Jun 2018 08:24:13 -0600 (MDT) Received: from muaddib.chrisdos.com (unknown [IPv6:2001:470:4b:38f:777::868c]) by windwalker.chrisdos.com (Postfix) with ESMTPSA id 90F44AF16E for <14@bugs.devuan.org>; Sun, 3 Jun 2018 08:24:13 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=chrisdos.com; s=windwalker-dkim; t=1528035853; bh=ZU92B5izyD299bLRG8izMBdgFliqnEeizv2UIv+XbGY=; h=To:From:Subject:Date:From; b=dtbzNgoOtBFLM5q5AyT3LS14PQorxeZEJtxt9VM47+dVK5F1ynXbCyW0ODPnm4f55 Vs4u4OwiQHAa5BQihUKO1Jg1imxf0ignyFh6CnKMBIpnFABVQ420K4RJwUjETnY2D1 +RPNR4QDHfKoNanLUq5dnU8jTYyAxLHyo9QSincc= To: 14@bugs.devuan.org From: Chris Dos Message-ID: Date: Sun, 3 Jun 2018 08:24:13 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------3891CED4ED03F308D1F47D70" Content-Language: en-US X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tupac3.dyne.org This is a multi-part message in MIME format. --------------3891CED4ED03F308D1F47D70 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Debian has added a specific lsb_release check to make sure the packages are running on Debian in the zfs-dkms package when it tries to compile against the kernel source. See: https://bugs.debian.org/900089 So the zfs-dkms Debian package will refuse to work on Devuan now. And it has been few days shy of two years and Debian still won't commit the sysvinit patch. :( https://bugs.debian.org/826994 I've attached patches to remove the lsb_release and install the sysvinit patches against zfs-0.7.9-3: Chris --------------3891CED4ED03F308D1F47D70 Content-Type: text/x-patch; name="remove_lsb_release_dependency_900089.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="remove_lsb_release_dependency_900089.patch" --- a/debian/zfs-dkms/usr/src/zfs-0.7.9/dkms.conf +++ b/debian/zfs-dkms/usr/src/zfs-0.7.9/dkms.conf @@ -6,8 +6,6 @@ --prefix=/usr --with-config=kernel --with-linux=$( - case `lsb_release -is` in - (Debian) if [[ -e ${kernel_source_dir/%build/source} ]] then echo ${kernel_source_dir/%build/source} @@ -15,11 +13,6 @@ # A kpkg exception for Proxmox 2.0 echo ${kernel_source_dir} fi - ;; - (*) - echo ${kernel_source_dir} - ;; - esac ) --with-linux-obj=${kernel_source_dir} --with-spl=${source_tree}/spl-${PACKAGE_VERSION} --- a/debian/zfs-dkms.dkms.debhelper +++ b/debian/zfs-dkms.dkms.debhelper @@ -6,8 +6,6 @@ --prefix=/usr --with-config=kernel --with-linux=$( - case `lsb_release -is` in - (Debian) if [[ -e ${kernel_source_dir/%build/source} ]] then echo ${kernel_source_dir/%build/source} @@ -15,11 +13,6 @@ # A kpkg exception for Proxmox 2.0 echo ${kernel_source_dir} fi - ;; - (*) - echo ${kernel_source_dir} - ;; - esac ) --with-linux-obj=${kernel_source_dir} --with-spl=${source_tree}/spl-${PACKAGE_VERSION} --- a/debian/zfs-dkms.dkms +++ b/debian/zfs-dkms.dkms @@ -6,8 +6,6 @@ --prefix=/usr --with-config=kernel --with-linux=$( - case `lsb_release -is` in - (Debian) if [[ -e ${kernel_source_dir/%build/source} ]] then echo ${kernel_source_dir/%build/source} @@ -15,11 +13,6 @@ # A kpkg exception for Proxmox 2.0 echo ${kernel_source_dir} fi - ;; - (*) - echo ${kernel_source_dir} - ;; - esac ) --with-linux-obj=${kernel_source_dir} --with-spl=${source_tree}/spl-${PACKAGE_VERSION} --------------3891CED4ED03F308D1F47D70 Content-Type: text/x-patch; name="sysvinit_patch_5_826994_0.7.9-3.diff" Content-Disposition: attachment; filename="sysvinit_patch_5_826994_0.7.9-3.diff" Content-Transfer-Encoding: quoted-printable diff -Nru zfs-linux-0.7.9/debian/changelog zfs-linux-0.7.9/debian/changel= og --- zfs-linux-0.7.9/debian/changelog 2018-05-28 04:22:02.000000000 -0600 +++ zfs-linux-0.7.9/debian/changelog 2018-06-03 07:12:43.000000000 -0600 @@ -1,3 +1,10 @@ +zfs-linux (0.7.9-3.1) UNRELEASED; urgency=3Dmedium + + * Non-maintainer upload. + * Add sysvinit scripts.=20 + + -- Chris Dos Sun, 03 Jun 2018 07:12:43 -0600 + zfs-linux (0.7.9-3) unstable; urgency=3Dmedium =20 [ Antonio Russo ] diff -Nru zfs-linux-0.7.9/debian/patches/1004-zed-service-bindir.patch zf= s-linux-0.7.9/debian/patches/1004-zed-service-bindir.patch --- zfs-linux-0.7.9/debian/patches/1004-zed-service-bindir.patch 2018-05-= 16 07:38:12.000000000 -0600 +++ zfs-linux-0.7.9/debian/patches/1004-zed-service-bindir.patch 2018-06-= 03 07:08:42.000000000 -0600 @@ -1,11 +1,14 @@ -Description: Fix the path to the zed binary on the systemd unit. +Description: Fix the path to the zed binary on the systemd unit and + the sysvinit script. We install zed into /usr/sbin manually meanwhile the upstream default is installing it into /sbin. Ubuntu packages also install zed to /usr/sbin, but they ship their own zfs-zed unit. Author: Carlos Alberto Lopez Author: Fabian Gr=FCnbichler +Author: Chris Dos Bug-Debian: https://bugs.debian.org/849813 +Bug-Debian: https://bugs.debian.org/826994 Forwarded: no --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in @@ -18,3 +21,13 @@ Restart=3Don-abort =20 [Install] +--- a/etc/init.d/zfs-functions.in ++++ b/etc/init.d/zfs-functions.in +@@ -89,7 +89,7 @@ + + # Paths to what we need + ZFS=3D"@sbindir@/zfs" +-ZED=3D"@sbindir@/zed" ++ZED=3D"/usr/sbin/zed" + ZPOOL=3D"@sbindir@/zpool" + ZPOOL_CACHE=3D"@sysconfdir@/zfs/zpool.cache" diff -Nru zfs-linux-0.7.9/debian/rules zfs-linux-0.7.9/debian/rules --- zfs-linux-0.7.9/debian/rules 2018-05-17 10:11:36.000000000 -0600 +++ zfs-linux-0.7.9/debian/rules 2018-06-03 07:10:41.000000000 -0600 @@ -114,6 +114,26 @@ chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs =20 +override_dh_installinit: + @# Install the /etc/init.d/zfs-import script. + dh_installinit -pzfsutils-linux --name=3Dzfs-import \ + --no-restart-on-upgrade --no-start + + @# Install the /etc/init.d/zfs-mount script. + dh_installinit -pzfsutils-linux --name=3Dzfs-mount \ + --no-restart-on-upgrade --no-start + + @# Install the /etc/init.d/zfs-share script. + dh_installinit -pzfsutils-linux --name=3Dzfs-share \ + --no-restart-on-upgrade --no-start + + @# Add a dummy (link to /dev/null) for zfs-import.service + ln -s /dev/null $(CURDIR)/debian/zfsutils-linux/lib/systemd/system/zfs-= import.service + + @# Install the ZED init file. + dh_installinit -pzfs-zed --name=3Dzfs-zed \ + --no-restart-on-upgrade --no-start + override_dh_dkms: dh_dkms -V $(DEB_VERSION_UPSTREAM) =20 diff -Nru zfs-linux-0.7.9/debian/zfsutils-linux.install zfs-linux-0.7.9/d= ebian/zfsutils-linux.install --- zfs-linux-0.7.9/debian/zfsutils-linux.install 2018-05-28 04:07:08.000= 000000 -0600 +++ zfs-linux-0.7.9/debian/zfsutils-linux.install 2018-06-03 07:10:41.000= 000000 -0600 @@ -1,6 +1,8 @@ ../tree/zfsutils-linux/* / etc/default/zfs etc/zfs/zfs-functions +etc/init.d/zfs-import +etc/init.d/zfs-mount etc/zfs/zpool.d/ lib/systemd/system-preset/ lib/systemd/system/zfs-import-cache.service diff -Nru zfs-linux-0.7.9/debian/zfs-zed.install zfs-linux-0.7.9/debian/z= fs-zed.install --- zfs-linux-0.7.9/debian/zfs-zed.install 2018-05-16 07:38:12.000000000 = -0600 +++ zfs-linux-0.7.9/debian/zfs-zed.install 2018-06-03 07:10:41.000000000 = -0600 @@ -1,4 +1,6 @@ etc/zfs/zed.d/* +etc/init.d/zfs-zed +etc/init.d/zfs-share lib/systemd/system/zfs-zed.service usr/lib/*/zfs/zed.d/* usr/sbin/zed --------------3891CED4ED03F308D1F47D70--