You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

226 lines
8.2 KiB

gnu: util-linux: Move libraries to separate output. Fixes <https://bugs.gnu.org/37732>. Reported by Diego Nicola Barbato <dnbarbato@posteo.de>. * gnu/packages/linux.scm (util-linux)[outputs]: Add "lib". [arguments]: Update #:configure-flags and the "move-static-libraries" phase accordingly. Add phases "patch-build-scripts" and "adjust-pkg-config-files". (e2fsprogs, psm, mtd-utils, f2fs-tools, f2fs-tools-1.7, eudev, xfsprogs)[inputs]: Change to the "lib" output of UTIL-LINUX. (btrfs-progs)[inputs]: Remove duplicate UTIL-LINUX inputs and change to use the "lib" output. * gnu/packages/admin.scm (pam-mount)[inputs]: Add UTIL-LINUX:LIB. (testdisk)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/android.scm (abootimg)[inputs]: Likewise. * gnu/packages/audio.scm (jack-1)[propagated-inputs]: Likewise. * gnu/packages/bootloaders.scm (syslinux, vboot-utils)[inputs]: Likewise. * gnu/packages/chez.scm (chez-scheme)[inputs]: Likewise. * gnu/packages/cryptsetup.scm (cryptsetup, cryptsetup-static)[inputs]: Likewise. * gnu/packages/databases.scm (postgresql, 4store)[inputs]: Likewise. * gnu/packages/disk.scm (ndctl, gptfdisk, fdisk, gparted, rmlint, volume-key)[inputs]: Likewise. (parted)[inputs]: Likewise. [native-inputs]: Add UTIL-LINUX. * gnu/packages/efi.scm (sbsigntools)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/engineering.scm (lib3mf)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise. * gnu/packages/file-systems.scm (glusterfs, jfsutils, zfs)[inputs]: Likewise. * gnu/packages/firmware.scm (ovmf)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontconfig)[propagated-inputs]: Likewise. * gnu/packages/freedesktop.scm (localed)[inputs]: Likewise. * gnu/packages/glib.scm (glib, appstream-glib)[propagated-inputs]: Likewise. * gnu/packages/gnome.scm (tracker, gnome-terminal)[inputs]: Likewise. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/kde.scm (kpmcore)[inputs]: Likewise. * gnu/packages/kodi.scm (crossguid)[inputs]: Likewise. * gnu/packages/lighting.scm (ola)[inputs]: Likewise. * gnu/packages/music.scm (libgig)[inputs]: Likewise. * gnu/packages/nfs.scm (nfs-utils)[inputs]: Likewise. * gnu/packages/opencog.scm (opencog)[inputs]: Likewise. * gnu/packages/package-management.scm (msitools)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/password-utils.scm (pwsafe)[inputs]: Likewise. * gnu/packages/telephony.scm (pjproject)[propagated-inputs]: Likewise. * gnu/packages/rdf.scm (rasqal)[inputs]: Likewise. * gnu/packages/search.scm (xapian)[inputs]: Likewise. * gnu/packages/sssd.scm (sssd)[native-inputs]: Likewise. * gnu/packages/storage.scm (ceph)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/task-management.scm (taskwarrior)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/virtualization.scm (libvirt, xen)[inputs]: Likewise. * gnu/packages/xorg.scm (libsm)[inputs]: Likewise.
2 years ago
gnu: Remove ".git" from "https://github/…/….git". Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
1 year ago
  1. ;;; GNU Guix --- Functional package management for GNU
  2. ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
  3. ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
  4. ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
  5. ;;;
  6. ;;; This file is part of GNU Guix.
  7. ;;;
  8. ;;; GNU Guix is free software; you can redistribute it and/or modify it
  9. ;;; under the terms of the GNU General Public License as published by
  10. ;;; the Free Software Foundation; either version 3 of the License, or (at
  11. ;;; your option) any later version.
  12. ;;;
  13. ;;; GNU Guix is distributed in the hope that it will be useful, but
  14. ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
  15. ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  16. ;;; GNU General Public License for more details.
  17. ;;;
  18. ;;; You should have received a copy of the GNU General Public License
  19. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
  20. (define-module (gnu packages efi)
  21. #:use-module (gnu packages autotools)
  22. #:use-module (gnu packages bash)
  23. #:use-module (gnu packages linux)
  24. #:use-module (gnu packages man)
  25. #:use-module (gnu packages perl)
  26. #:use-module (gnu packages pkg-config)
  27. #:use-module (gnu packages tls)
  28. #:use-module ((guix licenses) #:prefix license:)
  29. #:use-module (guix build-system gnu)
  30. #:use-module (guix download)
  31. #:use-module (guix git-download)
  32. #:use-module (guix packages)
  33. #:use-module (guix utils)
  34. #:use-module (ice-9 match))
  35. (define-public gnu-efi
  36. (package
  37. (name "gnu-efi")
  38. (version "3.0.12")
  39. (source
  40. (origin
  41. (method url-fetch)
  42. (uri (string-append "mirror://sourceforge/gnu-efi/"
  43. "gnu-efi-" version ".tar.bz2"))
  44. (sha256
  45. (base32 "0sbn6am3k5lqafycggh1g964fcwjwnh0i9hhwrk4ncrwzphz55h1"))))
  46. (build-system gnu-build-system)
  47. (arguments
  48. `(#:tests? #f ; none exist
  49. #:make-flags
  50. (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
  51. #:phases
  52. (modify-phases %standard-phases
  53. (delete 'configure))))
  54. (synopsis "EFI toolchain")
  55. (description "This package provides an @acronym{EFI, Extensible Firmware
  56. Interface} toolchain for building programs that can run in the
  57. environment presented by Intel's EFI.")
  58. (home-page "https://directory.fsf.org/wiki/GNU_EFI")
  59. ;; Distribution is allowed only when accepting all those licenses.
  60. (license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat))))
  61. (define-public sbsigntools
  62. (package
  63. (name "sbsigntools")
  64. (version "0.9.4")
  65. (source
  66. (origin
  67. (method git-fetch)
  68. (uri
  69. (git-reference
  70. (url "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git")
  71. (commit (string-append "v" version))
  72. (recursive? #t)))
  73. (file-name (git-file-name name version))
  74. (sha256
  75. (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m"))))
  76. (build-system gnu-build-system)
  77. (arguments
  78. `(#:phases
  79. (modify-phases %standard-phases
  80. (add-after 'unpack 'patch-more-shebangs
  81. (lambda* (#:key inputs #:allow-other-keys)
  82. (substitute* "lib/ccan.git/tools/create-ccan-tree"
  83. (("#!/bin/bash")
  84. (string-append "#!"
  85. (assoc-ref inputs "bash")
  86. "/bin/bash")))
  87. #t))
  88. (add-after 'unpack 'patch
  89. (lambda* (#:key inputs outputs #:allow-other-keys)
  90. (substitute* '("configure.ac"
  91. "tests/Makefile.am")
  92. (("/usr/include/efi")
  93. (string-append (assoc-ref inputs "gnu-efi")
  94. "/include/efi"))
  95. (("/usr/lib/gnuefi")
  96. (string-append (assoc-ref inputs "gnu-efi")
  97. "/lib")))
  98. #t))
  99. (add-after 'unpack 'setenv
  100. (lambda _
  101. (setenv "CC" "gcc")
  102. #t)))))
  103. (native-inputs
  104. `(("autoconf" ,autoconf)
  105. ("automake" ,automake)
  106. ("bash" ,bash)
  107. ("help2man" ,help2man)
  108. ("pkg-config" ,pkg-config)
  109. ("util-linux" ,util-linux))) ; getopt
  110. (inputs
  111. `(("gnu-efi" ,gnu-efi)
  112. ("libuuid" ,util-linux "lib")
  113. ("openssl" ,openssl)))
  114. (synopsis "EFI signing tools")
  115. (description "This package provides tools for signing EFI binaries.")
  116. (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/")
  117. (license license:gpl3+)))
  118. (define-public efitools
  119. (package
  120. (name "efitools")
  121. (version "1.9.2")
  122. (source
  123. (origin
  124. (method git-fetch)
  125. (uri
  126. (git-reference
  127. (url "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git")
  128. (commit (string-append "v" version))))
  129. (file-name (git-file-name name version))
  130. (sha256
  131. (base32
  132. "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"))))
  133. (build-system gnu-build-system)
  134. (arguments
  135. `(#:tests? #f ; No tests exist.
  136. #:make-flags
  137. '("CC=gcc")
  138. #:phases
  139. (modify-phases %standard-phases
  140. (add-after 'unpack 'patch
  141. (lambda* (#:key inputs outputs #:allow-other-keys)
  142. (substitute* "Make.rules"
  143. (("/usr/include/efi")
  144. (string-append (assoc-ref inputs "gnu-efi")
  145. "/include/efi"))
  146. (("\\$\\(DESTDIR\\)/usr")
  147. (string-append (assoc-ref outputs "out")))
  148. (("/usr/lib/gnuefi")
  149. (string-append (assoc-ref inputs "gnu-efi")
  150. "/lib")))
  151. #t))
  152. (add-after 'unpack 'patch-more-shebangs
  153. (lambda* (#:key inputs #:allow-other-keys)
  154. (substitute* "xxdi.pl"
  155. (("#!.*")
  156. (string-append "#!"
  157. (assoc-ref inputs "perl")
  158. "/bin/perl\n")))
  159. #t))
  160. (delete 'configure))))
  161. (native-inputs
  162. `(("help2man" ,help2man)
  163. ("perl" ,perl)
  164. ("perl-file-slurp" ,perl-file-slurp)
  165. ("sbsigntools" ,sbsigntools)))
  166. (inputs
  167. `(("gnu-efi" ,gnu-efi)
  168. ("openssl" ,openssl)))
  169. (synopsis "EFI tools (key management, variable management)")
  170. (description "This package provides EFI tools for EFI key management
  171. and EFI variable management.")
  172. (home-page "https://blog.hansenpartnership.com/efitools-1-4-with-linux-key-manipulation-utilities-released/")
  173. ;; Programs are under GPL 2.
  174. ;; Library routines (in lib/) are under LGPL 2.1.
  175. ;; Compiling/linking/using OpenSSL is permitted.
  176. (license (list license:gpl2
  177. license:lgpl2.1))))
  178. (define-public efilinux
  179. (package
  180. (name "efilinux")
  181. (version "1.1")
  182. (source (origin
  183. (method git-fetch)
  184. (uri (git-reference
  185. (url "https://github.com/mfleming/efilinux")
  186. (commit (string-append "efilinux-" version))))
  187. (file-name (git-file-name name version))
  188. (sha256
  189. (base32
  190. "0b4nxzr3wl5v4b52r79iw1arfgasz26xb38r2blw9v2qz2s1q9w2"))))
  191. (build-system gnu-build-system)
  192. (arguments
  193. `(#:make-flags
  194. (list "CC=gcc"
  195. ,@(match (%current-system)
  196. ("aarch64-linux"
  197. '("ARCH=aarch64"))
  198. ("armhf-linux"
  199. '("ARCH=arm"))
  200. (_ '()))
  201. (string-append "INCDIR=" (assoc-ref %build-inputs "gnu-efi")
  202. "/include")
  203. (string-append "LIBDIR=" (assoc-ref %build-inputs "gnu-efi")
  204. "/lib"))
  205. #:tests? #f ; No tests exist.
  206. #:phases
  207. (modify-phases %standard-phases
  208. (delete 'configure)
  209. (replace 'install
  210. (lambda* (#:key outputs #:allow-other-keys)
  211. (install-file "efilinux.efi"
  212. (string-append (assoc-ref outputs "out")
  213. "/libexec"))
  214. #t)))))
  215. (inputs
  216. `(("gnu-efi" ,gnu-efi)))
  217. (synopsis "Minimal Linux loader for UEFI")
  218. (description "This package provides a minimal Linux loader as an UEFI
  219. program.")
  220. (home-page "https://github.com/mfleming/efilinux")
  221. (license license:bsd-2)))