From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4FCA1138332 for ; Thu, 8 Mar 2018 16:21:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E61DE0974; Thu, 8 Mar 2018 16:21:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAFE6E0974 for ; Thu, 8 Mar 2018 16:21:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D706335C07 for ; Thu, 8 Mar 2018 16:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0FC6240 for ; Thu, 8 Mar 2018 16:21:32 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1520526041.b976c04437daee44030ddd28f757a7df1ae5df45.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-0.6.5.11-r2.ebuild sys-fs/zfs/zfs-0.6.5.4-r4.ebuild sys-fs/zfs/zfs-0.7.5-r2.ebuild sys-fs/zfs/zfs-0.7.6-r1.ebuild sys-fs/zfs/zfs-0.7.9999.ebuild sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: b976c04437daee44030ddd28f757a7df1ae5df45 X-VCS-Branch: master Date: Thu, 8 Mar 2018 16:21:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: df134912-c656-4140-910a-f426aab0c242 X-Archives-Hash: 32744994284dd6e381e5e2ef4ae8dfa5 commit: b976c04437daee44030ddd28f757a7df1ae5df45 Author: Georgy Yakovlev sysdump net> AuthorDate: Thu Mar 8 03:33:42 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Mar 8 16:20:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b976c044 sys-fs/zfs: fix systemd related installation paths ebuilds intalls most systemd files into /usr/lib/systemd while it should be /lib/systemd qlist =sys-fs/zfs-0.7.6 | grep systemd /usr/lib/systemd/system-preset/50-zfs.preset /usr/lib/systemd/system/zfs-zed.service /usr/lib/systemd/system/zfs-import-cache.service /usr/lib/systemd/system/zfs-import-scan.service /usr/lib/systemd/system/zfs-mount.service /usr/lib/systemd/system/zfs-share.service /usr/lib/systemd/system/zfs-import.target /usr/lib/systemd/system/zfs.target /lib/systemd/system/zfs.service < this is ok The reason is that default values for: --with-systemdpresetdir and --with-systemdmodulesloaddir point to /usr/lib/systemd This commit overrides the location to to use gentoo preferred /lib/systemd Use systemd_reapply to re-create broken symlinks Also fixes minor QA, no more --with-blkid switch for 7.xx and live ebuilds. Package-Manager: Portage-2.3.24, Repoman-2.3.6 Signed-off-by: Matthew Thode gentoo.org> sys-fs/zfs/zfs-0.6.5.11-r2.ebuild | 11 +++++++++++ sys-fs/zfs/zfs-0.6.5.4-r4.ebuild | 12 ++++++++++++ sys-fs/zfs/zfs-0.7.5-r2.ebuild | 12 +++++++++++- sys-fs/zfs/zfs-0.7.6-r1.ebuild | 12 +++++++++++- sys-fs/zfs/zfs-0.7.9999.ebuild | 12 +++++++++++- sys-fs/zfs/zfs-9999.ebuild | 12 +++++++++++- 6 files changed, 67 insertions(+), 4 deletions(-) diff --git a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild index 1973747e440..c658c579f07 100644 --- a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild @@ -105,6 +105,8 @@ src_configure() { --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -191,6 +193,15 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() { diff --git a/sys-fs/zfs/zfs-0.6.5.4-r4.ebuild b/sys-fs/zfs/zfs-0.6.5.4-r4.ebuild index afdedfdc2c2..73910927609 100644 --- a/sys-fs/zfs/zfs-0.6.5.4-r4.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.4-r4.ebuild @@ -121,6 +121,8 @@ src_configure() { --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -223,6 +225,16 @@ pkg_postinst() { ewarn "It is very important that you update your initramfs after this " ewarn "update." fi + + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() { diff --git a/sys-fs/zfs/zfs-0.7.5-r2.ebuild b/sys-fs/zfs/zfs-0.7.5-r2.ebuild index 118fe97e22a..b625fe321e0 100644 --- a/sys-fs/zfs/zfs-0.7.5-r2.ebuild +++ b/sys-fs/zfs/zfs-0.7.5-r2.ebuild @@ -105,7 +105,8 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -192,6 +193,15 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() { diff --git a/sys-fs/zfs/zfs-0.7.6-r1.ebuild b/sys-fs/zfs/zfs-0.7.6-r1.ebuild index 118fe97e22a..b625fe321e0 100644 --- a/sys-fs/zfs/zfs-0.7.6-r1.ebuild +++ b/sys-fs/zfs/zfs-0.7.6-r1.ebuild @@ -105,7 +105,8 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -192,6 +193,15 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() { diff --git a/sys-fs/zfs/zfs-0.7.9999.ebuild b/sys-fs/zfs/zfs-0.7.9999.ebuild index 9a83e14a4af..9c81d0b6e89 100644 --- a/sys-fs/zfs/zfs-0.7.9999.ebuild +++ b/sys-fs/zfs/zfs-0.7.9999.ebuild @@ -101,7 +101,8 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -188,6 +189,15 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() { diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 4599d9acad3..4ea8bfe85be 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -106,7 +106,8 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -197,6 +198,15 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() {