From patchwork Sun Feb 12 15:42:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 46882 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6531216648; Sun, 12 Feb 2023 15:43:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B970716630 for ; Sun, 12 Feb 2023 15:43:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pREVo-0004RR-V5; Sun, 12 Feb 2023 10:43:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pREVN-00046a-A8 for guix-patches@gnu.org; Sun, 12 Feb 2023 10:43:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pREVL-00047U-Vt for guix-patches@gnu.org; Sun, 12 Feb 2023 10:43:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pREVL-0008BV-Rq for guix-patches@gnu.org; Sun, 12 Feb 2023 10:43:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61454] [PATCH 5/5] gnu: linux-libre 6.1: Expose upstream sources. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 15:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61454@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 61454-submit@debbugs.gnu.org id=B61454.167621654531384 (code B ref 61454); Sun, 12 Feb 2023 15:43:03 +0000 Received: (at 61454) by debbugs.gnu.org; 12 Feb 2023 15:42:25 +0000 Received: from localhost ([127.0.0.1]:46474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pREUj-0008A3-BF for submit@debbugs.gnu.org; Sun, 12 Feb 2023 10:42:25 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:50068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pREUe-00089H-7f for 61454@debbugs.gnu.org; Sun, 12 Feb 2023 10:42:21 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1676216539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EFs1im2bZ8mhaJEJY54J/WlzCa1glClCcFQYOso4cgk=; b=atLqzpFgLg+etJW4/JbcoNvnwBXslFDAa1YOja/l5AsjoYNHiimd8ki2wDJmdqKeYN0eR4 KAtD0fvhPi0QfQuNzh9h2j9D8T2d4rP2fxjw456vCtqSOcMz0OCt6PSm5MxI9BobCyRhq9 HN3LBgaSeY2ae7tn/gTjSR8ZK6ARr7c= Date: Sun, 12 Feb 2023 16:42:15 +0100 Message-Id: <0ab4a299434d8ec0d2e7b5f3c2f89a33c3a43a93.1676213809.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * 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: