From owner-freebsd-ports@freebsd.org Sat Apr 25 07:43:38 2020 Return-Path: Delivered-To: freebsd-ports@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 118122CE12B 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 498NMD6bJLz4dyx 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: 498NMD6bJLz4dyx 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-ports@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Porting software to 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)