From patchwork Tue Aug 9 15:37:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 41433 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 15C5227BBEA; Tue, 9 Aug 2022 16:43:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 81BBE27BBE9 for ; Tue, 9 Aug 2022 16:43:19 +0100 (BST) Received: from localhost ([::1]:52644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLRO2-00016o-KD for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 11:43:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLRIw-0002Fo-J2 for guix-patches@gnu.org; Tue, 09 Aug 2022 11:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLRIw-0004Es-9h for guix-patches@gnu.org; Tue, 09 Aug 2022 11:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLRIv-0004JT-VE for guix-patches@gnu.org; Tue, 09 Aug 2022 11:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56858] [PATCH] gnu: libcgroup: Update to 2.0.2. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56858 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "(" Cc: muradm , 56858@debbugs.gnu.org Received: via spool by 56858-submit@debbugs.gnu.org id=B56858.166005943916528 (code B ref 56858); Tue, 09 Aug 2022 15:38:01 +0000 Received: (at 56858) by debbugs.gnu.org; 9 Aug 2022 15:37:19 +0000 Received: from localhost ([127.0.0.1]:44515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLRI9-0004IQ-U4 for submit@debbugs.gnu.org; Tue, 09 Aug 2022 11:37:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLRI7-0004IE-OG for 56858@debbugs.gnu.org; Tue, 09 Aug 2022 11:37:12 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLRI2-00047Y-2l; Tue, 09 Aug 2022 11:37:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=ga56tLovIV1LqrDpRLer1PonCpwLXYEwO7lt2V0/Cdg=; b=LDWRxyEmlElvYd2nSmVC LaVTL2nYFDpPPI25Z6RVRho6eu7n6Ax1VW2Aro7+ZIPYaSHaEc0/wGYwBh58Q0cHe4PTwiE/1+WV8 YNORudej97bQAo48gaXK7PttO8u797SGWAz9wSp5lOTLafEGUHt83r/4YvlbWyhG5g30n+vpPEkRx rbX4u4IKeJcIbJdYimVdTQND8qSDtg0vnVGGUqs7TRSIGplj/otO/RmSvfggT92JP5gGn4rzkp4OH jsZbyLiqhnkcOZF4Ox/SZqMWYfuQO4Utjj/jkU1cUxDP68oP/q0H+uUnnl/RvmTywtkhM4DX5v34x 61N3mTDdY5Kv3A==; Received: from [193.50.110.201] (port=56142 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLRI1-00044l-IB; Tue, 09 Aug 2022 11:37:05 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20220731152938.28770-1-mail@muradm.net> <87sfmgplez.fsf@muradm.net> Date: Tue, 09 Aug 2022 17:37:02 +0200 In-Reply-To: (paren@disroot.org's message of "Mon, 01 Aug 2022 10:02:30 +0100") Message-ID: <87bkst5syp.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, "(" skribis: > On Mon Aug 1, 2022 at 6:42 AM BST, muradm wrote: >> Is there a guideline where home-page should be? I find it more >> DRY when reusing. > Almost every package in Guix puts it directly above synopsis, though > you do have a point about DRY. Yeah IMO it’s a good idea to reuse ‘home-page’ like this patch does. >> Their repo is not suitable for building from, instead >> they release sources manually. > Looks okay to me: > But there is a problem with vendoring googletest, it seems. You'll want > to use the system's googletest, and (recursive? #t) in the git-reference > to clone the tests repo. Also, the tarball seems to contain pregenerated > autotools files, which are discouraged by Guix. So, first things first. The priority should be to run tests and remove the bundled googletest, which I tried with the patch below. Now, tests won’t run because apparently they try to use ‘sudo’ (!): --8<---------------cut here---------------start------------->8--- Traceback (most recent call last): File "/tmp/guix-build-libcgroup-2.0.2.drv-0/libcgroup-2.0.2/tests/ftests/./ftests.py", line 353, in sys.exit(main(config)) File "/tmp/guix-build-libcgroup-2.0.2.drv-0/libcgroup-2.0.2/tests/ftests/./ftests.py", line 337, in main setup(config, record_time=True) File "/tmp/guix-build-libcgroup-2.0.2.drv-0/libcgroup-2.0.2/tests/ftests/./ftests.py", line 170, in setup Run.run(['sudo', 'lxd', 'init', '--auto']) File "/tmp/guix-build-libcgroup-2.0.2.drv-0/libcgroup-2.0.2/tests/ftests/run.py", line 38, in run subproc = subprocess.Popen(command, shell=shell_bool, File "/gnu/store/65i3nhcwmz0p8rqbg48gaavyky4g4hwk-python-3.9.9/lib/python3.9/subprocess.py", line 951, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/gnu/store/65i3nhcwmz0p8rqbg48gaavyky4g4hwk-python-3.9.9/lib/python3.9/subprocess.py", line 1821, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: 'sudo' FAIL ftests.sh (exit status: 1) --8<---------------cut here---------------end--------------->8--- Could you check whether they can run at all without root privileges, and if not, document it in a comment above #:tests? #f? Thanks, Ludo’. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e70d8d1a90..7eb309dfa5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8177,14 +8177,18 @@ (define-public libcgroup (uri (string-append home-page "/releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 - (base32 "1y0c9ncsawamj77raiw6qkbm5cdsyvhjb2mvgma1kxmgw0r3pxlf")))) + (base32 "1y0c9ncsawamj77raiw6qkbm5cdsyvhjb2mvgma1kxmgw0r3pxlf")) + (modules '((guix build utils))) + (snippet + ;; Delete the bundled copy of googletest, that even includes a .so. + '(delete-file-recursively "googletest")))) (build-system gnu-build-system) - (arguments - `(#:tests? #f)) + ;; (arguments + ;; `(#:tests? #f)) (native-inputs - (list bison flex)) + (list bison flex python-wrapper)) (inputs - (list linux-pam)) + (list linux-pam googletest)) (synopsis "Control groups management tools") (description "Control groups is Linux kernel method for process resource restriction, permission handling and more. This package provides userspace