From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 ACt3JvaprGNVBgAAbAwnHQ (envelope-from ) for ; Wed, 28 Dec 2022 21:41:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2CVyJvaprGMLLAAA9RJhRA (envelope-from ) for ; Wed, 28 Dec 2022 21:41:26 +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 712A03B642 for ; Wed, 28 Dec 2022 21:41:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAdDu-0002SI-KX; Wed, 28 Dec 2022 15:40:26 -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 1pAdDs-0002RN-Om for guix-devel@gnu.org; Wed, 28 Dec 2022 15:40:24 -0500 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAdDr-0003Mf-68 for guix-devel@gnu.org; Wed, 28 Dec 2022 15:40:24 -0500 Received: by mail-qv1-xf2b.google.com with SMTP id q10so11642403qvt.10 for ; Wed, 28 Dec 2022 12:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MXIh0qzu7Sy6KdCcXs1zDQEE9ECoVBL3KvEVdetjtRk=; b=cr5ZD5IOfCk9i4wKWGLvBMfqOqxkcyRnrAWUFblvTnoTQ5Zi/24xbrP9P8nGL5EIvc F/13jkOBMjnUYH06yRm++i0ykriFoTo+BTsDWvI4R/nYNkUd3HRiONipP9B8b0dEAoiN ciVDyI8ZVLiAQMCbHKBudEbirShdNh1WILjKACeoM5LenXABAPn1p8E/7kT5TXR0yZmp Jg7nzl7ekG5BE7IHbJjsBZcwXZpAbXXRmtZvgn//aatyw9ndZ4VlusVGh5qTgMPE5Tes wgF0TeH0C8W2bkrnCRJ3Ji/GJ1C8Y1tlvxWvVcz1ch9KFGhYAkFUs+XbNcR1TfAgLLQ7 tyXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MXIh0qzu7Sy6KdCcXs1zDQEE9ECoVBL3KvEVdetjtRk=; b=2yskfLhJS/HunYMweu/Qz4JcbU8SmY/XvLc3OFL2pOl79G8qhR0gFvHlvOryA4PYtg 1xnWurUpjuSYb8gSbHAbRzjZ5GKtKUNpu3Ds/7G9pDCrcTNrnvrVoqxJmYjgO1GLcH9N g4sUZH+kTGAqBa7FIAeB0xv07tmjknl08CwYdSBm4ixAE1SWl/QqYIQIjml761VQNZKO H3KEVpCX3L/ud/gi0QYR5R+iuRrkD71yjSQ19/CA3+IwcfysdOBs1Q5J8pPHgNlYxhaz 6R8hbA3KYg46XgHlpKq+w8L6Kr+Amm0eCEsvTMFBqQmo28lVDUjE19r8cEJg+6Qia4Qx bllQ== X-Gm-Message-State: AFqh2kq6l6exsycmZu32ayhnz9NP1RiJzCgm3SUan3n2C+nD11oBUPLx dOOOGwEYQ4vtRS4G3B0bltyrMU6rQ84axg== X-Google-Smtp-Source: AMrXdXt8gwfz9/yaXgdPWp1qTnJugZT5HByzNshF0JlYyJ8gZGPrwxpIq7n7VQU0Hl1z5otsD2OQOQ== X-Received: by 2002:a0c:e7c7:0:b0:4c7:2566:38d4 with SMTP id c7-20020a0ce7c7000000b004c7256638d4mr36187082qvo.16.1672260021576; Wed, 28 Dec 2022 12:40:21 -0800 (PST) Received: from localhost.localdomain (dsl-153-10.b2b2c.ca. [66.158.153.10]) by smtp.gmail.com with ESMTPSA id 202-20020a370bd3000000b006fed58fc1a3sm11622158qkl.119.2022.12.28.12.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 12:40:21 -0800 (PST) From: Maxim Cournoyer To: guix-devel@gnu.org Cc: vagrant@debian.org, Maxim Cournoyer Subject: [PATCH] gnu: u-boot-am335x-boneblack: Revert to old name. Date: Wed, 28 Dec 2022 15:40:08 -0500 Message-Id: <20221228204008.31853-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <87a638rdu6.fsf@contorta> References: <87a638rdu6.fsf@contorta> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f2b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf2b.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=1672260086; a=rsa-sha256; cv=none; b=W2dUfX/4+ROu0qFTJaoweJgpW1fTUZAXsgWe22IDKBZ8TNm/kmWMIeSvQyjaTq9cWv161q UgCXHHJtw7SJVSZs9xYS1lXRJBb9eO9wl5xZGxwo78lBZM1gfL8Dne6wnNbp7Kccp84dxC yZ9OnSyULeYD4UrE0Stiuf5SN0HxapeSiULcpNteS2z1n+clI/UZlx3jxGwzuHN/DkLfbW 6vMMwqUr+OumwMsyvKlAimj1Ggp1HFpUPE3iJZZ5pRvIuJIFukhKYAgioZzlEqPmIKjjb9 m/dRP3s9iJmLkJiQ65PW4Dxw39MajXoN2VUSQv4gAcbdjoIeOy15kmgrTwkwOA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=cr5ZD5IO; 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=1672260086; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=MXIh0qzu7Sy6KdCcXs1zDQEE9ECoVBL3KvEVdetjtRk=; b=KrBNXolRFYFp1Z+9Jlcpw7JRgNSDK+6Id9c+5tq75jnVl557e5SPNScycedsFRHwJrLsJx 4uU/pka6BNq9Jx/ESPsoHeJuqly311TNT3E6i83wQINb0zwjB0iuoun4I0neyCafK2fC5C A5WN9ymdvEx7/kVJss448Fndj2upkQwl5dh5sLaH2sgPplhcabsqcpd+AaEVv8DYZGkNsE BNAQ2l5rsp131/EztuFF4VO1Mr6mymL1ZKYs8gs1cQvMzx3l3pzhIUEM7iGyDhsawl27y6 4YBRroPstC7rYnMPME6O78UvGoPHUx5kcabpJYgqO9yRztFj4dkthTtlHwJFRw== X-Spam-Score: -5.61 X-Migadu-Queue-Id: 712A03B642 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=cr5ZD5IO; 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: -5.61 X-TUID: WwcjaTvXZ+dw This reverts to the name this package had previous to commit c2c1dfdf5760873f1db86d14873f725a105f7feb ("gnu: bootloader: Add U-Boot packages for Raspberry Pi models."), which caused the package name to be derived from the board name. * gnu/packages/bootloaders.scm (u-boot-am335x-evm-boneblack): Remove the NAME-SUFFIX keyword argument. Specify the full name via the name field. * gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust to the renamed package. Reported-by: Vagrant Cascadian --- gnu/bootloader/u-boot.scm | 2 +- gnu/packages/bootloaders.scm | 28 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index de3a43ed70..6cad33b741 100644 --- a/gnu/bootloader/u-boot.scm +++ b/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 diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 89f051f337..e379a38127 100644 --- a/gnu/packages/bootloaders.scm +++ b/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")) base-commit: fde5af3962c8fafc5d20e5d742cc7aea907f3563 -- 2.38.1