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 393811382C5 for ; Mon, 4 Jan 2021 13:56:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66261E0972; Mon, 4 Jan 2021 13:56:07 +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 3EAAFE0972 for ; Mon, 4 Jan 2021 13:56:07 +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 D2821340943 for ; Mon, 4 Jan 2021 13:56:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 521D3CC for ; Mon, 4 Jan 2021 13:56:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1609768558.6c50cbbce932b9683b9f87b99e7fffeabff286b4.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/bees/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/bees/bees-9999.ebuild X-VCS-Directories: sys-fs/bees/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 6c50cbbce932b9683b9f87b99e7fffeabff286b4 X-VCS-Branch: master Date: Mon, 4 Jan 2021 13:56:04 +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: e1bcea76-e77e-4749-b031-0b0c66466e73 X-Archives-Hash: d0a7d17df2c800fa12e169c93365dbb4 commit: 6c50cbbce932b9683b9f87b99e7fffeabff286b4 Author: Theo Anderson posteo de> AuthorDate: Thu Dec 10 08:54:00 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Jan 4 13:55:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c50cbbc sys-fs/bees: update live ebuild Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson posteo.de> Signed-off-by: Joonas Niilola gentoo.org> sys-fs/bees/bees-9999.ebuild | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index 0bfb2654d89..6c04e62724b 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit linux-info +inherit linux-info systemd DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent" HOMEPAGE="https://github.com/Zygo/bees" @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="GPL-3" @@ -29,14 +29,11 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~BTRFS_FS" ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" +PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" ) + pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then - if kernel_is -lt 4 4 3; then - ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to" - ewarn "properly operate, so it won't work. It's recommended to run at least" - ewarn "kernel version 4.11 for best performance and reliability." - ewarn - elif kernel_is -lt 4 11; then + if kernel_is -lt 4 11; then ewarn "With kernel versions below 4.11, bees may severely degrade system performance" ewarn "and responsiveness. Especially, the kernel may deadlock while bees is" ewarn "running, it's recommended to run at least kernel 4.11." @@ -48,7 +45,14 @@ pkg_pretend() { ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0" ewarn fi - + if kernel_is -lt 5 1 0; then + ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption" + ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" + ewarn "later kernel, that includes older LTS versions released after 5.0.4:" + ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" + ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" + ewarn + fi if kernel_is -lt 5 3 4; then ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running" ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst" @@ -59,25 +63,22 @@ pkg_pretend() { ewarn fi - if kernel_is -lt 5 0 4; then - ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption" - ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" - ewarn "later kernel, that includes older LTS versions released after 5.0.4:" - ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" - ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" - ewarn - fi - elog "Bees recommends running the latest current kernel for performance and" elog "reliability reasons, see README.md." fi } +src_prepare() { + default + sed -i 's/ -Werror//' makeflags || die +} + src_configure() { cat >localconf <<-EOF || die LIBEXEC_PREFIX=/usr/libexec PREFIX=/usr - LIBDIR=$(get_libdir) + LIBDIR="$(get_libdir)" + SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" DEFAULT_MAKE_TARGET=all EOF if [[ ${PV} != "9999" ]] ; then