GNU bug report logs - #65936
[PATCH] gnu: Add ipvsadm.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65936 in the body.
You can then email your comments to 65936 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "B. Wilson" <elaexuotee <at> wilsonb.com>
To: guix-patches <at> gnu.org
Cc: "B. Wilson" <elaexuotee <at> wilsonb.com>
Subject: [PATCH] gnu: Add ipvsadm.
Date: Thu, 14 Sep 2023 14:55:13 +0900

* gnu/packages/linux.scm (ipvsadm): New variable.
---
 gnu/packages/linux.scm | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 91109c41d9..aa4bca1050 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -10414,3 +10414,49 @@ (define-public csmith
     (description "The primary purpose of Csmith is to find compiler bugs with
 random programs using differential testing.")
     (license license:bsd-4)))
+
+(define-public ipvsadm
+  (package
+    (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"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("linux-libre-headers" ,linux-libre-headers)
+                     ("pkg-config" ,pkg-config)))
+    (inputs `(("libnl" ,libnl)
+              ("popt" ,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))))))
+    (home-page "http://www.linuxvirtualserver.org/software/ipvs.html")
+    (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.")
+    (license license:gpl2+)))
-- 
2.41.0

Message #10 received at 65936-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: "B. Wilson" <elaexuotee <at> wilsonb.com>
Cc: 65936-done <at> debbugs.gnu.org
Subject: Re: [bug#65936] [PATCH] gnu: Add ipvsadm.
Date: Wed, 18 Oct 2023 23:00:53 +0200

[Message part 1 (text/plain, inline)]

"B. Wilson" <elaexuotee <at> wilsonb.com> 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’.

[Message part 2 (text/x-patch, inline)]

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.")

Message #13 received at 65936-done <at> debbugs.gnu.org (full text, mbox):

From: x <at> wilsonb.com
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: "B. Wilson" <elaexuotee <at> wilsonb.com>, 65936-done <at> debbugs.gnu.org
Subject: Re: [bug#65936] [PATCH] gnu: Add ipvsadm.
Date: Fri, 20 Oct 2023 17:09:06 +0200

Ludovic Courtès <ludo <at> gnu.org> wrote:
> "B. Wilson" <elaexuotee <at> wilsonb.com> 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’.

Aw, crap. This one was really rough and ready. It was sitting around in my
private channel for a while so I forgot, but I should have double checked.
Thanks for the fixups.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.