From patchwork Sun Aug 4 03:13:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 2736 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 50CA527BBE9; Sun, 4 Aug 2024 04:17:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 E6C0427BBE2 for ; Sun, 4 Aug 2024 04:17:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saRk7-0003pe-Hq; Sat, 03 Aug 2024 23:17:12 -0400 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 1saRjj-0003kS-Oo for guix-patches@gnu.org; Sat, 03 Aug 2024 23:16:50 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1saRjj-0002Qi-Es; Sat, 03 Aug 2024 23:16:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=5DMU2Wey0+sNbPoUh9Bv9XtRs33RAoCMg2+hf5S4ULM=; b=iVvfy0B1kOS6dS3P6HBtY9X2iolwkkEDw4jtqpZUn8UD0givotz3Ns6J/ay0crYGuB78i8p6EPHhoG2POzctULtxuorBUkvN8KAKmiGypjSpxQfnaQrFFBxHfiwvu9iE0vWKDX71oxsKow4AIwNeJLqpWUl2OUKxVypTHa1VLxLMqTkgf9tIxSjO4KGZdKoO8qqVj9Za5KhzPGhjn8L6M1BZr8eJMo1ykegSr6t75smLYBwiPs5PeuDwsumN5nb0vrpKat0f6q0Jr1SYo2mPPD8e7+Okk8kakRDjriKEtqjlMB22TWGx94PBTtUxfPaa/fEQQuTpp7r/rnWq9qA8VQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saRjy-0007mo-GE; Sat, 03 Aug 2024 23:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v3 00/12] Simplify bootloader data structures and procedures References: In-Reply-To: Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 03:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69343@debbugs.gnu.org Cc: Lilah Tascheter , Christopher Baines , Josselin Poiret , Ludovic Court??s , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic Court??s , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.172274136729610 (code B ref 69343); Sun, 04 Aug 2024 03:17:02 +0000 Received: (at 69343) by debbugs.gnu.org; 4 Aug 2024 03:16:07 +0000 Received: from localhost ([127.0.0.1]:54980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRj5-0007hU-7p for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:07 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:56492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRj3-0007gd-43 for 69343@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:06 -0400 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=kDNDltF1UvZ9HnuKf5NipDmrpSWF6i0osX/NzZcdjAm2qZmnbbmkaIVhS96hJfZ9izeFzUTGjCgoaiJNguKks1gvK7Q1BSbaOl+mB5dxKPigxJw1P2u4FBfzyx7mPDPGWzXwOx39NSxw1ptqi0zgmZXUb9NS14TNB4IWw19snxbmpA1m0mci8ybiV2SVyKPdN19WnuYPD4Jy63xDCefwfwP2ooE/gpRAVLkGf3vdSzaJWzYXaQejUX8emfGPKe8VRf5r4zceO7V9qxKdEGjvgy5xCbfCDcVLei10bi3RgtWvhyZRbI6WUhAeVUsLp4f1eUt81ENnGcNuyttaEqi6fg==; s=purelymail2; d=lunabee.space; v=1; bh=5uTVr6x+b9Lqb5s/g9XGLGDnzwnHw/FafC3zZt5ibcE=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=jlLiwJ406gSVpj62KH48ptH51J6joNZPC5dl6Y8OFu+RmO2B+zIdGY97Rula+TQlScJyLqKcUzrUaurQCFfZ5F8nvCIfT/2sTVlwvAOWtVxm+vgK+GtzOo+HfEvHfKOILhm57l2Z15h1UevqhGUjpDqpdcqr2lO+N1PQF8FZR1IO9HvGx+fN6pE6fpmOdcJtBWGW3S4nYZ797Moi7rSj49cwOj/Y0G6OiVQgFcTR/juNfKg7SK4tT3O6f4fcK4IB6/SUel1UgykooO6Pu/TjuNN4URrQP1mDuCdneBelaBQPqjsMDdROT82TnJdOz1eL58jykgThDrxEAU8e3YWKgA==; s=purelymail2; d=purelymail.com; v=1; bh=5uTVr6x+b9Lqb5s/g9XGLGDnzwnHw/FafC3zZt5ibcE=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 69343@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -2124817350; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 03:15:34 +0000 (UTC) Date: Sat, 3 Aug 2024 22:13:22 -0500 Message-ID: MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail 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: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter 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 Two small changes here: add gnu/system/boot.scm to gnu/local.mk, and one other small fix. Kinda forgot what that second fix was, sorry. Felix Lechner (12): Fix bug where the extra menu entries for a bootloader were shown twice. Move record to a separate file. Also move boot-parameters->menu-entry. Rename seconds->string procedure to epoch->date-string. Move epoch->date-string to gnu/system/boot.scm and use it elsewhere. Offer a uniform decorated-boot-label and use it. Rename boot-parameters to boot-alternatives when appropriate. Rename two remote variables confusingly named 'generations'. Give a separate name to a commonly used expression. Simplify profile->boot-alternatives. Split generation->boot-parameters out of profile->boot-alternatives. Encapsulate to retain generation, system-path and epoch. gnu/local.mk | 1 + gnu/machine/ssh.scm | 77 ++++---- gnu/system.scm | 287 +---------------------------- gnu/system/boot.scm | 376 ++++++++++++++++++++++++++++++++++++++ guix/scripts/system.scm | 71 +++---- tests/boot-parameters.scm | 1 + 6 files changed, 453 insertions(+), 360 deletions(-) create mode 100644 gnu/system/boot.scm base-commit: f59c4126827af3d2041d49f1d0a8ce12b41470cf