nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux-modules: Adjust 'section-contents' procedure. 

* gnu/build/linux-modules.scm (section-contents): Honor SECTION as was
intended.
(modinfo-section-contents): Pass 'section-contents' a section, not a
section name.
This commit is contained in:
Ludovic Courtès 2018-08-21 14:38:15 +02:00
parent a81b59b1bf
commit f43d2dcd80
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/build/linux-modules.scm
View File

@ -58,11 +58,10 @@
(define (section-contents elf section) (define (section-contents elf section)
"Return the contents of SECTION in ELF as a bytevector." "Return the contents of SECTION in ELF as a bytevector."
(let* ((modinfo (elf-section-by-name elf ".modinfo")) (let ((contents (make-bytevector (elf-section-size section))))
(contents (make-bytevector (elf-section-size modinfo)))) (bytevector-copy! (elf-bytes elf) (elf-section-offset section)
(bytevector-copy! (elf-bytes elf) (elf-section-offset modinfo)
contents 0 contents 0
(elf-section-size modinfo)) (elf-section-size section))
contents)) contents))
(define %not-nul (define %not-nul
@ -85,7 +84,8 @@ string list."
key/value pairs.." key/value pairs.."
(let* ((bv (call-with-input-file file get-bytevector-all)) (let* ((bv (call-with-input-file file get-bytevector-all))
(elf (parse-elf bv)) (elf (parse-elf bv))
(modinfo (section-contents elf ".modinfo"))) (section (elf-section-by-name elf ".modinfo"))
(modinfo (section-contents elf section)))
(map key=value->pair (map key=value->pair
(nul-separated-string->list (utf8->string modinfo))))) (nul-separated-string->list (utf8->string modinfo)))))