From 058766ec7aee9373346c28497af1875da82aa991 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Dec 2021 01:34:00 +0100 Subject: [PATCH] gnu: corefreq: Stop using %OUTPUTS. * gnu/packages/linux.scm (corefreq)[arguments]: Use Gexps to remove use of %OUTPUTS. --- gnu/packages/linux.scm | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1e39d3d078..c752df7996 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1237,44 +1237,44 @@ (define-public corefreq (build-system linux-module-build-system) (outputs (list "out" "linux-module")) (arguments - `(#:imported-modules ((guix build gnu-build-system) - ,@%linux-module-build-system-modules) - #:modules ((guix build linux-module-build-system) - ((guix build gnu-build-system) #:prefix gnu:) - (guix build utils)) - #:make-flags - (list (string-append "CC=" ,(cc-for-target)) - "OPTIM_LVL=3" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:tests? #f ; no test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'untangle-module-targets - ;; Having to build everything in one pass would complicate the - ;; definition. Let each build system handle what it's good at. - (lambda _ - (substitute* "Makefile" - ((".*MAKE.*KERNELDIR.*") "")))) - (add-after 'build 'gnu:build - (assoc-ref gnu:%standard-phases 'build)) - (add-after 'install 'gnu:install - (assoc-ref gnu:%standard-phases 'install)) - (add-after 'install 'separate-module - (lambda* (#:key outputs #:allow-other-keys) - ;; Adding INSTALL_MOD_PATH= to #:make-flags would still create an - ;; empty /lib/modules directory, so just do it all by hand. - (let* ((out (assoc-ref outputs "out")) - (module (assoc-ref outputs "linux-module"))) - (mkdir-p (string-append module "/lib")) - (rename-file (string-append out "/lib/modules") - (string-append module "/lib/modules"))))) - (add-after 'install 'install-README - ;; There is no proper documentation. Provide something. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" - ,name "-" ,version))) - (install-file "README.md" doc))))))) + (list #:imported-modules `((guix build gnu-build-system) + ,@%linux-module-build-system-modules) + #:modules `((guix build linux-module-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + "OPTIM_LVL=3" + (string-append "PREFIX=" #$output)) + #:tests? #f ; no test suite + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'untangle-module-targets + ;; Having to build everything in one pass would complicate the + ;; definition. Let each build system handle what it's good at. + (lambda _ + (substitute* "Makefile" + ((".*MAKE.*KERNELDIR.*") "")))) + (add-after 'build 'gnu:build + (assoc-ref gnu:%standard-phases 'build)) + (add-after 'install 'gnu:install + (assoc-ref gnu:%standard-phases 'install)) + (add-after 'install 'separate-module + (lambda* (#:key outputs #:allow-other-keys) + ;; Adding INSTALL_MOD_PATH= to #:make-flags would still create an + ;; empty /lib/modules directory, so just do it all by hand. + (let* ((out (assoc-ref outputs "out")) + (module (assoc-ref outputs "linux-module"))) + (mkdir-p (string-append module "/lib")) + (rename-file (string-append out "/lib/modules") + (string-append module "/lib/modules"))))) + (add-after 'install 'install-README + ;; There is no proper documentation. Provide something. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" + #$name "-" #$version))) + (install-file "README.md" doc))))))) (home-page "https://github.com/cyring/CoreFreq") (synopsis "Measure performance data & tweak low-level settings on x86-64 CPUs")