From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id CAU+Hrcs6WONNAEAbAwnHQ (envelope-from ) for ; Sun, 12 Feb 2023 19:15:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QA40Hrcs6WO8iQAA9RJhRA (envelope-from ) for ; Sun, 12 Feb 2023 19:15:19 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F30B8ED27 for ; Sun, 12 Feb 2023 19:15:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRGsS-0004pu-FP; Sun, 12 Feb 2023 13:15:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRGsR-0004pa-4d for guix-patches@gnu.org; Sun, 12 Feb 2023 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRGsQ-0007cK-4n for guix-patches@gnu.org; Sun, 12 Feb 2023 13:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRGsP-0003sB-WD for guix-patches@gnu.org; Sun, 12 Feb 2023 13:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61408] [PATCH v2] gnu: bees: Update to 0.9.1. References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 18:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61408@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 61408-submit@debbugs.gnu.org id=B61408.167622569614854 (code B ref 61408); Sun, 12 Feb 2023 18:15:01 +0000 Received: (at 61408) by debbugs.gnu.org; 12 Feb 2023 18:14:56 +0000 Received: from localhost ([127.0.0.1]:46688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRGsJ-0003rV-ET for submit@debbugs.gnu.org; Sun, 12 Feb 2023 13:14:56 -0500 Received: from mail-bn8nam12olkn2099.outbound.protection.outlook.com ([40.92.21.99]:58292 helo=NAM12-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRGsE-0003rA-NS for 61408@debbugs.gnu.org; Sun, 12 Feb 2023 13:14:53 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0CC7J64kKckDxVfjpmv8ul/XBq+yFSTlXAvDSgvxMRKKGgeVeh50XVUMR+CdzPAHX0CKkCNqJyesXNmGnH0yDLLuq5TXZgwTy7QdUJtXvL+Sv+Sax4e/07BxbvzhrEnDHUeVUjjkpPf9UIf76n2UVAAZsgd6slFAtd3yPTuQXD79L5F6ME+Zr1rqcrlyTc5oyXhlZblr8uY0deBcxYSdvzz+1VHKsU/C9aACBICu2d+G4zqHBKbiw4tPZ8le6c2yMm8BA1aDdP/TCnefYYhetjQTU/WkCXGwPMCYPh8CxKx9o8ZbSzdcz9F+Gak4P7DyHMXCBPOm9sG4LIyR+oTew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ngy+lTQlSP+T+YAAain1c9SlJgJ3YyflMXXKz/KLmtc=; b=ADHBvIN7RvYh5dsLyo3JP4topjdZMGZGpxY6kXU9ppBG2UowxgCE2VqznOtS2Dq0+5pbACHlZxHw+9cByZjGkq5OTg7dUNmqGqGO2eIfCl9aKT8r0TLEynZXpteQmSx/VBnGARfbXLb489XwDHawIUeZvfOJPTl+8lBiRyA5sQQ7l22jr67o1T/pMyr50vXgjiINaDFY/OjPSzLi3nQnJNL9aiPQ39rA3v81HExWDaa0Mu96hMAWXHJIAX3BPfR01AlFl0jNkIHucXHG/zImfxIq1h+pgsnY/1MG5mgGGvKrvfAGIU4XESLHkEB+xKuRKVuauTjyrPNErPztyqJGkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ngy+lTQlSP+T+YAAain1c9SlJgJ3YyflMXXKz/KLmtc=; b=C7V3wur48gg/KfkOtfOYtYsWn5n79fRBThUACm2nrtdcyDTeNXvyBwoUK5uQnwyQWL390U4Yn8pC7VXlhGtEAQIM3Q++opzazwN94erk+jMJp74c0mneHpVhQTggfVQBHFZ+Kno6WZUQCir3KmQx+yeM9/TUGrtEm7gYewmGTbksEX2KQpQAjYTPSaVF28RbzizNrDBw8L/gzSwuX1Ytq00asLYl61M6F7h4ugFuCwz5ZPXJqVX/gVTt36dII9LuEwW0733ck2GSoD8cv2X9ORF3pI4StO7Y89hYh0ebFJiUrGtjKCDbMQo1DJDOynEU8TqvHThWjKO3TKvXeveB+w== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by CH2PR03MB5238.namprd03.prod.outlook.com (2603:10b6:610:a1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.23; Sun, 12 Feb 2023 18:14:40 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9d7c:7c0a:3e89:57dc]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9d7c:7c0a:3e89:57dc%7]) with mapi id 15.20.6086.023; Sun, 12 Feb 2023 18:14:40 +0000 From: Morgan.J.Smith@outlook.com Date: Sun, 12 Feb 2023 13:12:56 -0500 Message-ID: X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [tPLdyid0cq6HBc7i3WoC7XDUFWKQIbMFCfaDk3bAM+FX7YRq/C8b6g==] X-ClientProxiedBy: YQBPR0101CA0314.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6c::27) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20230212181255.24198-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|CH2PR03MB5238:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e742539-5648-43f2-2230-08db0d25022e X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvv0xTmL6ZAFYM6ewCh/hLtZLsLH/rTfyujKx8XOVt2Gory+aY+JUM85QiC6N7xSSNTC3NQKDex6QmAH/mxAs9iYlLhaiCj6tDt5dxH1as+hZ5VtUHVctMeipWjQRBjVRcZXyLATtA4aNmv8fhpgEPxYAFU4lagqkN1kFaa24KDwpbPd70ohMsKXJNFDiC66j3QvdevbcDmBcwk7/tJ9iTx9GW5T7Cgcua4z8Zju8blXFXUw14l4cSBfry8W7A7HZz0kNwmcsPpDA5x3+bxrxLudS0Gxg/b0DuJvPaX5GWjCGsMLds0847hei0cVrcP0Py4b4zyzygmlAoKQrX33fyMuIQ1xTAPjwKKkUUilSMHOw6MhoWBh3lhlVqcmB3D87iw1aGfJilDUIoJTnejYFt9211MEu2pTGPEUmt2V1X14S6UYwI65F+NeTb2qRpvsDEHT+Zi3TKgOEJdoH5etunvsG3lCurFJ1ugphiG8iTrKYGLmKwHPXw6Sn1V9PtdSHZmDgkw2P6Lyc23axo+EN8hYFkouKOPDJy+jg6aBp6RPrG3zjwcxRnKVkCPjb9YUdS64wZn6U0NI+0F7V1G/6GzqtrCW7UkXvSomFs93u2JaFD5FwsyNvQja/TDNIl7DL1qU4wOsnmPyHZK1HlwhAmSrwJqtdbWcLOk1NVKrxHx3btMslvy87fHdyHXuARRUhyP2kSrBaLNKAIv3C8SY0sAO1kYbqYqy0gJKFkuuYE971rNgeKqa1JbauPuJO2I77cU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uw8/+A8wXa+h/b3Zds0y6H8JSByJzj+RFiTfmHwzIRQK1jInylwXYt3C9kh4yUmIsevHTz/t02mPGak/GTwt6CyrQ0UtCdKrNAlCX5UJpbHneT19HQV95UUeZGB4IdJXeH3jEC7Ei/IcnNTrTAf6PCM3jn5ebpjVmNfOGYRTcGBYlkcn+9Q1U+/DKJO/2xMVrACEhpEAP5tntT2ICVPwGb3D0fS43jvPDC3JM5zchlgF58r0tpQYsA6z0KQAjj0nAbvuq4i1PEqsSL9tRiUTKZlnNFfqTmQ4roEj1XIFcd1xXNl0i0UGgBs68L2cwnQeMYxa9vGP7jm/sA7UjJNwHO2SBtZd6HnHyeWMC4vvl/spKJkpjGQwWT/wcBo+d8RBJTDrEys2gRLC9IKPs529FEIhr0pTpB5o7pNZQmeZFRMkfuvFQUQlOD8swF2kvIosw1AVxAd7MfOLWAYtBMdNPTyasm77AKMaN+6f6phuf6N98L0rQFsMQpeilaE3c9MFW2uLX/y3cTuQPDMihiwNmvlQCt3JfZffdcUSGWIEMH9LJmnyBJwRCoPFxsVVxL5DtOO+TbKgrSz5hbOjbcBoAwFxnE/OwoH/nZDkRR1alL9kC7aXvOX046mQKMNSiWdtn51xvkXP95y96kZtpdQcbw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Hkbp/6Na93IhkTgWIN/RAyrJBymQfmUnN57sPgCfJNL7z1pJYaCDzZW3u7R9olIxV0854iKBaOohXCr5FegbY5ZIy7ZzUGVtdBPskqs/zLNKu8vfdENXz2txqIRUeqw5RVQGpGAxGFldImaUpJaxvC9Sdp8zO8Ou6V9v3nmIYXlt0nb9LXkjAKFKM2UltqC6VbS6wmFT1r0Xf5nuoFFpl57vgpwinUhe1ussNpb7Xxk6Xu+Jgb28x7LthMPw3v4LhDn3cBcL2wxtnWfMoiqvqPXXzztEEv0B/g6AKjlYq3zw9ZMrGKYYMwwsjSfgB8Tl2AkG33RreQAF0PsQTLngEyVZjAUCWzPZjScDcS759TWxxBqytKm6LmjijymOW4VIghwRUSBcHYVDSg+RBsEAg+RpJUpX/jtW41nQiRfwLzGn8aJF7JzkRrGmP52g2O+752fznoc3sFkSpSM2emdel5hk0eMkh8KL5R9586F96+i8l8AhmrIrV55K7iP7jlQKsD14LTtmxdQT4StWk3i4yD/x97yHvinKfDOa1xTEQr91uGFU0pBf1cULRlkVyLHuNAz+QQnGRQx30dKLojvcPjpwJlzkO55IAyFUYX7XlmKGnlb2RcmeyUUP6LZJvxFLy+gw/k75/dktQFs652u28W9ociQjxIWN2rcmXPA/Or1HetyR2dDlOJWgieZ8tKacEKV9vzEbQruuuYMSdPyAsVy9c7iXu3SuW6oBELCIEIeQaxtfbUnEU0/BDogTnVQffl4tWMveAzLmb/r/2eQU22S83tsrhO6JteudZcHiGKj4NDyFw1prp6EH81LzRGHVTFxCNwRy2eFQF12AbMbRuBYKjr2E83Ti+cvg6Hmp5THUcdwY5ARQODKibZkgspX+JyCR+iv7iy8QIuHT9ZpW/2ityE9KBNt3VSjmwf3Vfz+rUzf4pJFOV+blY6Ye3q7 hYSBMWw2DNJsc2zsnqbBsdFES99sG6zg7bBuuPc0qrUUt/jBJOkl7OXNI5rE+/YYjVKtNo2jUhXmgS30weBxsDX7mQdtzIf4zo/ovE5dEYCYaC2IvFzIXj6po7emBCQ0RguPtWGq1dr9i2177G2zNN2EKQ7tUEscKf1xykxEuwN/57Izh20Cd78fCTbwbJZzcXUZgQL2JG+2a898Inr2u62ozRNdch8q0gai91s9tX7fdrUDxMnZAxAg8WDbGid5B/TIzNMnK5zpmdCoJfkSIpLzbgwtC79we/ts/5Zkei1QMCqgji8ru/oIvWMo1qBSn6fxSEdLqYzPKiJt19/k651iWJSoyVcLDhvNtkgCaTuXsGnIioj9yt+JwpspsHw7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e742539-5648-43f2-2230-08db0d25022e X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2023 18:14:40.6929 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5238 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=2; s=key1; d=yhetil.org; t=1676225719; a=rsa-sha256; cv=fail; b=ef5CIhDb0gppTY66+k6k4VCFPjh9cRYbTTqRK8KF3t7I4QW2c+TlJTvgMCS+UAMk5LJPmF 0Ucr9sr7uPSQzGsP1JcYkWh1QKCiSU7f3pZ52h8DYI40YGxEb3NTFcaAGB5Bp9MPtYw3F7 mlrr+r+TxMMmyl85IJXlmNbchH+x/lAY/GdQTzgVCDbhUTltcRqWGXvLSjfzrWs/eFM8wh TCw2gryAwfQkEZIENmAqhDmdOKYqTuSkAzjcYd3l6xiyOtj/k7P1CKlzIyaHihRgCHL8vb B4GJECyBdTZFTngfMoTRc1A9WxER7Pba7fr5CXnOjylvggBA7RXKDBX/LJ0edg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=C7V3wur4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676225719; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Ngy+lTQlSP+T+YAAain1c9SlJgJ3YyflMXXKz/KLmtc=; b=KcHAHNefDPFsbfLymnCDuSQrflJGXru+Maee/q6tIvlURJnYeXyFgmks3VetbL/oNZjqTp s+v6DHprRbNlnoZ0qEF7OO94WiQjo4MguLqgU1oR7/L6yiG8SS93ZGcM9mR16+T0W52cdn 8akPi9/t3+e3wulpmtbwvkgQyWpdX9g9bgCTDoXaBAY/OUjB1r7tHusjsbBdtFpnU4qmoW 3SQzdvTZZYyb8T7/p1SY4Iwpv9dv/C4bZXYqoPmUv/jRL46d7aJCl4wt2Hxza07u9J1WZU u902saOYykGpVI0Re9Ok09aBpXurXPy8ttATSL8EBWBE/P+/oeZxlBKL7US2BQ== X-Migadu-Queue-Id: F30B8ED27 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=C7V3wur4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -1.82 X-Spam-Score: -1.82 X-TUID: MnyTTqVcCchA From: Morgan Smith * gnu/packages/file-systems.scm (bees): Update to 0.9.1. [arguments]: Add fixtest phase. * gnu/local.mk: Remove bees-beesd-honor-destdir-on-installation.patch * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete file --- I have just discovered https://qa.guix.gnu.org and it is very cool. It helped me fix this patch :) gnu/local.mk | 1 - gnu/packages/file-systems.scm | 22 +++++----- ...-beesd-honor-destdir-on-installation.patch | 40 ------------------- 3 files changed, 13 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch diff --git a/gnu/local.mk b/gnu/local.mk index cdb99813d0..669d431802 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -941,7 +941,6 @@ dist_patch_DATA = \ %D%/packages/patches/bsd-games-prevent-name-collisions.patch \ %D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ - %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 471f943754..492ae23dd1 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1809,7 +1809,7 @@ (define-public fuse-overlayfs (define-public bees (package (name "bees") - (version "0.8") + (version "0.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1826,14 +1826,9 @@ (define-public bees (("city.o.*") "")) (substitute* "src/bees-hash.cc" (("#include .crucible/city.h.") "#include ")))) - (patches - (search-patches - ;; XXX: Cherry-picked from upstream, remove the patch when - ;; bumping version. - "bees-beesd-honor-destdir-on-installation.patch")) (sha256 (base32 - "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4")))) + "1h2a7p1ik27cykbnql5b36wfv4n2arw4289p2vvs0v471b0x3b1c")))) (build-system gnu-build-system) (arguments (list #:test-target "test" @@ -1845,6 +1840,12 @@ (define-public bees #:phases #~(modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'fixtest + (lambda _ + ;; Reported upstream. Check if fixed when updating. + ;; Fixes build failure on i686 and armhf where size_t != uint64_t. + (substitute* "test/seeker.cc" + (("size_t target") "uint64_t target")))) (add-after 'unpack 'fixpath (lambda* (#:key inputs #:allow-other-keys) (substitute* "scripts/beesd.in" @@ -1867,7 +1868,8 @@ (define-public bees (search-input-file inputs (string-append "/bin/" command))) (("btrfs sub") - (string-append (search-input-file inputs "/bin/btrfs") " sub")))))))) + (string-append (search-input-file inputs "/bin/btrfs") + " sub")))))))) (inputs (list btrfs-progs cityhash util-linux)) (home-page "https://github.com/Zygo/bees") (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") @@ -1876,7 +1878,9 @@ (define-public bees for large btrfs filesystems. It is an offline dedupe combined with an incremental data scan capability to minimize time data spends on disk from write to dedupe.") - (license license:gpl3+))) + (license (list license:gpl3+ + license:zlib ; lib/crc64.cc + license:gpl2)))) ; include/crucible/btrfs.h (define-public dwarfs (package diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch deleted file mode 100644 index 93817f42cf..0000000000 --- a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001 -From: Hilton Chain -Date: Fri, 23 Dec 2022 11:04:46 +0800 -Subject: [PATCH] beesd: Honor DESTDIR on installation. - -Co-authored-by: Adam Faiz -Signed-off-by: Hilton Chain ---- - Defines.mk | 1 + - scripts/beesd.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Defines.mk b/Defines.mk -index 9e8df40..e5394ba 100644 ---- a/Defines.mk -+++ b/Defines.mk -@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI - - define TEMPLATE_COMPILER = - sed $< >$@ \ -+ -e's#@DESTDIR@#$(DESTDIR)#' \ - -e's#@PREFIX@#$(PREFIX)#' \ - -e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \ - -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -diff --git a/scripts/beesd.in b/scripts/beesd.in -index 174bb6c..35d04aa 100755 ---- a/scripts/beesd.in -+++ b/scripts/beesd.in -@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))" - readonly AL16M="$((16*1024*1024))" - readonly CONFIG_DIR=@ETC_PREFIX@/bees/ - --readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees) -+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees) - - command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent" - --- -2.38.1 - -- 2.39.1