From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdVS-0000WM-3t for guix-patches@gnu.org; Thu, 28 Jun 2018 16:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdVO-00048f-SH for guix-patches@gnu.org; Thu, 28 Jun 2018 16:27:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdVO-00047U-Cw for guix-patches@gnu.org; Thu, 28 Jun 2018 16:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fYdVN-0003n2-WD for guix-patches@gnu.org; Thu, 28 Jun 2018 16:27:02 -0400 Subject: [bug#31997] [PATCH] gnu: linux-libre*: Add Keyed Interface and redefine variants to use new Interface. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYcuy-0007ZV-9Q for guix-patches@gnu.org; Thu, 28 Jun 2018 15:49:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYcuv-0008Bs-2k for guix-patches@gnu.org; Thu, 28 Jun 2018 15:49:24 -0400 Received: from us2-ob2-3.mailhostbox.com ([208.91.199.209]:50628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fYcuu-00088B-HF for guix-patches@gnu.org; Thu, 28 Jun 2018 15:49:21 -0400 Received: from 172.16.214.18 (unknown [172.16.214.18]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: professordey@liberum.world) by us2.outbound.mailhostbox.com (Postfix) with ESMTPSA id 8A9077820D2 for ; Thu, 28 Jun 2018 19:49:18 +0000 (GMT) Date: Thu, 28 Jun 2018 19:49:18 +0000 (GMT) From: Joshua Lewis Hayes Message-ID: <381089070.2034.1530215358490@webmail.liberum.world> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2032_915431938.1530215358456" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Joshua Lewis Hayes Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31997@debbugs.gnu.org ------=_Part_2032_915431938.1530215358456 Content-Type: multipart/alternative; boundary="----=_Part_2033_1091734858.1530215358459" ------=_Part_2033_1091734858.1530215358459 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Though make-linux-libre provides a keyed interface for configuration and versioning, it remains unaccessable to users due to a lack of public definition. This adapts linux-libre to become a public keyed interface for greater flexibility for users, without promoting proprietary software. Also redefin= es linux-libre- variants to use linux-libre as the interface being used, to reduce direct reliance on the low-level make-linux-libre function. >From 91dcc98640b5e7eb494893100f6ebae823a6cb58 Mon Sep 17 00:00:00 2001 From: Joshua Lewis Hayes Date: Thu, 28 Jun 2018 20:01:47 +0000 Subject: [PATCH] gnu: linux-libre*: Add Keyed Interface and redefine varian= ts to use new Interface. * gnu/packages/linux.scm (linux-libre): Add Keyed Interface * gnu/packages/linux.scm (linux-libre-*): Redefine to use Interface --- gnu/packages/linux.scm | 89 ++++++++++++++++++++++++++---------------------= --- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 50f90e165..74292288f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,6 +28,7 @@ ;;; Copyright =C2=A9 2017 nee ;;; Copyright =C2=A9 2017 Dave Love ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby +;;; Copyright =C2=A9 2018 Joshua Lewis Hayes ;;; ;;; This file is part of GNU Guix. ;;; @@ -405,66 +406,70 @@ It has been modified to remove all non-free binary bl= obs.") (define %linux-libre-version "4.17.3") (define %linux-libre-hash "06mjbs3i0xq1h1cgr6xldr6a8rxsy30mf86wp3n2ff6l5v7= 8iw2q") -(define-public linux-libre - (make-linux-libre %linux-libre-version - %linux-libre-hash - %linux-compatible-systems - #:configuration-file kernel-config)) - (define %linux-libre-4.14-version "4.14.52") (define %linux-libre-4.14-hash "0lx916iw33n32h1fca59r7mh6l2smyml6igvzhimca= h62hqx4rk8") +(define-public (linux-libre #:key + (version %linux-libre-version) + (hash %linux-libre-hash) + (systems %linux-compatible-systems) + (configuration-file kernel-config) + (defconfig "defconfig") + (extra-version #f) + (extra-options %extra-options) + (patches (list %boot-logo-patch))) + (make-linux-libre version + hash + systems + #:configuration-file configuration-file + #:defconfig defconfig + #:extra-version extra-version + #:extra-options extra-options + #:patches patches)) + (define-public linux-libre-4.14 - (make-linux-libre %linux-libre-4.14-version - %linux-libre-4.14-hash - '("x86_64-linux" "i686-linux" "armhf-linux") - #:configuration-file kernel-config)) + (linux-libre #:version %linux-libre-4.14-version + #:hash %linux-libre-4.14-hash + #:systems '("x86_64-linux" "i686-linux" "armhf-linux"))) (define-public linux-libre-4.9 - (make-linux-libre "4.9.110" - "0nzfna9w9a45y521d3dcxkdv66gn38n4pq814rdqazk74qb5macn" - %intel-compatible-systems - #:configuration-file kernel-config)) + (linux-libre #:version "4.9.110" + #:hash "0nzfna9w9a45y521d3dcxkdv66gn38n4pq814rdqazk74qb5macn" + #:systems %intel-compatible-systems)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.138" - "1030ra5gn24qmx8lsnhr6kfnfm60avzs23r81dl7mvzr5dci8vsl" - %intel-compatible-systems - #:configuration-file kernel-config)) + (linux-libre #:version "4.4.138" + #:hash "1030ra5gn24qmx8lsnhr6kfnfm60avzs23r81dl7mvzr5dci8vsl" + #:systems %intel-compatible-systems)) (define-public linux-libre-4.1 - (make-linux-libre "4.1.52" - "0a2flzf79kz9c1y9zpxdclsfivp38d2sgnwifg4gvyqixdy63sk9" - %intel-compatible-systems - #:configuration-file kernel-config)) + (linux-libre #:version "4.1.52" + #:hash "0a2flzf79kz9c1y9zpxdclsfivp38d2sgnwifg4gvyqixdy63sk9" + #:systems %intel-compatible-systems)) (define-public linux-libre-arm-generic - (make-linux-libre %linux-libre-version - %linux-libre-hash - '("armhf-linux") - #:defconfig "multi_v7_defconfig" - #:extra-version "arm-generic")) + (linux-libre #:systems '("armhf-linux") + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic")) (define-public linux-libre-arm-generic-4.14 - (make-linux-libre %linux-libre-4.14-version - %linux-libre-4.14-hash - '("armhf-linux") - #:defconfig "multi_v7_defconfig" - #:extra-version "arm-generic")) + (linux-libre #:version %linux-libre-4.14-version + #:hash %linux-libre-4.14-hash + #:systems '("armhf-linux") + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic")) (define-public linux-libre-arm-omap2plus - (make-linux-libre %linux-libre-version - %linux-libre-hash - '("armhf-linux") - #:defconfig "omap2plus_defconfig" - #:extra-version "arm-omap2plus")) + (linux-libre #:systems '("armhf-linux") + #:defconfig "omap2plus_defconfig" + #:extra-version "arm-omap2plus")) (define-public linux-libre-arm-omap2plus-4.14 - (make-linux-libre %linux-libre-4.14-version - %linux-libre-4.14-hash - '("armhf-linux") - #:defconfig "omap2plus_defconfig" - #:extra-version "arm-omap2plus")) + (linux-libre #:version %linux-libre-4.14-version + #:hash %linux-libre-4.14-hash + #:systems '("armhf-linux") + #:defconfig "omap2plus_defconfig" + #:extra-version "arm-omap2plus")) ^L ;;; -- 2.16.1 ------=_Part_2033_1091734858.1530215358459 MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Though make-linux-libre provides a keyed interface for configuration = and
versioning, it remains unaccessable to users due to a lack of public
de= finition.

This adapts linux-libre to become a public keyed interface for= greater
flexibility for users, without promoting proprietary software. Als= o redefines
linux-libre-<version/arch> variants to use linux-libre = as the interface
being used, to reduce direct reliance on the low-level mak= e-linux-libre
function.

From 91dcc98640b5e7eb494893100f6ebae823a6cb58 Mo= n Sep 17 00:00:00 2001
From: Joshua Lewis Hayes <professordey@liberum.w= orld>
Date: Thu, 28 Jun 2018 20:01:47 +0000
Subject: [PATCH] gnu: linux= -libre*: Add Keyed Interface and redefine variants
to use new Interface.

* gnu/package= s/linux.scm (linux-libre-*): Redefine to use Interface

---
gnu/packages= /linux.scm | 89 ++++++++++++++++++++++++++------------------------ 1 file = changed, 47 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/lin= ux.scm b/gnu/packages/linux.scm
index 50f90e165..74292288f 100644--- a/gnu= /packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -28,6 +28,7 @@ ;;; Cop= yright =C2=A9 2017 nee <nee-git@hidamari.blue>
;;; Copyright =C2= =A9 2017 Dave Love <fx@gnu.org>
;;; Copyright =C2=A9 2018 Pierre-A= ntoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright =C2=A9= 2018 Joshua Lewis Hayes <professordey@liberum.world>
;;; ;;; Thi= s file is part of GNU Guix.
;;;
@@ -405,66 +406,70 @@ It has been modified= to remove all non-free binary blobs.")
 (define %linux-libre-vers= ion "4.17.3")
 (define %linux-libre-hash "06mjbs3i0xq1h1cg= r6xldr6a8rxsy30mf86wp3n2ff6l5v78iw2q")

-(define-public linux-libre
-= (make-linux-libre %linux-libre-version
- %linux-libre-hash
- %linux-compat= ible-systems
- #:configuration-file kernel-config))
-
 (define %linu= x-libre-4.14-version "4.14.52")
 (define %linux-libre-4.14-has= h "0lx916iw33n32h1fca59r7mh6l2smyml6igvzhimcah62hqx4rk8")

+(defi= ne-public (linux-libre #:key
+ (version %linux-libre-version)
+ (hash %linu= x-libre-hash)
+ (systems %linux-compatible-systems)
+ (configuration-file= kernel-config)
+ (defconfig "defconfig")
+ (extra-version #f)
+ (e= xtra-options %extra-options)
+ (patches (list %boot-logo-patch)))+ (make-l= inux-libre version
+ hash
+ systems
+ #:configuration-file configuration-fi= le
+ #:defconfig defconfig
+ #:extra-version extra-version
+ #:extra-option= s extra-options
+ #:patches patches))
+
 (define-public linux-libre-4.= 14
- (make-linux-libre %linux-libre-4.14-version
- %linux-libre-4.14-hash
-= '("x86_64-linux" "i686-linux" "armhf-linux")
-= #:configuration-file kernel-config))
+ (linux-libre #:version %linux-libre= -4.14-version
+ #:hash %linux-libre-4.14-hash
+ #:systems '("x86_64= -linux" "i686-linux" "armhf-linux")))

 (define-= public linux-libre-4.9
- (make-linux-libre "4.9.110"
- "0nzfna9= w9a45y521d3dcxkdv66gn38n4pq814rdqazk74qb5macn"
- %intel-compatible-syst= ems
- #:configuration-file kernel-config))
+ (linux-libre #:version "4.= 9.110"
+ #:hash "0nzfna9w9a45y521d3dcxkdv66gn38n4pq814rdqazk74qb5ma= cn"
+ #:systems %intel-compatible-systems))

 (define-public lin= ux-libre-4.4
- (make-linux-libre "4.4.138"
- "1030ra5gn24qmx8ls= nhr6kfnfm60avzs23r81dl7mvzr5dci8vsl"
- %intel-compatible-systems=
- #:co= nfiguration-file kernel-config))
+ (linux-libre #:version "4.4.138"=
+ #:hash "1030ra5gn24qmx8lsnhr6kfnfm60avzs23r81dl7mvzr5dci8vsl"
+ = #:systems %intel-compatible-systems))

 (define-public linux-libre-4= .1
- (make-linux-libre "4.1.52"
- "0a2flzf79kz9c1y9zpxdclsfivp3= 8d2sgnwifg4gvyqixdy63sk9"
- %intel-compatible-systems
- #:configuration= -file kernel-config))
+ (linux-libre #:version "4.1.52"
<= span style=3D"font-family: "andale mono", monospace;">+ #:hash &#= 34;0a2flzf79kz9c1y9zpxdclsfivp38d2sgnwifg4gvyqixdy63sk9"
+ #:systems %i= ntel-compatible-systems))

 (define-public linux-libre-arm-generic

- (make-linux-libre %linux-libre-version
- %linux-libre-hash- '(= "armhf-linux")
- #:defconfig "multi_v7_defconfig"- #:extra= -version "arm-generic"))
+ (linux-libre #:systems '("armhf-= linux")
+ #:defconfig "multi_v7_defconfig"
+ #:extra-version &#= 34;arm-generic"))

 (define-public linux-libre-arm-generic-4.14<= /span>
= - (make-linux-libre %linux-libre-4.14-version
- %linux-libre-4.14-hash
- &#= 39;("armhf-linux")
- #:defconfig "multi_v7_defconfig"
- #:e= xtra-version "arm-generic"))
+ (linux-libre #:version %linux-libre-= 4.14-version
+ #:hash %linux-libre-4.14-hash
+ #:systems '("armhf-l= inux")
+ #:defconfig "multi_v7_defconfig"
+ #:extra-version = 4;arm-generic"))

 (define-public linux-libre-arm-omap2plus
- (m= ake-linux-libre %linux-libre-version
- %linux-libre-hash
- '("armhf= -linux")
- #:defconfig "omap2plus_defconfig"
- #:extra-version = "arm-omap2plus"))
+ (linux-libre #:systems '("armhf-linux&#= 34;)
+ #:defconfig "omap2plus_defconfig"
+ #:extra-version "arm= -omap2plus"))

 (define-public linux-libre-arm-omap2plus-4.14
- = (make-linux-libre %linux-libre-4.14-version
- %linux-libre-4.14-hash=
- '= ;("armhf-linux")
- #:defconfig "omap2plus_defconfig"=
- #:ex= tra-version "arm-omap2plus"))
+ (linux-libre #:version %linux-libre= -4.14-version
+ #:hash %linux-libre-4.14-hash
+ #:systems '("armhf-= linux")
+ #:defconfig "omap2plus_defconfig"
+ #:extra-version &= #34;arm-omap2plus"))

^L
;;;
--
2.16.1

=20 ------=_Part_2033_1091734858.1530215358459-- ------=_Part_2032_915431938.1530215358456 Content-Type: text/plain; charset=ISO-8859-1; name=signature.asc Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=signature.asc X-Part-Id: bf2fb2d0e73c4bc8a3c454bb47df8ba1 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogS2V5YmFzZSBPcGVuUEdQIHYy LjAuNzcKQ29tbWVudDogaHR0cHM6Ly9rZXliYXNlLmlvL2NyeXB0bwoKd3NCY0JBQUJDZ0FHQlFK Yk5VaHpBQW9KRU52TmUxT0s5M284b1NNSUFJS3RPTENGQmFJZEE0Q0pjTmlSWEF5VQprVDAxUmk5 TkxXQmxYUVZ1WWg2MDFVbk9WWlIxK2xQRWF1K0NKVWFTRTFadjc5cjZ6K1NieVRzaHlRaU14RkR6 ClN0UzVtRkZURExHbUgrOWQ0Vkx2WWxhRGJQV0lKc0JZclVBTEVIMFBHQVNMRVBTNG5Pb0lNS1RI cU52eG1DcmkKSSsxejBRTTA5TXVwOG1XVmRPdHJXYVJ0OXFqSzZBaE9SemF2K2JKWEtPMHhXQVJX TTgyclozb3E2Q1R0aXA0RwpuZVdlNmxRdkpRQU0zaVQ4em5vSTk3UFJZcGlBODlIaFpGaWFxQWVM SHpzSnhONzIrMVpNYWo4QWo3Q2ZkaUgzCnpqd0psVUg1azJCUUwvRUpaOEtwZmo4L2hwYVNiUFI5 RlJzMVJnUmdrcm5QYmNXdnd1V1J0TmtpZ08wTnNuMD0KPXd5M2MKLS0tLS1FTkQgUEdQIFNJR05B VFVSRS0tLS0tCg== ------=_Part_2032_915431938.1530215358456--