From f42cf87395db05e103c959250bf45214e1ba46de Mon Sep 17 00:00:00 2001 From: Rutherther Date: Thu, 29 May 2025 18:55:22 +0200 Subject: [PATCH] feat: Move search-patch to standalone module --- modules/zynqmp/packages/bootloader.scm | 13 +---------- modules/zynqmp/patches.scm | 31 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 modules/zynqmp/patches.scm diff --git a/modules/zynqmp/packages/bootloader.scm b/modules/zynqmp/packages/bootloader.scm index 302944b01bfbc7e86b3ea93bb6a81b6b2c264f85..40979361e1a24e2f7832c05f73db2b96964d2fb2 100644 --- a/modules/zynqmp/packages/bootloader.scm +++ b/modules/zynqmp/packages/bootloader.scm @@ -1,4 +1,5 @@ (define-module (zynqmp packages bootloader) + #:use-module (zynqmp patches) #:use-module (zynqmp packages firmware) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -17,18 +18,6 @@ #:use-module (gnu packages firmware) #:export (u-boot-for-kr260)) -(define (search-patch patch) - (parameterize ((%patch-path (map - (lambda (directory) - (string-append directory "/zynqmp/packages/patches")) - %load-path))) - ((@ (gnu packages) search-patch) patch))) - -(define-syntax-rule (search-patches file-name ...) - "Return the list of absolute file names corresponding to each -FILE-NAME found in %PATCH-PATH." - (list (search-patch file-name) ...)) - ;; (define* (u-boot-for-kria #:configs configs)) (define u-boot-for-kr260 diff --git a/modules/zynqmp/patches.scm b/modules/zynqmp/patches.scm new file mode 100644 index 0000000000000000000000000000000000000000..2a92e98e8906e0077ac6617a6f93867a27bf0e85 --- /dev/null +++ b/modules/zynqmp/patches.scm @@ -0,0 +1,31 @@ +(define-module (zynqmp patches) + #:use-module (zynqmp packages firmware) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages tls) + #:use-module (gnu packages bootloaders) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages cross-base) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages firmware) + #:export (my-search-patch + my-search-patches)) + +(define (my-search-patch patch) + (parameterize ((%patch-path (map + (lambda (directory) + (string-append directory "/zynqmp/packages/patches")) + %load-path))) + ((@ (gnu packages) search-patch) patch))) + +(define-syntax-rule (my-search-patches file-name ...) + "Return the list of absolute file names corresponding to each +FILE-NAME found in %PATCH-PATH." + (list (my-search-patch file-name) ...))