From owner-freebsd-uboot@freebsd.org Wed Apr 22 06:26:05 2020 Return-Path: Delivered-To: freebsd-uboot@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BDF702C7748 for ; Wed, 22 Apr 2020 06:26:05 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 496Vn94W7hz3H5j for ; Wed, 22 Apr 2020 06:26:05 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9AAFC2C7745; Wed, 22 Apr 2020 06:26:05 +0000 (UTC) Delivered-To: uboot@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 991712C7744 for ; Wed, 22 Apr 2020 06:26:05 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 496Vn93c59z3H5f for ; Wed, 22 Apr 2020 06:26:05 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.nyi.freebsd.org (portscout.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72FF3E613 for ; Wed, 22 Apr 2020 06:26:05 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.nyi.freebsd.org ([127.0.1.10]) by portscout.nyi.freebsd.org (8.15.2/8.15.2) with ESMTP id 03M6Q5N8018752 for ; Wed, 22 Apr 2020 06:26:05 GMT (envelope-from portscout@FreeBSD.org) Received: (from portscout@localhost) by portscout.nyi.freebsd.org (8.15.2/8.15.2/Submit) id 03M6Q5aP018742; Wed, 22 Apr 2020 06:26:05 GMT (envelope-from portscout@FreeBSD.org) Message-Id: <202004220626.03M6Q5aP018742@portscout.nyi.freebsd.org> X-Authentication-Warning: portscout.nyi.freebsd.org: portscout set sender to portscout@FreeBSD.org using -f Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Wed, 22 Apr 2020 06:26:05 +0000 From: portscout@FreeBSD.org To: uboot@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-Mailman-Approved-At: Wed, 22 Apr 2020 14:51:45 +0000 X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2020 06:26:05 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/uboot@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ sysutils/atf-rk3328 | v2.1 | v2.3 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt Reported by: portscout! From owner-freebsd-uboot@freebsd.org Sat Apr 25 07:43:38 2020 Return-Path: Delivered-To: freebsd-uboot@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1185A2CE12F for ; Sat, 25 Apr 2020 07:43:38 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic310-20.consmr.mail.gq1.yahoo.com (sonic310-20.consmr.mail.gq1.yahoo.com [98.137.69.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 498NMD6bM7z4f00 for ; Sat, 25 Apr 2020 07:43:36 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-YMail-OSG: pq3WAaMVM1mI_720qkN5tuXK8o1qbyZj8_3mq_YVwY0nIGSMmUEnpVu0tkDN2cM 9m4PLp_A8qgURqCdVgg6MVJDxOu_G9871dXnV7BVu.dt2zYVnry_FcnwwCeVzz8FSNUZEGP66rLh colZHhH2M1HD8rpckqigsPm2ie0PzqFcRu3a8VlJTNcuacwuQdWPHYVy9KnJAa15Gw2fHQPc6IEc 5hdX0XDg.Le9ksx0WKgaeAKt2V5XSI.bEpIZRBXW9CmXINfZZWaNMsNC0xlFAA7SjOijM7Injufc 14SyWqfRZs.QMPIE.OwPMJs6ijvXPUY8mXdQ8QDTtqOjIBFOmLbAHK.7j0D_RMsYpQgdBFocSIVZ CWJh3lY4oKaFuHATFrc7l9_tOYv18NxUCVKPr3n2PZta2oPBRVtmTNTJj7TZ0XWgPYgfncYeP0Gk JrbgRb7u5HWQ9L0PI4T5QjpEsTC26.RfVL0_WBbF9nQfciQp8Z49zn_riBXj1O3L8BsCZ4NcubTw MZ1gkrx1myFhbA8OzSbChC0gS_8Jp3OrAN7ubzNEvB.8bxnB2Qv8X1CsnooIrgSZyW6S_oJusAGE UtIS9vpFxztF_u3nqR.qIvZUyeZxg_ZdSOI.stOVxNZB013IUgjaKCzMooOqsWLjtakYQutKs_cw SOXdyCyFxvixPnS8WKd57p8_f1l7bV.4BWY.c73sW6dKs28vAJ.yOAW0ksfFKRvd9owkIfW_s6oL cLfuwbHk7l5WC_EhUjPtpK_NmSLIcYVJyyE1aFsfxprwT_kwVhHiWeGRnzadKb7kSvb.BMkl1ebO F5wewkwh4wWaKOiq20n8pS7zEVOfynpB_W53iqHM3AzpGONOpkj78URsPB2AWkUOcuIQf7gEXxAH Mr4LFXazU0gtB7VybXkHfZ74Dgiw0D2xA_iOeWeCZOZM1VFmZDOQSdnsG95TFKTgrz2mLIYFB.C8 7avcCOjuyoPySvYEQ9W8PfKfr2_8E.9lc1Wbdke3NoxcKsz.KlR_4WCns9N0Fqj.aNHOk6yvUs0K AfN5s8qdEtYQ7TMPcgwkxEcmm4ZbWXCKefFperkSFCpdY4WxZTG_QstAUKisnr6lzt4XuQOxmfad 8x5n7I0d63VWApTEB4iJFdO8bV2ChZxcCTTVGTjjRw0aiLq9ZQGkDlR8jMgphmtspiM3VYatv1Nz B0k4LKD0hFH460TFYNg_.zt_R56ZABS1xC_Zz.LDDE.tpTtwSayk0EUDLzWbW2EKOS_x0PA.p9ks eJutiyHDUym6aog0s5YdjQTV0r3oRT.FI2qQL.BIS9TWoHnqxH8P_7Ptfdxyrijv0NlC5nzBSsGA CvNrqcSsNIdsPZzPrT07hgomwv9Uf5myLGNKscCkNVojk5..mrMBZN0Z6NYJ7LtwrlVnK1njMdGi 7tuSR.tBfNISixIaPbXgPCdUVAxB0MjK.VZAD7G7EtD0H_MnKCWxVXSfZ4cOrjlvRrOqMG63RgtB j4O1LWQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.gq1.yahoo.com with HTTP; Sat, 25 Apr 2020 07:43:34 +0000 Received: by smtp415.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 7ff9b3cebe4989a42e138148803b9d5c; Sat, 25 Apr 2020 07:43:29 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Applying distribution patches for u-boot-rpi4-2020.04 fails during build (poudriere-devel context) Message-Id: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE@yahoo.com> Date: Sat, 25 Apr 2020 00:43:27 -0700 To: freebsd-arm , freebsd-uboot@freebsd.org, FreeBSD ports X-Mailer: Apple Mail (2.3608.80.23.2.2) References: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE.ref@yahoo.com> X-Rspamd-Queue-Id: 498NMD6bM7z4f00 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.38 / 15.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/21, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com.dwl.dnswl.org : 127.0.5.0]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.91)[-0.914,0]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-0.97)[-0.969,0]; MIME_GOOD(-0.10)[text/plain]; IP_SCORE(0.00)[ip: (4.82), ipnet: 98.137.64.0/21(0.83), asn: 36647(0.66), country: US(-0.05)]; IP_SCORE_FREEMAIL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[146.69.137.98.list.dnswl.org : 127.0.5.0]; RWL_MAILSPIKE_POSSIBLE(0.00)[146.69.137.98.rep.mailspike.net : 127.0.0.17]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2020 07:43:38 -0000 =46rom the log file: =3D=3D=3D> Patching for u-boot-rpi4-2020.04 =3D=3D=3D> Applying distribution patches for u-boot-rpi4-2020.04 2 out of 2 hunks failed--saving rejects to = scripts/dtc/libfdt/fdt_addresses.c.rej *** Error code 1 Details: amd64 head -r360289 context. Ports head -r532914 context. # svnlite status /usr/ports/sysutils/u-boot-rpi4/ #=20 # svnlite status /usr/ports/sysutils/u-boot-master/ #=20 # more = /wrkdirs/usr/ports/sysutils/u-boot-rpi4/work/u-boot-2020.04/scripts/dtc/li= bfdt/fdt_addresses.c.rej @@ -1,6 +1,7 @@ /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2014 David Gibson + * Copyright (C) 2018 embedded brains GmbH * * libfdt is dual licensed: you can use it either under the terms of * the GPL, or the BSD license, at your option. @@ -55,42 +56,32 @@ =20 #include "libfdt_internal.h" =20 -int fdt_address_cells(const void *fdt, int nodeoffset) +static int fdt_cells(const void *fdt, int nodeoffset, const char *name) { - const fdt32_t *ac; + const fdt32_t *c; int val; int len; =20 - ac =3D fdt_getprop(fdt, nodeoffset, "#address-cells", &len); - if (!ac) + c =3D fdt_getprop(fdt, nodeoffset, name, &len); + if (!c) return 2; =20 - if (len !=3D sizeof(*ac)) + if (len !=3D sizeof(*c)) return -FDT_ERR_BADNCELLS; =20 - val =3D fdt32_to_cpu(*ac); + val =3D fdt32_to_cpu(*c); if ((val <=3D 0) || (val > FDT_MAX_NCELLS)) return -FDT_ERR_BADNCELLS; =20 return val; } =20 -int fdt_size_cells(const void *fdt, int nodeoffset) +int fdt_address_cells(const void *fdt, int nodeoffset) { - const fdt32_t *sc; - int val; - int len; - - sc =3D fdt_getprop(fdt, nodeoffset, "#size-cells", &len); - if (!sc) - return 2; - - if (len !=3D sizeof(*sc)) - return -FDT_ERR_BADNCELLS; - - val =3D fdt32_to_cpu(*sc); - if ((val < 0) || (val > FDT_MAX_NCELLS)) - return -FDT_ERR_BADNCELLS; + return fdt_cells(fdt, nodeoffset, "#address-cells"); +} =20 - return val; +int fdt_size_cells(const void *fdt, int nodeoffset) +{ + return fdt_cells(fdt, nodeoffset, "#size-cells"); } =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-uboot@freebsd.org Sat Apr 25 08:57:01 2020 Return-Path: Delivered-To: freebsd-uboot@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A4552CFA64; Sat, 25 Apr 2020 08:57:01 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 498Pzv59Ftz3DnQ; Sat, 25 Apr 2020 08:56:59 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1587805008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u9K8eeTJFuhvLfoMHba4laop/WNPzGGRyGSWkglN32k=; b=NBFnay/G4WW/niXQPXXgpOIhufx6h2bSF6FBKl4xXPuwsvDEqCkEfm7rilCvwwHCmP2UpI Efls98eBT3e8WeHwiLJE6Y0wSKoNpRVRQT264AgrOXnrVtH4Fuv+TYRwwfAWpxt+AR7FQe gEW8Xf5zWQ80xtfiNkvVfNbnkki3jp4= Received: from tails.home (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 26a35bda (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 25 Apr 2020 08:56:48 +0000 (UTC) Date: Sat, 25 Apr 2020 10:56:47 +0200 From: Emmanuel Vadot To: Mark Millard Cc: Mark Millard via freebsd-uboot , freebsd-arm , FreeBSD ports Subject: Re: Applying distribution patches for u-boot-rpi4-2020.04 fails during build (poudriere-devel context) Message-Id: <20200425105647.1406a2357cb0b825e19696a5@bidouilliste.com> In-Reply-To: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE@yahoo.com> References: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE.ref@yahoo.com> <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE@yahoo.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 498Pzv59Ftz3DnQ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=NBFnay/G; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.89 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+mx]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; FREEMAIL_TO(0.00)[yahoo.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(-1.39)[ip: (-9.22), ipnet: 212.83.128.0/19(1.87), asn: 12876(0.43), country: FR(0.00)]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2020 08:57:01 -0000 On Sat, 25 Apr 2020 00:43:27 -0700 Mark Millard via freebsd-uboot wrote: > From the log file: > > ===> Patching for u-boot-rpi4-2020.04 > ===> Applying distribution patches for u-boot-rpi4-2020.04 > 2 out of 2 hunks failed--saving rejects to scripts/dtc/libfdt/fdt_addresses.c.rej We don't have such patch in the tree. > *** Error code 1 > > Details: > > amd64 head -r360289 context. Ports head -r532914 context. > > # svnlite status /usr/ports/sysutils/u-boot-rpi4/ > # > > # svnlite status /usr/ports/sysutils/u-boot-master/ > # > > # more /wrkdirs/usr/ports/sysutils/u-boot-rpi4/work/u-boot-2020.04/scripts/dtc/libfdt/fdt_addresses.c.rej > @@ -1,6 +1,7 @@ > /* > * libfdt - Flat Device Tree manipulation > * Copyright (C) 2014 David Gibson > + * Copyright (C) 2018 embedded brains GmbH > * > * libfdt is dual licensed: you can use it either under the terms of > * the GPL, or the BSD license, at your option. > @@ -55,42 +56,32 @@ > > #include "libfdt_internal.h" > > -int fdt_address_cells(const void *fdt, int nodeoffset) > +static int fdt_cells(const void *fdt, int nodeoffset, const char *name) > { > - const fdt32_t *ac; > + const fdt32_t *c; > int val; > int len; > > - ac = fdt_getprop(fdt, nodeoffset, "#address-cells", &len); > - if (!ac) > + c = fdt_getprop(fdt, nodeoffset, name, &len); > + if (!c) > return 2; > > - if (len != sizeof(*ac)) > + if (len != sizeof(*c)) > return -FDT_ERR_BADNCELLS; > > - val = fdt32_to_cpu(*ac); > + val = fdt32_to_cpu(*c); > if ((val <= 0) || (val > FDT_MAX_NCELLS)) > return -FDT_ERR_BADNCELLS; > > return val; > } > > -int fdt_size_cells(const void *fdt, int nodeoffset) > +int fdt_address_cells(const void *fdt, int nodeoffset) > { > - const fdt32_t *sc; > - int val; > - int len; > - > - sc = fdt_getprop(fdt, nodeoffset, "#size-cells", &len); > - if (!sc) > - return 2; > - > - if (len != sizeof(*sc)) > - return -FDT_ERR_BADNCELLS; > - > - val = fdt32_to_cpu(*sc); > - if ((val < 0) || (val > FDT_MAX_NCELLS)) > - return -FDT_ERR_BADNCELLS; > + return fdt_cells(fdt, nodeoffset, "#address-cells"); > +} > > - return val; > +int fdt_size_cells(const void *fdt, int nodeoffset) > +{ > + return fdt_cells(fdt, nodeoffset, "#size-cells"); > } > > > === > Mark Millard > marklmi at yahoo.com > ( dsl-only.net went > away in early 2018-Mar) > > _______________________________________________ > freebsd-uboot@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-uboot > To unsubscribe, send any mail to "freebsd-uboot-unsubscribe@freebsd.org" -- Emmanuel Vadot From owner-freebsd-uboot@freebsd.org Sat Apr 25 09:00:22 2020 Return-Path: Delivered-To: freebsd-uboot@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37FCF2CFE18; Sat, 25 Apr 2020 09:00:22 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 498Q3n1vC9z3F0g; Sat, 25 Apr 2020 09:00:20 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1587805219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MlJMjQIz+p/nA76dfC6ybmjg8x7YaV1pMP89O/1C2o4=; b=B15pAteY8Gkjota+nTC//quIqWl0sDVlw/X2xchcoyx+00UsTL9u6Zohqo40Q46izvrhGZ 2dnZFN854Jgg7bZOaAbrraC4m9HzwzdbWU6BqeSqGHGpbcM+hCX6Q1AGxc/2wzVN4zoC6X DTGBwVYDp5XGws8RsqrUJPVI2nSpCgQ= Received: from tails.home (lfbn-idf2-1-900-181.w86-238.abo.wanadoo.fr [86.238.131.181]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 044fc5d5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 25 Apr 2020 09:00:19 +0000 (UTC) Date: Sat, 25 Apr 2020 11:00:19 +0200 From: Emmanuel Vadot To: Emmanuel Vadot Cc: Mark Millard , freebsd-arm , FreeBSD ports , Mark Millard via freebsd-uboot Subject: Re: Applying distribution patches for u-boot-rpi4-2020.04 fails during build (poudriere-devel context) Message-Id: <20200425110019.ec2e012449fa242346dcb641@bidouilliste.com> In-Reply-To: <20200425105647.1406a2357cb0b825e19696a5@bidouilliste.com> References: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE.ref@yahoo.com> <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE@yahoo.com> <20200425105647.1406a2357cb0b825e19696a5@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 498Q3n1vC9z3F0g X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=B15pAteY; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.89 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+mx:c]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(-1.39)[ip: (-9.26), ipnet: 212.83.128.0/19(1.85), asn: 12876(0.43), country: FR(0.00)]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; FREEMAIL_CC(0.00)[yahoo.com]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2020 09:00:22 -0000 On Sat, 25 Apr 2020 10:56:47 +0200 Emmanuel Vadot wrote: > On Sat, 25 Apr 2020 00:43:27 -0700 > Mark Millard via freebsd-uboot wrote: > > > From the log file: > > > > ===> Patching for u-boot-rpi4-2020.04 > > ===> Applying distribution patches for u-boot-rpi4-2020.04 > > 2 out of 2 hunks failed--saving rejects to scripts/dtc/libfdt/fdt_addresses.c.rej > > We don't have such patch in the tree. Sorry, it's https://patchwork.ozlabs.org/project/uboot/patch/20190726091339.24420-1-matthias.bgg@kernel.org/ I think I didn't had this port on my list of u-boot port to check, I'll fix that today. > > > *** Error code 1 > > > > Details: > > > > amd64 head -r360289 context. Ports head -r532914 context. > > > > # svnlite status /usr/ports/sysutils/u-boot-rpi4/ > > # > > > > # svnlite status /usr/ports/sysutils/u-boot-master/ > > # > > > > # more /wrkdirs/usr/ports/sysutils/u-boot-rpi4/work/u-boot-2020.04/scripts/dtc/libfdt/fdt_addresses.c.rej > > @@ -1,6 +1,7 @@ > > /* > > * libfdt - Flat Device Tree manipulation > > * Copyright (C) 2014 David Gibson > > + * Copyright (C) 2018 embedded brains GmbH > > * > > * libfdt is dual licensed: you can use it either under the terms of > > * the GPL, or the BSD license, at your option. > > @@ -55,42 +56,32 @@ > > > > #include "libfdt_internal.h" > > > > -int fdt_address_cells(const void *fdt, int nodeoffset) > > +static int fdt_cells(const void *fdt, int nodeoffset, const char *name) > > { > > - const fdt32_t *ac; > > + const fdt32_t *c; > > int val; > > int len; > > > > - ac = fdt_getprop(fdt, nodeoffset, "#address-cells", &len); > > - if (!ac) > > + c = fdt_getprop(fdt, nodeoffset, name, &len); > > + if (!c) > > return 2; > > > > - if (len != sizeof(*ac)) > > + if (len != sizeof(*c)) > > return -FDT_ERR_BADNCELLS; > > > > - val = fdt32_to_cpu(*ac); > > + val = fdt32_to_cpu(*c); > > if ((val <= 0) || (val > FDT_MAX_NCELLS)) > > return -FDT_ERR_BADNCELLS; > > > > return val; > > } > > > > -int fdt_size_cells(const void *fdt, int nodeoffset) > > +int fdt_address_cells(const void *fdt, int nodeoffset) > > { > > - const fdt32_t *sc; > > - int val; > > - int len; > > - > > - sc = fdt_getprop(fdt, nodeoffset, "#size-cells", &len); > > - if (!sc) > > - return 2; > > - > > - if (len != sizeof(*sc)) > > - return -FDT_ERR_BADNCELLS; > > - > > - val = fdt32_to_cpu(*sc); > > - if ((val < 0) || (val > FDT_MAX_NCELLS)) > > - return -FDT_ERR_BADNCELLS; > > + return fdt_cells(fdt, nodeoffset, "#address-cells"); > > +} > > > > - return val; > > +int fdt_size_cells(const void *fdt, int nodeoffset) > > +{ > > + return fdt_cells(fdt, nodeoffset, "#size-cells"); > > } > > > > > > === > > Mark Millard > > marklmi at yahoo.com > > ( dsl-only.net went > > away in early 2018-Mar) > > > > _______________________________________________ > > freebsd-uboot@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-uboot > > To unsubscribe, send any mail to "freebsd-uboot-unsubscribe@freebsd.org" > > > -- > Emmanuel Vadot > _______________________________________________ > freebsd-arm@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-arm > To unsubscribe, send any mail to "freebsd-arm-unsubscribe@freebsd.org" -- Emmanuel Vadot