[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/89: gnu: Add rumpkernel.
|
From: |
guix-commits |
|
Subject: |
16/89: gnu: Add rumpkernel. |
|
Date: |
Tue, 20 Jun 2023 05:58:52 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 5d6dc8a6c277d90358bfe3acce8f60e1e6fd7636
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun May 14 20:30:52 2023 +0200
gnu: Add rumpkernel.
This uses the Debian Salsa rumpkernel package git as upstream as that is
where
delopment happens. Once things have stabalized upstream may change to the
NetBSD git from where Debian takes their snapshots.
* gnu/packages/hurd.scm (rumpkernel): New variable.
(hurd-headers)[native-inputs]: Use cross-mig directly.
(gnumach)[native-inputs]: Likewise.
(hurd)[native-inputs]: Likewise.
---
gnu/packages/hurd.scm | 277 +++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 265 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c648cce102..4285594020 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -33,6 +33,7 @@
#:use-module (guix build-system trivial)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cross-base)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gnupg)
@@ -147,9 +148,7 @@ communication.")
(list autoconf
automake
(if (%current-target-system)
- (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
- (cross-mig (module-ref cross-base 'cross-mig)))
- (cross-mig (%current-target-system)))
+ (cross-mig (%current-target-system))
mig)))
(arguments
`(#:phases
@@ -281,10 +280,8 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
(list autoconf
automake
(if (%current-target-system)
- (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
- (cross-mig (module-ref cross-base 'cross-mig)))
- (cross-mig (%current-target-system)))
- mig)
+ (cross-mig (%current-target-system))
+ mig)
perl
texinfo-4))
(supported-systems %hurd-systems)
@@ -536,11 +533,9 @@ exec ${system}/rc \"$@\"
`(("autoconf" ,autoconf)
("automake" ,automake)
("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config'
- ("mig" ,(if (%current-target-system)
- (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
- (cross-mig (module-ref cross-base 'cross-mig)))
- (cross-mig (%current-target-system)))
- mig))
+ ("mig" , (if (%current-target-system)
+ (cross-mig (%current-target-system))
+ mig))
("pkg-config" ,pkg-config)
("perl" ,perl)
("texinfo" ,texinfo-4)
@@ -636,3 +631,261 @@ in userland processes thanks to the DDE layer.")
;; Some drivers are dually licensed with the options being GPLv2 or one
;; of MPL/Expat/BSD-3 (dependent on the driver).
(license gpl2))))
+
+(define-public rumpkernel
+ (let ((commit "ec2ab9612be4dc48a316a21a0c96d3388478a064")
+ (revision "2"))
+ (package
+ (name "rumpkernel")
+ (version (git-version "0-20211031" revision commit))
+ ;; This uses the Debian Salsa rumpkernel package git as upstream as that
+ ;; is where delopment happens. Once things have stabalized, upstream
+ ;; may change to the NetBSD git from where Debian takes their snapshots.
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://salsa.debian.org/hurd-team/rumpkernel.git";)
+ (commit commit)))
+ (modules '((guix build utils)))
+ (snippet
+ #~(with-directory-excursion "buildrump.sh/src"
+ (delete-file-recursively "crypto")
+ (delete-file-recursively "distrib")
+ (delete-file-recursively "games")
+ (delete-file-recursively "tests")
+
+ (rename-file "external/bsd/byacc" "byacc-")
+ (rename-file "external/bsd/flex" "flex-")
+ (rename-file "external/bsd/mdocml" "mdocml-")
+ (rename-file "external/historical/nawk" "nawk-")
+ (delete-file-recursively "external")
+ (mkdir-p "external/bsd")
+ (rename-file "byacc-" "external/bsd/byacc")
+ (rename-file "flex-" "external/bsd/flex")
+ (rename-file "mdocml-" "external/bsd/mdocml")
+ (mkdir-p "external/historical")
+ (rename-file "nawk-" "external/historical/nawk")
+
+ (rename-file "share/mk" "mk-")
+ (delete-file-recursively "share")
+ (mkdir-p "share")
+ (rename-file "mk-" "share/mk")
+
+ (rename-file "sys/external/bsd" "bsd-")
+ (rename-file "sys/external/isc" "isc-")
+ (delete-file-recursively "sys/external")
+ (mkdir-p "sys/external")
+ (rename-file "bsd-" "sys/external/bsd")
+ (rename-file "isc-" "sys/external/isc")))
+ (sha256
+ (base32
+ "1ypjg3jyzhh3gnanmk6fh76dwl5ml78n311nbi0hw7f7hygzn7vk"))
+ (file-name (git-file-name name commit))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:modules '((srfi srfi-26)
+ (ice-9 match)
+ (ice-9 rdelim)
+ (guix build utils)
+ (guix build gnu-build-system))
+ ;; As we are using the Debian package as upstream, we follow their
+ ;; build:
+ ;; * apply patches in debian/patches taken from the
+ ;; debian/patches/series file
+ ;; * for the configure, make, and install stages, follow
+ ;; the code in debian/rules
+ ;; The Debian patchset includes a cross build feature that we
+ ;; use with two differences
+ ;; * Debian uses a multiarch toolchain
+ ;; * we use cross-mig
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'apply-patches
+ (lambda* (#:key target #:allow-other-keys)
+ (let* ((patch-directory "debian/patches/")
+ (series (string-append patch-directory "series"))
+ (text (with-input-from-file series read-string))
+ (lines (string-split (string-trim-right text)
#\newline))
+ (patches (filter (negate (cute string-prefix? "#" <>))
+ lines))
+ (patch-files (map
+ (cute string-append patch-directory <>)
+ patches)))
+ (for-each
+ (cute invoke "patch" "--force" "-p1" "-i" <>)
+ patch-files)
+ ;; Somewhere in the build.sh/make process MIG is not being
+ ;; exported, apparently.
+ (when target
+ (substitute* "pci-userspace/src-gnu/Makefile.inc"
+ (("MIG=mig")
+ (string-append "MIG=" target "-mig")))))))
+ (add-before 'configure 'setenv
+ (lambda* (#:key build target #:allow-other-keys)
+ (define (noisy-setenv name value)
+ (setenv name value)
+ (format (current-error-port) "set ~a=~s\n" name value))
+ (noisy-setenv "HOST_CC" "gcc")
+ (when target
+ (noisy-setenv "MIG" (string-append target "-mig")))
+ (let ((target (or target build)))
+ (noisy-setenv "TARGET_AR" (string-append target "-ar"))
+ (noisy-setenv "TARGET_CC" (string-append target "-gcc"))
+ (noisy-setenv "TARGET_CXX" (string-append target "-g++"))
+ (noisy-setenv "TARGET_LD" (string-append target "-ld"))
+ (noisy-setenv "TARGET_MIG" (string-append target "-mig"))
+ (noisy-setenv "TARGET_NM" (string-append target "-nm")))
+ (setenv "PAWD" "pwd")
+ (for-each
+ (cute noisy-setenv <> "")
+ '("_GCC_CRTENDS"
+ "_GCC_CRTEND"
+ "_GCC_CRTBEGINS"
+ "_GCC_CRTBEGIN"
+ "_GCC_CRTI"
+ "_GCC_CRTN"))
+ (noisy-setenv "BSDOBJDIR=" (string-append (getcwd) "/obj"))))
+ (replace 'configure
+ (lambda args
+ (let ((configure (assoc-ref %standard-phases 'configure)))
+ (with-directory-excursion "buildrump.sh/src/lib/librumpuser"
+ (apply configure args)))))
+ ;; The build has three toplevel entry points
+ ;; * buildrump.sh/src/build.sh: create a NetBSD-compatible
+ ;; toolchain and supports cross-compiling
+ ;; * buildrump.sh/src/lib/librumpuser: the librump* libraries
+ ;; * pci-userspace/src-gnu: the librumpdev_pci* libraries
+ (replace 'build
+ (lambda* (#:key parallel-build? #:allow-other-keys)
+ (let* ((jobs (if parallel-build? (parallel-job-count) 1))
+ (host-cpu (match #$(or (%current-target-system
+ (%current-system)))
+ ("i586-pc-gnu" "i386")
+ ("i686-linux" "i386")
+ ("x86_64-linux" "amd64")))
+ (toprump (string-append
+ (getcwd)
+ "/buildrump.sh/src/sys/rump"))
+ (rump-make (string-append
+ (getcwd)
+ "/buildrump.sh/src/obj/tooldir/bin/nbmake-"
+ host-cpu)))
+ (mkdir "obj")
+ (with-directory-excursion "buildrump.sh/src"
+ (invoke
+ "sh" "build.sh"
+ "-V" "TOOLS_BUILDRUMP=yes"
+ "-V" "MKBINUTILS=no"
+ "-V" "MKGDB=no"
+ "-V" "MKGROFF=no"
+ "-V" (string-append "TOPRUMP=" toprump)
+ "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread"
+ "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread"
+ "-V" (string-append
+ "CPPFLAGS="
+ " -I../../obj/destdir." host-cpu "/usr/include"
+ " -D_FILE_OFFSET_BITS=64"
+ " -DRUMP_REGISTER_T=int"
+ " -DRUMPUSER_CONFIG=yes"
+ " -DNO_PCI_MSI_MSIX=yes"
+ " -DNUSB_DMA=1")
+ "-V" (string-append
+ "CWARNFLAGS="
+ " -Wno-error=maybe-uninitialized"
+ " -Wno-error=address-of-packed-member"
+ " -Wno-error=unused-variable"
+ " -Wno-error=stack-protector"
+ " -Wno-error=array-parameter"
+ " -Wno-error=array-bounds"
+ " -Wno-error=stringop-overflow")
+ "-V" "LIBCRTBEGIN="
+ "-V" "LIBCRTEND="
+ "-V" "LIBCRT0="
+ "-V" "LIBCRTI="
+ "-V" "_GCC_CRTENDS="
+ "-V" "_GCC_CRTEND="
+ "-V" "_GCC_CRTBEGINS="
+ "-V" "_GCC_CRTBEGIN="
+ "-V" "_GCC_CRTI="
+ "-V" "_GCC_CRTN="
+ "-U"
+ "-u"
+ "-T" "./obj/tooldir"
+ "-m" host-cpu
+ "-j" (number->string jobs)
+ "tools"
+ "rump"))
+ (with-directory-excursion "buildrump.sh/src/lib/librumpuser"
+ (setenv "RUMPRUN" "true")
+ (invoke rump-make "dependall"))
+ (with-directory-excursion "pci-userspace/src-gnu"
+ (invoke rump-make "dependall")))))
+ (replace 'install
+ (lambda _
+ (define (install-file file target)
+ (let ((dest (string-append target (basename file))))
+ (format (current-output-port) "`~a' -> `~a'~%" file dest)
+ (mkdir-p (dirname dest))
+ ;; Some libraries are duplicated/copied around in the
+ ;; build system, do not fail trying to install one
+ ;; a second time.
+ (if (file-exists? dest)
+ (format (current-error-port)
+ "warning: skipping: ~a\n" file)
+ (let ((stat (lstat file)))
+ (case (stat:type stat)
+ ((symlink)
+ (let ((target (readlink file)))
+ (symlink target dest)))
+ (else
+ (copy-file file dest)))))))
+ (let ((header (string-append #$output "/include/rump"))
+ (lib (string-append #$output "/lib/")))
+ (mkdir-p header)
+ (copy-recursively "buildrump.sh/src/sys/rump/include/rump"
+ header)
+ (mkdir-p lib)
+ (for-each
+ (cute install-file <> lib)
+ (append (find-files "buildrump.sh/src"
"librump.*[.](a|so.*)")
+ (find-files "obj" "librump.*[.](a|so.*)")))))))))
+ (inputs
+ (list gnumach-headers libpciaccess-0.17))
+ (native-inputs
+ (list autoconf
+ automake
+ libgcrypt
+ (if (%current-target-system)
+ (cross-mig (%current-target-system))
+ mig)
+ zlib))
+ (supported-systems %hurd-systems)
+ (home-page "https://wiki.netbsd.org/rumpkernel";)
+ (synopsis "NetBSD as rumpkernel for the GNU/Hurd")
+ (description
+ "This package provides NetBSD as rumpkernel for the GNU/Hurd, so that
+the Hurd may be installed on iron. Using this rumpkernel package, the hurd
+package's rumpdisk can be built which provides the pci.arbiter and rumpdisk
+servers.")
+ (license
+ ;; The NetBSD rumpkernel code is a big hodgepodge of softwares many of
+ ;; which have their own different licensing terms, see also
+ ;;
https://salsa.debian.org/hurd-team/rumpkernel/-/blob/master/debian/copyright
+ (list asl2.0
+ boost1.0
+ bsd-2
+ bsd-3
+ bsd-4
+ cddl1.0
+ expat
+ gpl1
+ gpl2+
+ gpl3+
+ isc
+ lgpl2.0+
+ public-domain
+ (@ (guix licenses) zlib)
+ (non-copyleft "file://src/lib/libc/hash/hashhl.c"
+ "See debian/copyright in the distribution."))))))
- branch hurd-team created (now 3853da20ba), guix-commits, 2023/06/20
- 02/89: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/06/20
- 01/89: hurd-boot: Add urandom and default-pager translators., guix-commits, 2023/06/20
- 05/89: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/20
- 06/89: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/20
- 07/89: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/20
- 10/89: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/20
- 13/89: Revert "hurd-boot: Add urandom and default-pager translators.", guix-commits, 2023/06/20
- 14/89: gnu: Add libpciaccess-0.17., guix-commits, 2023/06/20
- 16/89: gnu: Add rumpkernel.,
guix-commits <=
- 20/89: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/20
- 34/89: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/20
- 36/89: Revert "gnu: libunistring: Fix make check for the Hurd.", guix-commits, 2023/06/20
- 79/89: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/06/20
- 37/89: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/06/20
- 84/89: gnu: guix: Disable some test on 32bit., guix-commits, 2023/06/20
- 87/89: DRAFT hurd: Support second boot., guix-commits, 2023/06/20
- 22/89: system: hurd: Boot with pci.arbiter and rumpdisk., guix-commits, 2023/06/20
- 28/89: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/06/20
- 32/89: gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224., guix-commits, 2023/06/20