* [bug#65936] [PATCH] gnu: Add ipvsadm.
@ 2023-09-14 5:55 B. Wilson via Guix-patches via
2023-10-18 21:00 ` bug#65936: " Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: B. Wilson via Guix-patches via @ 2023-09-14 5:55 UTC (permalink / raw)
To: 65936; +Cc: B. Wilson
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#65936: [PATCH] gnu: Add ipvsadm.
2023-09-14 5:55 [bug#65936] [PATCH] gnu: Add ipvsadm B. Wilson via Guix-patches via
@ 2023-10-18 21:00 ` Ludovic Courtès
2023-10-20 15:09 ` [bug#65936] " x--- via Guix-patches via
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2023-10-18 21:00 UTC (permalink / raw)
To: B. Wilson; +Cc: 65936-done
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
"B. Wilson" <elaexuotee@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’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 3596 bytes --]
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.")
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#65936] [PATCH] gnu: Add ipvsadm.
2023-10-18 21:00 ` bug#65936: " Ludovic Courtès
@ 2023-10-20 15:09 ` x--- via Guix-patches via
0 siblings, 0 replies; 3+ messages in thread
From: x--- via Guix-patches via @ 2023-10-20 15:09 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: B. Wilson, 65936-done
Ludovic Courtès <ludo@gnu.org> wrote:
> "B. Wilson" <elaexuotee@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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-20 15:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-14 5:55 [bug#65936] [PATCH] gnu: Add ipvsadm B. Wilson via Guix-patches via
2023-10-18 21:00 ` bug#65936: " Ludovic Courtès
2023-10-20 15:09 ` [bug#65936] " x--- via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.