From patchwork Wed Oct 18 21:00:53 2023 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: 54977 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 BD79B27BBE9; Wed, 18 Oct 2023 22:01:50 +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 6270E27BBE2 for ; Wed, 18 Oct 2023 22:01:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtDfd-0000ZX-SU; Wed, 18 Oct 2023 17:01:37 -0400 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 1qtDfc-0000Z6-UP for guix-patches@gnu.org; Wed, 18 Oct 2023 17:01:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtDfc-0004aF-Cj for guix-patches@gnu.org; Wed, 18 Oct 2023 17:01:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtDg2-0000cP-Ah for guix-patches@gnu.org; Wed, 18 Oct 2023 17:02:02 -0400 Subject: bug#65936: [PATCH] gnu: Add ipvsadm. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 21:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65936 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "B. Wilson" Cc: 65936-done@debbugs.gnu.org Mail-Followup-To: 65936@debbugs.gnu.org, ludo@gnu.org, elaexuotee@wilsonb.com Received: via spool by 65936-done@debbugs.gnu.org id=D65936.16976628922334 (code D ref 65936); Wed, 18 Oct 2023 21:02:02 +0000 Received: (at 65936-done) by debbugs.gnu.org; 18 Oct 2023 21:01:32 +0000 Received: from localhost ([127.0.0.1]:34770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtDfX-0000bX-SI for submit@debbugs.gnu.org; Wed, 18 Oct 2023 17:01:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtDfU-0000bI-2t for 65936-done@debbugs.gnu.org; Wed, 18 Oct 2023 17:01:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtDey-0004Xo-AH; Wed, 18 Oct 2023 17:00:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=/rn1BhtL4Cf/20u6YfYDdW+Wvrzn+4SnPeCYF5iu8uo=; b=pGPW/ET3uSFB5wihXHMM epa/chhw2LcHFzT50KxNSHFTHV5PNlhSpQX+DrkmT5bmNS9b+9vuLERE8UyP2JN3bXnGGP4xx+17x IylQDOu7d/eu6nHvvnfihJCGDWDs+ESWC4p20xUKsefcHETQydbwFNgtrjX6eM8GmSyB8mJTX3GTK XxJYtcYg0OnUteifVdhGItQXBw31VnqNiZqs9+DFCGRdd7vzFpwHiIGc286wLyCtNtd2U4QL7hwP9 fWx5jKy4PbdkgaHybCXYyURbk2b1ihHfN8IVicmHDvPTgtBL0STd3OZ5yfZhDXwKt24RqCrldwP+t UgqHe87US1XLvQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <20230914055514.19256-1-elaexuotee@wilsonb.com> (B. Wilson's message of "Thu, 14 Sep 2023 14:55:13 +0900") References: <20230914055514.19256-1-elaexuotee@wilsonb.com> Date: Wed, 18 Oct 2023 23:00:53 +0200 Message-ID: <87ttqn4pdm.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches "B. Wilson" skribis: > * gnu/packages/linux.scm (ipvsadm): New variable. I ran ‘guix style -S inputs’ and ‘guix style -S arguments’, and then I had to edit it quite a bit (see below). Committed. Ludo’. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08cc3823ed..457e41f303 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -10514,42 +10514,36 @@ (define-public ipvsadm (name "ipvsadm") (version "1.31") (source - (origin - (method url-fetch) - (uri (string-append "https://kernel.org/pub/linux/utils/kernel" - "/ipvsadm/ipvsadm-" version ".tar.xz")) - (sha256 - (base32 "1nyzpv1hx75k9lh0vfxfhc0p2fpqaqb38xpvs8sn88m1nljmw2hs")))) + (origin + (method url-fetch) + (uri (string-append "https://kernel.org/pub/linux/utils/kernel" + "/ipvsadm/ipvsadm-" version ".tar.xz")) + (sha256 + (base32 "1nyzpv1hx75k9lh0vfxfhc0p2fpqaqb38xpvs8sn88m1nljmw2hs")))) (build-system gnu-build-system) - (native-inputs `(("linux-libre-headers" ,linux-libre-headers) - ("pkg-config" ,pkg-config))) - (inputs `(("libnl" ,libnl) - ("popt" ,popt))) + (native-inputs (list linux-libre-headers pkg-config which)) + (inputs (list libnl popt)) (arguments - `(#:tests? #f - #:make-flags - (list (string-join - (list "CFLAGS=" - (string-append "-I" (assoc-ref %build-inputs "libnl") - "/include/libnl3") - (string-append "-L" (assoc-ref %build-inputs "libnl") - "/lib") - "-fPIC") - " ") - (string-append "CC=" ,(cc-for-target)) - (string-append "SBIN=" (assoc-ref %outputs "out") "/sbin") - (string-append "INIT=" (assoc-ref %outputs "out") "/etc/init.d") - (string-append "MANDIR=" (assoc-ref %outputs "out") "/share/man")) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'build-libs - (lambda* (#:key inputs make-flags #:allow-other-keys) - ;; XXX: libnl-* pkg-config checks are failing for some reason - (invoke "sed" "-i" "68,74d" "Makefile") - (apply invoke "make" "libs" make-flags)))))) + (list #:tests? #f + #:parallel-build? #f ;build fails randomly with '-j' + #:make-flags + #~(list (string-join + (list "CFLAGS=" + (string-append "-I" + #$(this-package-input "libnl") + "/include/libnl3") + (string-append "-L" #$(this-package-input "libnl") + "/lib") + "-fPIC") + " ") + (string-append "CC=" #$(cc-for-target)) + (string-append "SBIN=" #$output "/sbin") + (string-append "INIT=" #$output "/etc/init.d") + (string-append "MANDIR=" #$output "/share/man")) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) (home-page "http://www.linuxvirtualserver.org/software/ipvs.html") - (synopsis "IP Virtual Server administration utility") + (synopsis "IP virtual server administration utility") (description "@code{ipvsadm(8)} is used to set up, maintain or inspect the virtual server table in the Linux kernel. The Linux Virtual Server can be used to build scalable network services based on a cluster of two or more nodes.")