ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-15 23:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xen: Update to 4.14.6.

Browse source 
* gnu/packages/virtualization.scm (xen): Update to 4.14.6.
[arguments]: Remove obsolete quoting work-around for old bug.
Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2023-09-24 02:00:00 +02:00
parent d7abe56433
commit 11f1d72dd8
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/virtualization.scm
View file

@ -2279,7 +2279,7 @@ (define-public bochs
(define-public xen (define-public xen
(package (package
(name "xen") (name "xen")
(version "4.14.1") ; please update the mini-os input as well (version "4.14.6") ; please update the mini-os input as well
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2288,7 +2288,7 @@ (define-public xen
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1r90rvypw76ya9clqw5p02gm1k8hxz73f7gr95ca778nnzvb7xjw")))) "1cdzpxbihkdn4za8ly0lgkbxrafjzbxjflhfn83kyg4bam1vv7mn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2340,8 +2340,7 @@ (define-public xen
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-mini-os (add-after 'unpack 'unpack-mini-os
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "mini-os") "extras/mini-os") (copy-recursively (assoc-ref inputs "mini-os") "extras/mini-os")))
#t))
(add-after 'unpack-mini-os 'patch (add-after 'unpack-mini-os 'patch
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "tools/firmware/Rules.mk" (substitute* "tools/firmware/Rules.mk"
@ -2374,13 +2373,7 @@ (define-public xen
; TODO: extra_link_args = ['-Wl,-rpath=/opt/foo'], ; TODO: extra_link_args = ['-Wl,-rpath=/opt/foo'],
(string-append "runtime_library_dirs = ['" (string-append "runtime_library_dirs = ['"
(assoc-ref outputs "out") (assoc-ref outputs "out")
"/lib'],\nlibrary_dirs ="))) "/lib'],\nlibrary_dirs =")))))
;; This needs to be quoted:
;; <https://lists.gnu.org/archive/html/guix-devel/2022-03/msg00113.html>.
(substitute* "xen/arch/x86/xen.lds.S"
((".note.gnu.build-id")
"\".note.gnu.build-id\""))))
(add-before 'configure 'patch-xen-script-directory (add-before 'configure 'patch-xen-script-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* '("configure" (substitute* '("configure"
@ -2389,8 +2382,7 @@ (define-public xen
(("XEN_SCRIPT_DIR=.*") (("XEN_SCRIPT_DIR=.*")
(string-append "XEN_SCRIPT_DIR=" (string-append "XEN_SCRIPT_DIR="
(assoc-ref outputs "out") (assoc-ref outputs "out")
"/etc/xen/scripts"))) "/etc/xen/scripts")))))
#t))
(add-before 'configure 'set-environment-up (add-before 'configure 'set-environment-up
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(define (cross? x) (define (cross? x)
@ -2425,8 +2417,7 @@ (define (filter-environment! filter-predicate
"mini-os-git-checkout"))) "mini-os-git-checkout")))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
(setenv "EFI_VENDOR" "guix") (setenv "EFI_VENDOR" "guix")))
#t))
(replace 'build (replace 'build
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "world" make-flags)))))) (apply invoke "make" "world" make-flags))))))
@ -2463,10 +2454,11 @@ (define (filter-environment! filter-predicate
(url "https://xenbits.xen.org/git-http/mini-os.git") (url "https://xenbits.xen.org/git-http/mini-os.git")
;; This corresponds to (string-append "xen-RELEASE-" version)) ;; This corresponds to (string-append "xen-RELEASE-" version))
;; at time of packaging, but upstream has unfortunately modified ;; at time of packaging, but upstream has unfortunately modified
;; existing tags in the past. ;; existing tags in the past. Also, not all Xen releases get a
(commit "0b4b7897e08b967a09bed2028a79fabff82342dd"))) ;; new tag. See <https://xenbits.xen.org/gitweb/?p=mini-os.git>.
(commit "f57858b7e8ef8dd48394dd08cec2bef3c9fb92f5")))
(sha256 (sha256
(base32 "1i8pcl19n60i2m9vlg79q3nknpj209c9ic5x10wxaicx45kc107f")) (base32 "04y7grxs47amvjcq1rq4jgk174rhid5m2z9w8wrv7rfd2xhazxy1"))
(file-name (string-append name "-" version "-mini-os-git-checkout")))) (file-name (string-append name "-" version "-mini-os-git-checkout"))))
("perl" ,perl) ("perl" ,perl)
; TODO: markdown ; TODO: markdown