From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EGwCHRpdqmOzRwEAbAwnHQ (envelope-from ) for ; Tue, 27 Dec 2022 03:48:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qPMKHRpdqmNMiwAAauVa8A (envelope-from ) for ; Tue, 27 Dec 2022 03:48:58 +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 BEBA7A99A for ; Tue, 27 Dec 2022 03:48:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pA00q-0003lq-D8; Mon, 26 Dec 2022 21:48:20 -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 1pA00n-0003lb-ST for guix-devel@gnu.org; Mon, 26 Dec 2022 21:48:18 -0500 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pA00l-0000Ju-Rd for guix-devel@gnu.org; Mon, 26 Dec 2022 21:48:17 -0500 Received: by mail-qt1-x82b.google.com with SMTP id c7so9634681qtw.8 for ; Mon, 26 Dec 2022 18:48:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=5KFNV7vPMGilD2rtcfs5QKS0z8MAXVByddGQARzJOB0=; b=XqGareYovfMgwYWPUVUfMj9mNjSFYvuhfoF1Iq5uyOlOmZ9e7LSkyUiaeJK6VsN/ub nzSGp5XBM+TwhaIFBgDRR06B3ZU3WRxl5yVkH+rWZ7SmPKgzbuu2A5/n26Uh8R8jIpsC LQjdznNfxk4jNPcoRHJr5hbCrPEQiSWkBrZ8JfyIpa3yJAEdtocff7l+AD/IVu4b1lXM 8QIDeDLNgsxtBnePyH9P8sh/5+/h8uwMPmqGmWl8afg+ZemnahB1arWB8EId4Ydry002 VCzCprk/fFvsq8NMTW3R+7AfCL0QbBsWIlwPxjl3bTm08+EO+UKYEMp5Wg3Mzi+nAp7K 8uow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5KFNV7vPMGilD2rtcfs5QKS0z8MAXVByddGQARzJOB0=; b=kXpdtPFvbTcJsHwC0wx9FdIXbAOHx+YLZtFsEYVHEFP/c/yxNqUn6VXpvFlO5gzFw6 5a5cuRZozxhS3+8bdQXmpe0npqUN+6yadOMhurJ7xQf81/fDNXdoHV7Fi+DmxsQa3fLi yx3g/3zZr1lQl3RlSCs0xuuMd93s3yhuAc0xsTOVsUiDEiof4n4rYAp0A8KPBSh2hZRV 8M/O2muHkG39BwiQSI7Qke7qOmA37TUziW+dprxVhBP+4F7hP8IFyexlOZYwXmKVjCE5 iySj+jCOFxZuoyUZdgMw1gCDkSuHoaO8AbBJSRZ9Mt7bPuVpODgwudpjEHeoqQBTUuCS gHMw== X-Gm-Message-State: AFqh2kp63HQVcww9ajMRe4OLK8wZ50i7jtFobeCciHLECQONL1BZ6wkh K5Ha8Xalj22BeystCvux9K4C4SwYWdaJbw== X-Google-Smtp-Source: AMrXdXtCeT70728vEST6pJpMmOU/O01oA233S73SQ9SEEbrw0+BXZWhrmQWkNLCQOnxJHig2C1d59g== X-Received: by 2002:a05:622a:400c:b0:3a9:80b6:8347 with SMTP id cf12-20020a05622a400c00b003a980b68347mr31273615qtb.1.1672109293245; Mon, 26 Dec 2022 18:48:13 -0800 (PST) Received: from hurd (dsl-10-129-132.b2b2c.ca. [72.10.129.132]) by smtp.gmail.com with ESMTPSA id h17-20020a05620a401100b006fa9d101775sm8926347qko.33.2022.12.26.18.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 18:48:12 -0800 (PST) From: Maxim Cournoyer To: Vagrant Cascadian Cc: guix-devel@gnu.org Subject: Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack References: <87len0y1kk.fsf@contorta> <87v8m3w2sa.fsf@gmail.com> <87fsd7ayif.fsf@contorta> Date: Mon, 26 Dec 2022 21:48:11 -0500 In-Reply-To: <87fsd7ayif.fsf@contorta> (Vagrant Cascadian's message of "Thu, 22 Dec 2022 14:01:44 -0800") Message-ID: <87h6xh8sus.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82b.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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=1672109338; a=rsa-sha256; cv=none; b=ktbSe5L0YfaNslJHEmnx65ptwYXWQLlVnDlUoUZHZwMugkFjz932d2S3a/t+0bC+sQ0sXo 4UtJ5eWOQ3YCZYEM8Ng8S8MIVwolsoKiKhhcy9hDEDwo/AME9Mj7bO7/jFqDacsZSRybvM Z2ilrF8bOBffi1qU4yAVfWQFhWI0upKFX6YmVOmBq3+89oOWgkW9V3CUF/OldMEQoYScDg PTrls0gpt2m8lmYFJPCNl63Jc1K+V7ZiofXu7b6LyBMq8Bgx8QQN8iXpZeWROTuOgz9FIU 0eItrXZjfk3gmYljwpICBXpCiZu35YIMVRBoZAcLX1fStsCHWNxBGdtrqgZLlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XqGareYo; 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=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672109338; 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=5KFNV7vPMGilD2rtcfs5QKS0z8MAXVByddGQARzJOB0=; b=Jv58m6RgmiDiRFpxgGzkhNBHWKM+Ti+mrzoHqxPwj9W1kMulEyKaPzVLOA5IOmK6QW/rKB AGDV7ltBlVcLPiCq3C73mAjPo5ghd7VDrx2iz9BDF6zDy257+/gAuK2VQS/FnjRO1iMrVp pDGV5BZXlU2x7IXXTJx2cGq+QjYli+EjPguRqtyLAYcv6HemR/oahrFNQz45M15T+pBK6j bjEk0pxQZiWzEyraYzZdA+F8IHVjiVBb54v4ASksuF7UoEOeU+seUeY0GVrUngbqocD83I 97m3JZlnTYSXRmgbXYhOnRUpNhfBtTaq5YcG1QaBU4MoNmXheTXNly3jdOEPig== X-Spam-Score: -6.40 X-Migadu-Queue-Id: BEBA7A99A Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XqGareYo; 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=pass (policy=none) header.from=gmail.com X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -6.40 X-TUID: 4KUNIM57VEaL Hi Vagrant, Vagrant Cascadian writes: > On 2022-12-22, Maxim Cournoyer wrote: >> Vagrant Cascadian writes: >> >>> Wondering what necessitated this change from the old variable name to a >>> new name... >>> >>> commit c04528d2a2597d79278833f3607c806278253446 >>> Author: Maxim Cournoyer >>> Date: Tue Dec 20 21:25:27 2022 -0500 >>> >>> gnu: u-boot-am335x-evm-boneblack: Fix variable name. >>> >>> * gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to... >>> (u-boot-am335x-evm-boneblack), to match the package name. >>> * gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust >>> accordingly. >>> ... >>> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm >>> index bd9f7bb577..c8b8adbc93 100644 >>> --- a/gnu/packages/bootloaders.scm >>> +++ b/gnu/packages/bootloaders.scm >>> @@ -889,7 +889,7 @@ (define*-public (make-u-boot-package board triplet >>> (define-public u-boot-malta >>> (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) >>> >>> -(define-public u-boot-am335x-boneblack >>> +(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 >>> >>> The u-boot-am335x-boneblack was named to match the original target that >>> was removed from upstream, adapting the upstream am335x-evm to fit into >>> a smaller gap in the partition tables... (e.g. 2MB partition offset >>> instead of 4MB offset required by the default am335x-evm board >>> configuration). >> >> The problem was that the *name* of the package was >> "u-boot-am335x-evm-boneblack", as computed by the MAKE-U-BOOT-PACKAGE >> procedure, which includes the board argument in its name (it's been like >> this since its inception in 862e38d5518, 2017). >> >> If the previous variable name should have been its name, the name field >> would have needed to be overridden to it (or perhaps we could introduce >> a #:name argument that would take precedence over any cleverness). >> >> I noticed of the problem when trying to build the package; "guix build >> u-boot-am335x-boneblack" would tell me it didn't exist. >> >> I considered making a deprecated alias but decided against, because in >> the past we didn't when moving/renaming packages *variables*. > > Odd. I was certainy able to build u-boot-am335x-boneblack from commit > 6b99afeef89233b71d113a63cf04a6b4b49a4679 when it was introduced in 2019, > though it has been quite some time since I tested it... > > 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))) (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")) -(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 begins at - ;; sector 2048. - #:configs '("CONFIG_OF_LIST=\"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 device -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 enough + ;; to fit within typical partitioning schemes where the first + ;; partition begins at sector 2048. + #:configs '("CONFIG_OF_LIST=\"am335x-evm am335x-boneblack\"") + #: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 config + ;; is modified per the comment above, parting from the default + ;; am335x_evm configuration. + (name "u-boot-am335x-boneblack")))) (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. Happy holidays! -- Thanks, Maxim