From nobody Mon Feb 07 06:19:56 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3081F19AB494 for ; Mon, 7 Feb 2022 06:20:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa31.google.com (mail-vk1-xa31.google.com [IPv6:2607:f8b0:4864:20::a31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JsbbX1h4Kz3CCT for ; Mon, 7 Feb 2022 06:20:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa31.google.com with SMTP id y192so7201780vkc.8 for ; Sun, 06 Feb 2022 22:20:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ramkgib/QdFoyGnAFeKxObMH9IW1LiZ2I2lyv801/AI=; b=wJ1dduxSj3dccW+UtaEfKAu7a1QPdevrjtja5j6DMXgzylsBRrah7GMfejxQ33J4WL wZqZY3z83LTJEqkaR5MyDWD6Teb9SAuUndQCbVos0jlQ6ximpeu2b9KiRdy5xkBnsY6X JBAWP14Um1lpBfDC9Bu3IdoYY0AU5F/VF5ElpJZPeIbGLAAFBt3azvhC+dtiEbmjh9/O 5iqtzTESiaviI8Vu8OPDIZmLvUz2THfiIpoqwVzfB/2toHJS38HxX4O6geyrpUeU82t6 l5TQfhXRMZefWRF6DL6+e/gAK3Ta8PY1IOAiNYUoXq3DkNUakUE6znpX6y6C1uYlsg8+ 8Ukg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ramkgib/QdFoyGnAFeKxObMH9IW1LiZ2I2lyv801/AI=; b=JA9m4GHkS4YYmFl6fDI7QqojVo6+Wwv0513YRCRRv6Ha4U+IdwimmCBqGefeZ4CrKh xS5+Rcqf9Bv1kiIR3qFQnIs6X1HxL3M7PyK4DjnG6hWGCnIi0NPMIK6hZganCMyWwgzH CCMhm3xI0qNQvFski7cHnVOUSFlYNKgbM1J6qHYErKcu14X7VMhjsz3W+m8OtwabCdy4 2osO/7+LyacXZ/IMe60eLAyDBAM2+S3fPqdIPM+iXH95AZgcnbHOY6sCLVIWxvhTEAh7 UXtsQjt79EeebRXMNsjym8Y+DG9K+1M4+tumJ7dNnn9bbsaDZbeHTsbEJYeSDS32dSig lHIw== X-Gm-Message-State: AOAM531rPM36GRnzx3hkCXhZjMkH+MNwr9iH2AcK7ZRzVWtQJ2msHKWe L8aruUJHx4JAj76EPVsVucNl62Vaw4T2hNZKahHyAQ== X-Google-Smtp-Source: ABdhPJwlWHpbyatg1wgYsWgwQ5s6NxsZklH7cTyjQDz0w945oalFUbZvxjrn2iQ8xZdg8H8MnxWEZ8lQAmrZyiw+rfg= X-Received: by 2002:a1f:640e:: with SMTP id y14mr4558775vkb.2.1644214807652; Sun, 06 Feb 2022 22:20:07 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202112150415.1BF4FGfh021651@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sun, 6 Feb 2022 23:19:56 -0700 Message-ID: Subject: Re: git: 9dc70af83e59 - main - stand/uboot: reorg To: Kyle Evans Cc: Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000008b7fca05d767973c" X-Rspamd-Queue-Id: 4JsbbX1h4Kz3CCT X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=wJ1dduxS; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a31) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.31 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.69)[0.690]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a31:from]; MLMMJ_DEST(0.00)[dev-commits-src-main]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --0000000000008b7fca05d767973c Content-Type: text/plain; charset="UTF-8" On Sun, Feb 6, 2022 at 10:30 PM Kyle Evans wrote: > On Tue, Dec 14, 2021 at 10:15 PM Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=9dc70af83e5992e543542adbf5a6edeb38f187f6 > > > > commit 9dc70af83e5992e543542adbf5a6edeb38f187f6 > > Author: Warner Losh > > AuthorDate: 2021-12-15 04:09:53 +0000 > > Commit: Warner Losh > > CommitDate: 2021-12-15 04:09:53 +0000 > > > > stand/uboot: reorg > > > > Build uboot ubldr and friends like we build efi binaries > > o move everything to be under stand/uboot > > o md code goes in arch/$ARCH > > o move everything over from the library > > - Had to rename console.c, disk.c and module.c due to conflicts > > o update version to 1.5 to reflect the new way of building > > > > This results in a more consistent build system and should represent > no > > functional change, apart from powerpc version getting new help > > file. Also, moved to exlcuding uboot on powerpc64le by using > > BROKEN_OPTION instead of the incidental exclusion we had before due > to > > Makefile reorgs. > > > > Sponsored by: Netflix > > Feedback by: stevek, jrtc27 > > Differential Revision: https://reviews.freebsd.org/D33362 > > [...] > > --- a/stand/arm/uboot/Makefile > > +++ /dev/null > > @@ -1,68 +0,0 @@ > > -# $FreeBSD$ > > - > > -LOADER_UFS_SUPPORT?= yes > > -LOADER_CD9660_SUPPORT?= no > > -LOADER_MSDOS_SUPPORT?= no > > -LOADER_EXT2FS_SUPPORT?= no > > -LOADER_NET_SUPPORT?= yes > > -LOADER_NFS_SUPPORT?= yes > > -LOADER_TFTP_SUPPORT?= no > > -LOADER_GZIP_SUPPORT?= no > > -LOADER_BZIP2_SUPPORT?= no > > - > > -.include > > - > > -FILES+= ubldr ubldr.bin > > - > > Hey Warner, > > ubldr.bin used to be built/installed unconditionally above > > > diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile > > index fde6f9c4e16e..aed2121bd507 100644 > > --- a/stand/uboot/Makefile > > +++ b/stand/uboot/Makefile > > @@ -1,9 +1,81 @@ > > # $FreeBSD$ > > > > +LOADER_UFS_SUPPORT?= yes > > +LOADER_CD9660_SUPPORT?= no > > +LOADER_MSDOS_SUPPORT?= no > > +LOADER_EXT2FS_SUPPORT?= no > > +LOADER_NET_SUPPORT?= yes > > +LOADER_NFS_SUPPORT?= yes > > +LOADER_TFTP_SUPPORT?= no > > +LOADER_GZIP_SUPPORT?= no > > +LOADER_BZIP2_SUPPORT?= no > > +LOADER_DISK_SUPPORT?= yes > > + > > .include > > > > -SUBDIR.yes= lib > > +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" > > + > > +.if ${MK_PIE} == "yes" > > +FILES+= ubldr ubldr.bin > > +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} > > +.else > > +PROG= ubldr > > +.endif > > + > > [... ] > > But now it's behind MK_PIE, which is disabled in numerous places > through stand/ as well as in defs.mk. This broke the armv7 snapshot > build, which is expecting a ubldr.bin it can pluck out. > Yea, that's clearly wrong. Not sure what I was thinking. > I suspect the intention was to specifically avoid it in powerpc64, but > we'll need to re-work it a tad bit. > https://reviews.freebsd.org/D34189 might fix this. Comments? Warner > Thanks, > > Kyle Evans > --0000000000008b7fca05d767973c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Feb 6, 2022 at 10:30 PM Kyle = Evans <kevans@freebsd.org> = wrote:
On Tue, D= ec 14, 2021 at 10:15 PM Warner Losh <imp@freebsd.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D9dc70af83e5992e543542adbf5a6edeb38f187f6<= /a>
>
> commit 9dc70af83e5992e543542adbf5a6edeb38f187f6
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2021-12-15 04:09:53 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2021-12-15 04:09:53 +0000
>
>=C2=A0 =C2=A0 =C2=A0stand/uboot: reorg
>
>=C2=A0 =C2=A0 =C2=A0Build uboot ubldr and friends like we build efi bin= aries
>=C2=A0 =C2=A0 =C2=A0o move everything to be under stand/uboot
>=C2=A0 =C2=A0 =C2=A0o md code goes in arch/$ARCH
>=C2=A0 =C2=A0 =C2=A0o move everything over from the library
>=C2=A0 =C2=A0 =C2=A0 =C2=A0- Had to rename console.c, disk.c and module= .c due to conflicts
>=C2=A0 =C2=A0 =C2=A0o update version to 1.5 to reflect the new way of b= uilding
>
>=C2=A0 =C2=A0 =C2=A0This results in a more consistent build system and = should represent no
>=C2=A0 =C2=A0 =C2=A0functional change, apart from powerpc version getti= ng new help
>=C2=A0 =C2=A0 =C2=A0file. Also, moved to exlcuding uboot on powerpc64le= by using
>=C2=A0 =C2=A0 =C2=A0BROKEN_OPTION instead of the incidental exclusion w= e had before due to
>=C2=A0 =C2=A0 =C2=A0Makefile reorgs.
>
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0Netflix
>=C2=A0 =C2=A0 =C2=A0Feedback by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 stevek, jrtc27
>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://revie= ws.freebsd.org/D33362
> [...]
> --- a/stand/arm/uboot/Makefile
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -# $FreeBSD$
> -
> -LOADER_UFS_SUPPORT?=3D=C2=A0 =C2=A0yes
> -LOADER_CD9660_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no
> -LOADER_MSDOS_SUPPORT?=3D no
> -LOADER_EXT2FS_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no
> -LOADER_NET_SUPPORT?=3D=C2=A0 =C2=A0yes
> -LOADER_NFS_SUPPORT?=3D=C2=A0 =C2=A0yes
> -LOADER_TFTP_SUPPORT?=3D=C2=A0 no
> -LOADER_GZIP_SUPPORT?=3D=C2=A0 no
> -LOADER_BZIP2_SUPPORT?=3D no
> -
> -.include <bsd.init.mk>
> -
> -FILES+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ubld= r ubldr.bin
> -

Hey Warner,

ubldr.bin used to be built/installed unconditionally above

> diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile
> index fde6f9c4e16e..aed2121bd507 100644
> --- a/stand/uboot/Makefile
> +++ b/stand/uboot/Makefile
> @@ -1,9 +1,81 @@
>=C2=A0 # $FreeBSD$
>
> +LOADER_UFS_SUPPORT?=3D=C2=A0 =C2=A0yes
> +LOADER_CD9660_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no
> +LOADER_MSDOS_SUPPORT?=3D no
> +LOADER_EXT2FS_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no
> +LOADER_NET_SUPPORT?=3D=C2=A0 =C2=A0yes
> +LOADER_NFS_SUPPORT?=3D=C2=A0 =C2=A0yes
> +LOADER_TFTP_SUPPORT?=3D=C2=A0 no
> +LOADER_GZIP_SUPPORT?=3D=C2=A0 no
> +LOADER_BZIP2_SUPPORT?=3D no
> +LOADER_DISK_SUPPORT?=3D=C2=A0 yes
> +
>=C2=A0 .include <bsd.init.mk>
>
> -SUBDIR.yes=3D=C2=A0 =C2=A0 lib
> +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"<= br> > +
> +.if ${MK_PIE} =3D=3D "yes"
> +FILES+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ubld= r ubldr.bin
> +OBJS+=3D=C2=A0 ${SRCS:N*.h:R:S/$/.o/g}
> +.else
> +PROG=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ubldr
> +.endif
> +
> [... ]

But now it's behind MK_PIE, which is disabled in numerous places
through stand/ as well as in defs.mk. This broke the armv7 snapshot
build, which is expecting a ubldr.bin it can pluck out.

Yea, that's clearly wrong. Not sure what I was thinkin= g.
=C2=A0
I suspect the intention was to specifically avoid it in powerpc64, but
we'll need to re-work it a tad bit.

=C2=A0https://reviews.freeb= sd.org/D34189

might fix this. Comments?

Warner
=C2=A0
Thanks,

Kyle Evans
--0000000000008b7fca05d767973c--