Date: Sun, 6 Feb 2022 23:19:56 -0700 From: Warner Losh <imp@bsdimp.com> To: Kyle Evans <kevans@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 9dc70af83e59 - main - stand/uboot: reorg Message-ID: <CANCZdfpu9y0DU16co2=hV8712oxca1QKz7m%2BusGZCLSZaFwMpA@mail.gmail.com> In-Reply-To: <CACNAnaGDugRhYeQ7WGfojs95rhJKHP7Q24%2B-LmZ44DRirLxzbg@mail.gmail.com> References: <202112150415.1BF4FGfh021651@gitrepo.freebsd.org> <CACNAnaGDugRhYeQ7WGfojs95rhJKHP7Q24%2B-LmZ44DRirLxzbg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000008b7fca05d767973c Content-Type: text/plain; charset="UTF-8" On Sun, Feb 6, 2022 at 10:30 PM Kyle Evans <kevans@freebsd.org> wrote: > On Tue, Dec 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=9dc70af83e5992e543542adbf5a6edeb38f187f6 > > > > commit 9dc70af83e5992e543542adbf5a6edeb38f187f6 > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2021-12-15 04:09:53 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > 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 <bsd.init.mk> > > - > > -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 <bsd.init.mk> > > > > -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 <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Sun, Feb 6, 2022 at 10:30 PM Kyle = Evans <<a href=3D"mailto:kevans@freebsd.org">kevans@freebsd.org</a>> = wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0= px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Tue, D= ec 14, 2021 at 10:15 PM Warner Losh <<a href=3D"mailto:imp@freebsd.org" = target=3D"_blank">imp@freebsd.org</a>> wrote:<br> ><br> > The branch main has been updated by imp:<br> ><br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D9dc70af83e59= 92e543542adbf5a6edeb38f187f6" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3D9dc70af83e5992e543542adbf5a6edeb38f187f6<= /a><br> ><br> > commit 9dc70af83e5992e543542adbf5a6edeb38f187f6<br> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2021-12-15 04:09:53 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2021-12-15 04:09:53 +0000<br> ><br> >=C2=A0 =C2=A0 =C2=A0stand/uboot: reorg<br> ><br> >=C2=A0 =C2=A0 =C2=A0Build uboot ubldr and friends like we build efi bin= aries<br> >=C2=A0 =C2=A0 =C2=A0o move everything to be under stand/uboot<br> >=C2=A0 =C2=A0 =C2=A0o md code goes in arch/$ARCH<br> >=C2=A0 =C2=A0 =C2=A0o move everything over from the library<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0- Had to rename console.c, disk.c and module= .c due to conflicts<br> >=C2=A0 =C2=A0 =C2=A0o update version to 1.5 to reflect the new way of b= uilding<br> ><br> >=C2=A0 =C2=A0 =C2=A0This results in a more consistent build system and = should represent no<br> >=C2=A0 =C2=A0 =C2=A0functional change, apart from powerpc version getti= ng new help<br> >=C2=A0 =C2=A0 =C2=A0file. Also, moved to exlcuding uboot on powerpc64le= by using<br> >=C2=A0 =C2=A0 =C2=A0BROKEN_OPTION instead of the incidental exclusion w= e had before due to<br> >=C2=A0 =C2=A0 =C2=A0Makefile reorgs.<br> ><br> >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0Netflix<br> >=C2=A0 =C2=A0 =C2=A0Feedback by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 stevek, jrtc27<br> >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 <a href=3D"https://rev= iews.freebsd.org/D33362" rel=3D"noreferrer" target=3D"_blank">https://revie= ws.freebsd.org/D33362</a><br> > [...]<br> > --- a/stand/arm/uboot/Makefile<br> > +++ /dev/null<br> > @@ -1,68 +0,0 @@<br> > -# $FreeBSD$<br> > -<br> > -LOADER_UFS_SUPPORT?=3D=C2=A0 =C2=A0yes<br> > -LOADER_CD9660_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no<br> > -LOADER_MSDOS_SUPPORT?=3D no<br> > -LOADER_EXT2FS_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no<br> > -LOADER_NET_SUPPORT?=3D=C2=A0 =C2=A0yes<br> > -LOADER_NFS_SUPPORT?=3D=C2=A0 =C2=A0yes<br> > -LOADER_TFTP_SUPPORT?=3D=C2=A0 no<br> > -LOADER_GZIP_SUPPORT?=3D=C2=A0 no<br> > -LOADER_BZIP2_SUPPORT?=3D no<br> > -<br> > -.include <<a href=3D"http://bsd.init.mk" rel=3D"noreferrer" target= =3D"_blank">bsd.init.mk</a>><br> > -<br> > -FILES+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ubld= r ubldr.bin<br> > -<br> <br> Hey Warner,<br> <br> ubldr.bin used to be built/installed unconditionally above<br> <br> > diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile<br> > index fde6f9c4e16e..aed2121bd507 100644<br> > --- a/stand/uboot/Makefile<br> > +++ b/stand/uboot/Makefile<br> > @@ -1,9 +1,81 @@<br> >=C2=A0 # $FreeBSD$<br> ><br> > +LOADER_UFS_SUPPORT?=3D=C2=A0 =C2=A0yes<br> > +LOADER_CD9660_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no<br> > +LOADER_MSDOS_SUPPORT?=3D no<br> > +LOADER_EXT2FS_SUPPORT?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 no<br> > +LOADER_NET_SUPPORT?=3D=C2=A0 =C2=A0yes<br> > +LOADER_NFS_SUPPORT?=3D=C2=A0 =C2=A0yes<br> > +LOADER_TFTP_SUPPORT?=3D=C2=A0 no<br> > +LOADER_GZIP_SUPPORT?=3D=C2=A0 no<br> > +LOADER_BZIP2_SUPPORT?=3D no<br> > +LOADER_DISK_SUPPORT?=3D=C2=A0 yes<br> > +<br> >=C2=A0 .include <<a href=3D"http://bsd.init.mk" rel=3D"noreferrer" t= arget=3D"_blank">bsd.init.mk</a>><br> ><br> > -SUBDIR.yes=3D=C2=A0 =C2=A0 lib<br> > +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"<= br> > +<br> > +.if ${MK_PIE} =3D=3D "yes"<br> > +FILES+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ubld= r ubldr.bin<br> > +OBJS+=3D=C2=A0 ${SRCS:N*.h:R:S/$/.o/g}<br> > +.else<br> > +PROG=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ubldr<br> > +.endif<br> > +<br> > [... ]<br> <br> But now it's behind MK_PIE, which is disabled in numerous places<br> through stand/ as well as in <a href=3D"http://defs.mk" rel=3D"noreferrer" = target=3D"_blank">defs.mk</a>. This broke the armv7 snapshot<br> build, which is expecting a ubldr.bin it can pluck out.<br></blockquote><di= v><br></div><div>Yea, that's clearly wrong. Not sure what I was thinkin= g.<br></div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"mar= gin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1= ex"> I suspect the intention was to specifically avoid it in powerpc64, but<br> we'll need to re-work it a tad bit.<br></blockquote><div><br></div><div= >=C2=A0<a href=3D"https://reviews.freebsd.org/D34189">https://reviews.freeb= sd.org/D34189</a></div><div><br></div><div>might fix this. Comments?<br></d= iv><div><br></div><div>Warner<br></div><div>=C2=A0</div><blockquote class= =3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rg= b(204,204,204);padding-left:1ex"> Thanks,<br> <br> Kyle Evans<br> </blockquote></div></div> --0000000000008b7fca05d767973c--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpu9y0DU16co2=hV8712oxca1QKz7m%2BusGZCLSZaFwMpA>