me
/
guix
Archived
1
0
Fork 0

Revert "gnu: linux-libre: Move info manual to doc output."

This reverts commit 748ec62882.  It broke the
linux-libre-module-builder like so:

   builder for
   `/gnu/store/293jxydym9z7ck7afmrjqhiw3xpfs4i1-linux-libre-module-builder-6.0.10.drv'
   failed to produce output path
   `/gnu/store/ghmp1q5w6r1s9364rz53jd42152wgz2v-linux-libre-module-builder-6.0.10-doc'

for reasons difficult to understand.
master
Maxim Cournoyer 2022-12-01 21:33:48 -05:00
parent 2775bb95c7
commit 4781f0458d
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
2 changed files with 4 additions and 12 deletions

View File

@ -836,7 +836,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(version version)
(source source)
(supported-systems supported-systems)
(outputs `("out" ,@(if build-doc? '("doc") '())))
(build-system gnu-build-system)
(arguments
(list
@ -863,16 +862,10 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(invoke "make" "infodocs")))
(add-after 'build-doc 'install-doc
(lambda _
(let* ((info-dir (string-append #$output:doc
"/share/info"))
(info (string-append
info-dir "/TheLinuxKernel.info.gz")))
(with-directory-excursion "Documentation/output"
(invoke "make" "-C" "texinfo" "install-info"
(string-append "infodir=" info-dir)))
;; Create a symlink, for convenience.
(symlink info (string-append info-dir
"/linux.info.gz"))))))
(with-directory-excursion "Documentation/output"
(invoke "make" "-C" "texinfo" "install-info"
(string-append "infodir=" #$output
"/share/info"))))))
#~())
(add-before 'configure 'set-environment
(lambda* (#:key target #:allow-other-keys)

View File

@ -59,7 +59,6 @@
(name (string-append (package-name linux) "-module-builder"))
(inputs
`(("linux" ,linux)))
(outputs (delete "doc" (package-outputs linux)))
(arguments
(substitute-keyword-arguments (package-arguments linux)
((#:phases phases)