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 D10C0138334 for ; Fri, 24 May 2019 00:54:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6AE4E0729; Fri, 24 May 2019 00:54:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A71D2E0729 for ; Fri, 24 May 2019 00:54:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 01DA334453E for ; Fri, 24 May 2019 00:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDBFC5B5 for ; Fri, 24 May 2019 00:54:10 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1558659221.4f9ccbf688a6cd55a051f50f7565715ff80c6b70.gyakovlev@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.8.0.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 4f9ccbf688a6cd55a051f50f7565715ff80c6b70 X-VCS-Branch: master Date: Fri, 24 May 2019 00:54:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7b185f7-99eb-433a-92ab-92beb178cbaf X-Archives-Hash: 3408a7a626acf49d6bebc0dedbefe8ea commit: 4f9ccbf688a6cd55a051f50f7565715ff80c6b70 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri May 24 00:53:29 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri May 24 00:53:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9ccbf6 sys-fs/zfs: backport revision number to 0.8.0 no revbump, users will see consistent version strings zfs -V zfs-0.8.0-r0-gentoo zfs-kmod-0.8.0-r0-gentoo Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/zfs-0.8.0.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-fs/zfs/zfs-0.8.0.ebuild b/sys-fs/zfs/zfs-0.8.0.ebuild index b128cd4729d..129f3484544 100644 --- a/sys-fs/zfs/zfs-0.8.0.ebuild +++ b/sys-fs/zfs/zfs-0.8.0.ebuild @@ -98,7 +98,12 @@ pkg_setup() { src_prepare() { default - [[ ${PV} == "9999" ]] && eautoreconf + if [[ ${PV} == "9999" ]]; then + eautoreconf + else + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi # Update paths sed -e "s|/sbin/lsmod|/bin/lsmod|" \ @@ -174,7 +179,6 @@ pkg_postinst() { einfo "genkernel version 3.5.3.3 and earlier does NOT support" einfo " unlocking pools with native zfs encryption enabled at boot" einfo " use dracut or genkernel-9999 if you requre this functionality" - einfo fi if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then