From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gFVuLxvnoGTQ0gAASxT56A (envelope-from ) for ; Sun, 02 Jul 2023 04:55:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cOWULhvnoGRGUgAAG6o9tA (envelope-from ) for ; Sun, 02 Jul 2023 04:55:23 +0200 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 4F234A6AE for ; Sun, 2 Jul 2023 04:55:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=EMS9DHdt; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688266523; a=rsa-sha256; cv=none; b=SsCAxITh4kLHznpSbmRGjulR/oaTj9+Yg/tDiDzpvqVcdDzItikFTb7MQ0J1xe9zT8s01J MqBkqKfDltmEva3jQIedMAg/avbFuR51Y58P63WChkHA+oebOsCHDJ0k0vJkJe5sepSnZu ZNOhBnuk0llRPxQArDavJo3zCQxUOmkx9C/YQ9xqUrVzKnmGVy4S9pgiupvG79zek9Zh92 02Q8R3VH3nz5w6UREJur3AqhsjIv8EAkaX+yF/4SH7J41LDyZrkF6tuX8F0wDg/gIapUQk pBmIIT0ea/sfZ6App39xIjqskCjseXqRCAZ9OJ+DxFAO5UrKZq2doHR26dk7Fw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=EMS9DHdt; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688266523; 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:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=ho0uuZDZYox7zzRVgCWEUL1w51fnFY0IVg6H9PGbC3A=; b=jMMIMFxsqsh6UKpl/WaLYVBjzun4J62DnXqyW64X5D69hsWB02JjKLEQ+blrJ663zZJ548 D/6DImjCNI33FWTPPt2g/74SBlqiFbhPUTQ0rjMyjtpgmaC/NCmGjyrqMYW6Z0Vp0X5E3A Ell4z9gfGte/n63DdK4NYOkNeXPrWVUzLtSv5wlI53Nsv0LlyMEvxKGHJ0PwBowzcEqdXa 4aWdbyEXm8q8W2yG/FHF8Z8qXLPuEyCvLyX/TiN82X1rV7YQP9rIxcZjU90p0auBfymvEf XxgjRgGDs7YEs6i7lm3JSec4IzQOUbUa129Ls8cb54mxakLpBcEtjjzK86FvAQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFnEw-0003hX-BS; Sat, 01 Jul 2023 22:55:06 -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 1qFnEt-0003hK-2O for guix-patches@gnu.org; Sat, 01 Jul 2023 22:55:03 -0400 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 1qFnEs-00070V-PC for guix-patches@gnu.org; Sat, 01 Jul 2023 22:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFnEs-0000io-7J for guix-patches@gnu.org; Sat, 01 Jul 2023 22:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64068] [PATCH] gnu: Add u-boot-lichee-rv-dock. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Jul 2023 02:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64068 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Z572 <873216071@qq.com> Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Efraim Flashner , 64068@debbugs.gnu.org Received: via spool by 64068-submit@debbugs.gnu.org id=B64068.16882665012764 (code B ref 64068); Sun, 02 Jul 2023 02:55:02 +0000 Received: (at 64068) by debbugs.gnu.org; 2 Jul 2023 02:55:01 +0000 Received: from localhost ([127.0.0.1]:58963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFnEq-0000iV-3Y for submit@debbugs.gnu.org; Sat, 01 Jul 2023 22:55:00 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:36308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFnEj-0000iE-R4 for 64068@debbugs.gnu.org; Sat, 01 Jul 2023 22:54:58 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id F20C01AADA; Sat, 1 Jul 2023 19:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1688266485; bh=60fwBsnYiAlxlSe50Hn4WEXtXTBxOsVzXOIzUj1fplA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=EMS9DHdtjORphi5qzNyEn+7q8LV06Dj5Kw6WMXL2wja8Bpuu4RnXOxRl5hR8Elosd qRhJ+YPnt8kHQ9iZnClmN9TiSQofwd0BvwNs0KWKzhrntKkQpVn3wr++TmR9dF1gq4 luyRy1Ju0TB4eE432PriJ/th3kLwEDkXcS+acTJdl2jDD5eY32wu58Pqw3HDRsVVsM n90BGaHwvkfIXiYfEtkp6TnfB2qac2o7Z0AdJFJfCFmurfuhjkF1bjchXdTYcB6w6p cYb22f06jNdQY8XL0s0vRdpj2HQPo3TeM6OqT1uVwqZTuzVXAFoMj/3SvaycrjT8H/ gOPGv7ed4U/Ug== From: Vagrant Cascadian In-Reply-To: References: <87a5wzb5ti.fsf@wireframe> Date: Sat, 01 Jul 2023 19:54:41 -0700 Message-ID: <87mt0fxbta.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.35 X-Migadu-Queue-Id: 4F234A6AE X-Spam-Score: -2.35 X-TUID: aEf4kOdcYrgn --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-06-17, Z572 wrote: > Vagrant Cascadian writes: >> On 2023-06-14, Z572 wrote: >> This also reminds me that u-boot is falling a little behind (there is >> 2023.01, 2023.04 and soon 2023.07)... and while I would not want to block >> adding support for this board, I would be curious if it still works with >> newer u-boot versions... > > for now is not upstreamed. Ah, I missed that! Since it is not from the upstream version, it should also specify the version to match the version it is based on, even though it happens to match right now (e.g. 2022.10)... Otherwise, once the u-boot it inherits from is updated, I think it will list the package with the wrong version... >>> +(define-public u-boot-lichee-rv-dock >> ... >>> + (search-patches >>> + "u-boot-lichee-rv-dock-disable-openssl.patch") >>> + ;;; rebase from %u-boot-allow-disabling-openssl-patch >>> + (filter (negate (cut string-contains <> "openssl")) >>> + (origin-patches (package-source base))))) >> >> This seems a little tricky and possibly error-prone if another patch >> with openssl in the name is included at a later time, it could break >> this package. I almost wonder if it wouldn't be better to merge the >> functionality of the two patches disabling openssl than applying a >> board-specific patch? > > this new patch is modified from the original patch, because original > patch can't apply to smaeul/u-boot. > > I attach a new patch. Got it, thanks! Once u-boot updates to 2023.07 or later, there will likely be more patch conflicts... not sure of the best way to handle that... >> I have not had a chance to test that this package builds; I presume you >> have tested that it actually boots? > > yes, u-boot can boot, but cann't boot guix system, i guess because > initrd is too big(even though the board has 1GB of RAM), initrd.cpio is 6= 0M. so i send this patch first, > and try "remove initrd" or "make initrd small" in future . > (I'm not familiar with u-boot) Hrm. Mixed feelings about getting it into guix at this point... with it being a non-upstream fork and it cannot actually boot guix yet. A few more comments: > From: Z572 <873216071@qq.com> > Date: Sat, 17 Jun 2023 22:19:34 +0800 > Subject: [PATCH] gnu: Add u-boot-lichee-rv-dock. >=20 > * gnu/packages/bootloaders.scm (u-boot-lichee-rv-dock): New variable. > * gnu/packages/patches/u-boot-lichee-rv-dock-disable-openssl.patch: New f= ile. > * gnu/local.mk(dist_patch_DATA): register it. ... > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index a9685a9ef9..bd89280f1b 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -18,6 +18,7 @@ > ;;; Copyright =C2=A9 2022 Denis 'GNUtoo' Carikli > ;;; Copyright =C2=A9 2021 Stefan > ;;; Copyright =C2=A9 2022 Maxim Cournoyer > +;;; Cournoyer =C2=A9 2023 Zheng Junjie <873216071@qq.com> I suspect you want "Copyright" not "Cournoyer" :) > diff --git a/gnu/packages/patches/u-boot-lichee-rv-dock-disable-openssl.p= atch b/gnu/packages/patches/u-boot-lichee-rv-dock-disable-openssl.patch > new file mode 100644 > index 0000000000..f8e22d2c57 > --- /dev/null > +++ b/gnu/packages/patches/u-boot-lichee-rv-dock-disable-openssl.patch > @@ -0,0 +1,216 @@ > +From b2dff4fe9d1a53bbe3565435e190db19e7d6f4e7 Mon Sep 17 00:00:00 2001 > +From: Z572 > +Date: Mon, 8 May 2023 18:00:55 +0800 > +Subject: [PATCH] remove openssl If this is a rewrite of the removing openssl patch already in guix, it should probably credit the original patch author... live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZKDm8QAKCRDcUY/If5cW qgrRAQDIyQnobV5/mtkioMwcOc27YC0VIc2LcscN18gSaSXj7wEAzWi2d4yDm7k/ t9eycKTNd9mN248Q2JzdKl1n6wFwSgM= =Me4a -----END PGP SIGNATURE----- --=-=-=--