[bug#61454] [PATCH 0/5] Expose upstream linux sources

[bug#61454] [PATCH 0/5] Expose upstream linux sources

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

Hey guix,

This patch series should not lead to any rebuilds.  The aim is to expose the
used linux upstream sources, for use by custom local packages or external
channels.

Two main concerns I still have:
* Is this fundamentally going to be an issue with the FSDG? 
* This is the 'dumb' solution; alternatively, I was thinking of introducing a
  record to unify all the moving parts (the upstream sources, the deblob
  scripts) involved in building our linux-libre kernels. That bigger change is
  ideally something we achieve consensus on before writing some code.


Jelle Licht (5):
  gnu: linux-libre 4.14: Expose upstream sources.
  gnu: linux-libre 4.19: Expose upstream sources.
  gnu: linux-libre 5.10: Expose upstream sources.
  gnu: linux-libre 5.15: Expose upstream sources.
  gnu: linux-libre 6.1: Expose upstream sources.

 gnu/packages/linux.scm | 47 ++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 20 deletions(-)


base-commit: fb9799ff5f1d90a443dc197535c48041ad6b3865
-- 
2.39.1

[bug#61454] [PATCH 1/5] gnu: linux-libre 4.14: Expose upstream sources.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/linux.scm (linux-libre-4.14-pristine-source): Re-use extracted
upstream sources from ...
(linux-4.14-source): ... new variable.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4130cdb4ed..b0e1f212fd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -567,12 +567,13 @@ (define deblob-scripts-4.14
    linux-libre-4.14-gnu-revision
    (base32 "02rxvr0gmxb3zfsyyzdmzgfq04gkdkv1cc38md0xfl0mxzdzdfyk")
    (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
-(define-public linux-libre-4.14-pristine-source
+(define-public linux-4.14-source
   (let ((version linux-libre-4.14-version)
         (hash (base32 "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3")))
-    (make-linux-libre-source version
-                             (%upstream-linux-source version hash)
-                             deblob-scripts-4.14)))
+    (%upstream-linux-source version hash)))
+(define-public linux-libre-4.14-pristine-source
+  (let ((version linux-libre-4.14-version))
+    (make-linux-libre-source version linux-4.14-source deblob-scripts-4.14)))
 
 (define %boot-logo-patch
   ;; Linux-Libre boot logo featuring Freedo and a gnu.
-- 
2.39.1

[bug#61454] [PATCH 2/5] gnu: linux-libre 4.19: Expose upstream sources.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/linux.scm (linux-libre-4.19-pristine-source): Re-use extracted
upstream sources from ...
(linux-4.19-source): ... new variable.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b0e1f212fd..ff59084ed2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -552,12 +552,13 @@ (define deblob-scripts-4.19
    linux-libre-4.19-gnu-revision
    (base32 "06pqv050bkii0hc2v7ymny5264w1bca8db0dp1pw9mfmjg865am5")
    (base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99")))
-(define-public linux-libre-4.19-pristine-source
+(define-public linux-4.19-source
   (let ((version linux-libre-4.19-version)
         (hash (base32 "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8")))
-    (make-linux-libre-source version
-                             (%upstream-linux-source version hash)
-                             deblob-scripts-4.19)))
+    (%upstream-linux-source version hash)))
+(define-public linux-libre-4.19-pristine-source
+  (let ((version linux-libre-4.19-version))
+    (make-linux-libre-source version linux-4.19-source deblob-scripts-4.19)))
 
 (define-public linux-libre-4.14-version "4.14.305")
 (define-public linux-libre-4.14-gnu-revision "gnu1")
-- 
2.39.1

[bug#61454] [PATCH 3/5] gnu: linux-libre 5.10: Expose upstream sources.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/linux.scm (linux-libre-5.10-pristine-source): Re-use extracted
upstream sources from ...
(linux-5.10-source): ... new variable.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ff59084ed2..0a5411f98a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -522,12 +522,13 @@ (define deblob-scripts-5.10
    linux-libre-5.10-gnu-revision
    (base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf")
    (base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap")))
-(define-public linux-libre-5.10-pristine-source
+(define-public linux-5.10-source
   (let ((version linux-libre-5.10-version)
         (hash (base32 "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq")))
-   (make-linux-libre-source version
-                            (%upstream-linux-source version hash)
-                            deblob-scripts-5.10)))
+    (%upstream-linux-source version hash)))
+(define-public linux-libre-5.10-pristine-source
+  (let ((version linux-libre-5.10-version))
+   (make-linux-libre-source version linux-5.10-source deblob-scripts-5.10)))
 
 (define-public linux-libre-5.4-version "5.4.231")
 (define-public linux-libre-5.4-gnu-revision "gnu1")
-- 
2.39.1

[bug#61454] [PATCH 4/5] gnu: linux-libre 5.15: Expose upstream sources.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/linux.scm (linux-libre-5.15-pristine-source): Re-use extracted
upstream sources from ...
(linux-5.15-source): ... new variable.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0a5411f98a..a9d51c8f24 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -507,12 +507,13 @@ (define deblob-scripts-5.15
    linux-libre-5.15-gnu-revision
    (base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg")
    (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f")))
-(define-public linux-libre-5.15-pristine-source
+(define-public linux-5.15-source
   (let ((version linux-libre-5.15-version)
         (hash (base32 "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz")))
-   (make-linux-libre-source version
-                            (%upstream-linux-source version hash)
-                            deblob-scripts-5.15)))
+    (%upstream-linux-source version hash)))
+(define-public linux-libre-5.15-pristine-source
+  (let ((version linux-libre-5.15-version))
+   (make-linux-libre-source version linux-5.15-source deblob-scripts-5.15)))
 
 (define-public linux-libre-5.10-version "5.10.167")
 (define-public linux-libre-5.10-gnu-revision "gnu1")
-- 
2.39.1

[bug#61454] [PATCH 5/5] gnu: linux-libre 6.1: Expose upstream sources.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/linux.scm (linux-libre-6.1-pristine-source): Re-use extracted
upstream sources from ...
(linux-6.1-source): ... new variable.
---
 gnu/packages/linux.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a9d51c8f24..27b11465d7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -489,12 +489,15 @@ (define deblob-scripts-6.1
    linux-libre-6.1-gnu-revision
    (base32 "0p1cg5khpp8xkfaqy0cnp1m273z3xiz0m97rkrkggz9gr2klrjym")
    (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3")))
-(define-public linux-libre-6.1-pristine-source
+
+(define-public linux-6.1-source
   (let ((version linux-libre-6.1-version)
         (hash (base32 "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb")))
-   (make-linux-libre-source version
-                            (%upstream-linux-source version hash)
-                            deblob-scripts-6.1)))
+    (%upstream-linux-source version hash)))
+
+(define-public linux-libre-6.1-pristine-source
+  (let ((version linux-libre-6.1-version))
+   (make-linux-libre-source version linux-6.1-source deblob-scripts-6.1)))
 
 ;; The "longterm" kernels — the older releases with long-term upstream support.
 ;; Here are the support timelines:
-- 
2.39.1

[bug#61454] [PATCH 0/5] Expose upstream linux sources

[Liliana Marie Prikler]

Am Sonntag, dem 12.02.2023 um 16:39 +0100 schrieb jlicht@fsfe.org:
> * Is this fundamentally going to be an issue with the FSDG?
A free system distribution must not steer users towards obtaining any
nonfree information for practical use, or encourage them to do so.


Cheers

[bug#61454] [PATCH 0/5] Expose upstream linux sources

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 630 bytes --]

Hi Jelle!

jlicht@fsfe.org 写道：
> * Is this fundamentally going to be an issue with the FSDG?

I can't think of a reading of the FSDG where it is not against 
both the letter and the spirit.

Guix already ventures close to the edge; this would push us clean 
over.

> * This is the 'dumb' solution; alternatively, I was thinking of 
> introducing a
>   record to unify all the moving parts (the upstream sources, 
>   the deblob
>   scripts) involved in building our linux-libre kernels.

I'm not sure this will suit your purposes any better without 
amounting to the same thing.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

bug#61454: [PATCH 0/5] Expose upstream linux sources

[Jelle Licht]

Hi Tobias,

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> Hi Jelle!
>
> jlicht@fsfe.org 写道：
>> * Is this fundamentally going to be an issue with the FSDG?
>
> I can't think of a reading of the FSDG where it is not against 
> both the letter and the spirit.
>
> Guix already ventures close to the edge; this would push us clean 
> over.

Fair enough. I'll go ahead and assume that any "workaround" using public
bindings exposed by guix can be considered a bug, later to be addressed
by guix in order to prevent similar situations.

>> * This is the 'dumb' solution; alternatively, I was thinking of 
>> introducing a
>>   record to unify all the moving parts (the upstream sources, 
>>   the deblob
>>   scripts) involved in building our linux-libre kernels.
>
> I'm not sure this will suit your purposes any better without 
> amounting to the same thing.

It does, so never mind!

Thanks for your input,
- Jelle