From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IFC4BGciq2O3FQEAbAwnHQ (envelope-from ) for ; Tue, 27 Dec 2022 17:50:47 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2PrcBGciq2M5TQAA9RJhRA (envelope-from ) for ; Tue, 27 Dec 2022 17:50:47 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DBE9A166F3 for ; Tue, 27 Dec 2022 17:50:46 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAD9q-0005jQ-74; Tue, 27 Dec 2022 11:50:30 -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 1pAD9T-0005hJ-RZ for guix-devel@gnu.org; Tue, 27 Dec 2022 11:50:12 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAD9R-0000WW-8G for guix-devel@gnu.org; Tue, 27 Dec 2022 11:50:07 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id DAD891AC5E; Tue, 27 Dec 2022 08:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1672159799; bh=wvSMemWFcqjVOxPv76f0hXDbnKuEWAtaVkqvHNZ2zPQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=OZbEBsQ4mDg4fwXE74XC2n+wxrdIkM/wi+4kN3Y5gjri9gBYv8JhO+YFh3epv1S2M T7BV3/0jjec2GPMHRpjNlwipKDNRY9z0GZdbzH9LsJOQE1Jk8ff/Ryds8Yiks5njSL nOqi3/wn03rDyrSBR2qsbLdJ2UCiyThDJJIGiAuMHGTQA0EwoCTX716g0kJqlUvr3b nSd7eQhpuVTREf+S5aXJ4UakbbCpB8kCcsDMEU54t6rEWmchu9p+zDfpl5pyRgsw+h Y674xp5+iJnGc/I2Bs+6MdqsAfAIItYlWyJGV2x7tUONiBZFG99pfHVJnZtqwrusdX BF9POD6BPPpUQ== From: Vagrant Cascadian To: Maxim Cournoyer Cc: guix-devel@gnu.org Subject: Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack In-Reply-To: <87h6xh8sus.fsf@gmail.com> References: <87len0y1kk.fsf@contorta> <87v8m3w2sa.fsf@gmail.com> <87fsd7ayif.fsf@contorta> <87h6xh8sus.fsf@gmail.com> Date: Tue, 27 Dec 2022 08:49:53 -0800 Message-ID: <87a638rdu6.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: none client-ip=173.255.214.101; envelope-from=vagrant@debian.org; helo=cascadia.aikidev.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672159846; a=rsa-sha256; cv=none; b=jqj2plIfw8RBSBkcSs2nPWrgugc0WWXqNNARYfir97YVKFHyujnfjjKpGDLhI+NnXgCf4A 5HHdmIMNB90erW3va14m3m52Hrt4i8eLSk2TqqfXBH51AB9EMI2B12t4Zmwsvndm2fj/rQ QmTfPwuFtiWJxm1BaJdwl8mqKeuKz/jUTH4bpohKwFn6MjSE2rTn9MkbhKINlcQ1POGHX2 j3YBZNxeGeSTqphi8/PP3u0Kd7glgN99LuQHnMxkW8yjH8Xn/qTBpZvHPGwL/RVQzIinie 523vg7DWtXU7AyiTfW8DC+kpor1FzyuWdhi1YCRpWmSldyMSSfVD66MfMF+XNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debian.org header.s=1.vagrant.user header.b=OZbEBsQ4; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672159846; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=i+hD+AhinBw9udlGUSgUz+MBcBTc89CO4NTvuQlK7nk=; b=DxFsbwiAw5k8PoH+vxD6XXx7D6lT+ulJ9X0bheOLg7UiiJUMOib4DaVEE4C5gDaGrUM47D lhVRjG1ZbzjS81E+0CcG6yTjDAOTyt3syPJetTRRgVO3OsKIXnGhigemfrBeiAw9RC7C6h KgNE+8XNmECcVnkWXBphBUeL/aJbbhxDRJlgsJmExJXGPSqP0ZZ+xePmjZh8woX/+R26gH 6JHfdbTXfI3oSADQXfR5RH/VB+oQ3NI4Wv/8LYTZRau0iqp8HYocnQooRfrjRmglzlZqeV WssL1+ur6wmsiPnmU7NiYHcJt5wr84Xa8omOGPVc2/WEq3eQlMNXIVDUb2I5NQ== X-Spam-Score: -9.00 X-Migadu-Queue-Id: DBE9A166F3 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debian.org header.s=1.vagrant.user header.b=OZbEBsQ4; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -9.00 X-TUID: +hUmKmOhAUwm --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2022-12-26, Maxim Cournoyer wrote: > Vagrant Cascadian writes: >> On 2022-12-22, Maxim Cournoyer wrote: >>> Vagrant Cascadian writes: >> I will take a guess that it was commit >> c2c1dfdf5760873f1db86d14873f725a105f7feb which removed the "name" bit: > > Oh, that explains it, thank you for digging a bit. > > The following should return us to the previous name, fixing that > regression: > > --8<---------------cut here---------------start------------->8--- > modified gnu/bootloader/u-boot.scm > @@ -144,7 +144,7 @@ (define u-boot-bootloader > (define u-boot-beaglebone-black-bootloader > (bootloader > (inherit u-boot-bootloader) > - (package u-boot-am335x-evm-boneblack) > + (package u-boot-am335x-boneblack) > (disk-image-installer install-beaglebone-black-u-boot))) >=20=20 > (define u-boot-allwinner-bootloader > modified gnu/packages/bootloaders.scm > @@ -890,17 +890,23 @@ (define*-public (make-u-boot-package board triplet > (define-public u-boot-malta > (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) >=20=20 > -(define-public u-boot-am335x-evm-boneblack > - (make-u-boot-package > - "am335x_evm" "arm-linux-gnueabihf" > - ;; Patch out other device trees to build an image small enough to fit > - ;; within typical partitioning schemes where the first partition begi= ns at > - ;; sector 2048. > - #:configs '("CONFIG_OF_LIST=3D\"am335x-evm am335x-boneblack\"") > - #:name-suffix "-boneblack" > - #:append-description "This U-Boot is built for the BeagleBone Black, = which > -was removed upstream, adjusted from the am335x_evm build with several de= vice > -trees removed so that it fits within common partitioning schemes.")) > +(define-public u-boot-am335x-boneblack > + (let ((base (make-u-boot-package > + "am335x_evm" "arm-linux-gnueabihf" > + ;; Patch out other device trees to build an image small e= nough > + ;; to fit within typical partitioning schemes where the f= irst > + ;; partition begins at sector 2048. > + #:configs '("CONFIG_OF_LIST=3D\"am335x-evm am335x-bonebla= ck\"") > + #:append-description > + "This U-Boot is built for the BeagleBone Black, which was > +removed upstream, adjusted from the am335x_evm build with several device= trees > +removed so that it fits within common partitioning schemes."))) > + (package > + (inherit base) > + ;; The name is not derived from the board name on purpose as the c= onfig > + ;; is modified per the comment above, parting from the default > + ;; am335x_evm configuration. > + (name "u-boot-am335x-boneblack")))) >=20=20 > (define-public u-boot-am335x-evm > (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf")) > --8<---------------cut here---------------end--------------->8--- > > Does it look good to you? If so, I'll commit it. It doesn't look obviously wrong... but there are a lot of whitespace changes that my lazy eyeballs might not catch... :) I would like to be able to see the results with "git diff =2D-ignore-allspace" but it is not formatted in a way I understand how to actually apply it to git. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY6siMgAKCRDcUY/If5cW qjfpAPsFREz5zYIFikof4EA+z8ErhRSYwRN7qNpHJepfuX7GtgD7B3H157cK7hSj wL4yGwcLU7YzZpYEq9cuCTrkqlcaqgA= =9J8i -----END PGP SIGNATURE----- --=-=-=--