diff options
author | David Craven <david@craven.ch> | 2016-09-02 15:57:47 +0200 |
---|---|---|
committer | David Craven <david@craven.ch> | 2016-09-13 16:45:41 +0200 |
commit | 614d1738e27a5a08b4d553861253d6636e431a25 (patch) | |
tree | 357845623b7f6980e7bd79ba263340fa916937f6 /gnu/packages/linux.scm | |
parent | 885009c5b91dde9891afcac501f12b7c76389900 (diff) | |
download | guix-patches-614d1738e27a5a08b4d553861253d6636e431a25.tar guix-patches-614d1738e27a5a08b4d553861253d6636e431a25.tar.gz |
gnu: linux-libre: Use modify-phases.
* gnu/packages/linux.scm (linux-libre): Use modify-phases.
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b8b30d248b..4a3e1dc013 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -258,9 +258,41 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (search-path %load-path file))) (define-public linux-libre - (let* ((version "4.7.3") - (build-phase - '(lambda* (#:key system inputs #:allow-other-keys #:rest args) + (package + (name "linux-libre") + (version "4.7.3") + (source (origin + (method url-fetch) + (uri (linux-libre-urls version)) + (sha256 + (base32 + "18sy1vh4x66hsk0qbq8g5299my082d530zm8c7xnbakq7350igi6")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux" "i686-linux")) + (native-inputs + `(("perl" ,perl) + ("bc" ,bc) + ("openssl" ,openssl) + ("module-init-tools" ,module-init-tools) + ("patch/freedo+gnu" ,%boot-logo-patch) + + ,@(let ((conf (kernel-config + (or (%current-target-system) + (%current-system)) + #:variant (version-major+minor version)))) + (if conf + `(("kconfig" ,conf)) + '())))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1) + (ice-9 match)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) @@ -310,8 +342,8 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." ;; Call the default `build' phase so `-j' is correctly ;; passed. (apply build #:make-flags "all" args)))) - (install-phase - `(lambda* (#:key inputs outputs #:allow-other-keys) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (moddir (string-append out "/lib/modules")) (mit (assoc-ref inputs "module-init-tools"))) @@ -328,47 +360,13 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (string-append "INSTALL_MOD_PATH=" out) "INSTALL_MOD_STRIP=1" "modules_install")))))) - (package - (name "linux-libre") - (version version) - (source (origin - (method url-fetch) - (uri (linux-libre-urls version)) - (sha256 - (base32 - "18sy1vh4x66hsk0qbq8g5299my082d530zm8c7xnbakq7350igi6")))) - (build-system gnu-build-system) - (supported-systems '("x86_64-linux" "i686-linux")) - (native-inputs `(("perl" ,perl) - ("bc" ,bc) - ("openssl" ,openssl) - ("module-init-tools" ,module-init-tools) - ("patch/freedo+gnu" ,%boot-logo-patch) - - ,@(let ((conf (kernel-config - (or (%current-target-system) - (%current-system)) - #:variant (version-major+minor version)))) - (if conf - `(("kconfig" ,conf)) - '())))) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1) - (ice-9 match)) - #:phases (alist-replace - 'build ,build-phase - (alist-replace - 'install ,install-phase - (alist-delete 'configure %standard-phases))) #:tests? #f)) + (home-page "http://www.gnu.org/software/linux-libre/") (synopsis "100% free redistribution of a cleaned Linux kernel") (description "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. It has been modified to remove all non-free binary blobs.") - (license license:gpl2) - (home-page "http://www.gnu.org/software/linux-libre/")))) + (license license:gpl2))) (define-public linux-libre-4.4 (package |