From owner-freebsd-arm@freebsd.org Sat Apr 25 08:57:01 2020 Return-Path: Delivered-To: freebsd-arm@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-arm@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Porting FreeBSD to ARM processors." 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