Re: GPTZFSBOOT in Current r326622 has problems

Looks like  -DEFI_ZFS_BOOT was dropped from boot1.c in r326589. I've fixed
it in r326714.

Warner

On Thu, Dec 7, 2017 at 5:44 AM, Thomas Laus <lausts_at_acm.org> wrote:

> On 12/06/17 19:38, Warner Losh wrote:
> >
> > OK. Still a fair number of changes, including changes to geli to fix
> > warnings...
> >
> > 326585-326594 is a flurry of changes. Then another in the 326609-326610
> > range. There's one other trivial one. I'd wager that if '500 works, the
> > breakage will be somewhere in the first range, which suggests 326590
> > might be a good, next pivot. There's also a few just after '500 that
> > might break things as well if I messed something up. '504 and '507 both
> > touch this stuff directly...
> >
> Warren:
>
> I reverted my system back to r326585 and 'stand' still won't compile;  I
> get this output:
>
> --- g_eli_hmac.o ---
> In file included from /usr/src/sys/geom/eli/g_eli_hmac.c:46:
> In file included from /usr/src/sys/geom/eli/g_eli.h:49:
> /usr/include/stdio.h:267:12: error: type specifier missing, defaults to
> 'int' [-Werror,-Wimplicit-int]
> char    *gets(char *);
>               ^
> /usr/include/stdio.h:267:7: error: expected parameter declarator
> char    *gets(char *);
>          ^
> /usr/src/stand/libsa/stand.h:271:28: note: expanded from macro 'gets'
> #define gets(x) ngets((x), 0)
>                            ^
> In file included from /usr/src/sys/geom/eli/g_eli_hmac.c:46:
> In file included from /usr/src/sys/geom/eli/g_eli.h:49:
> /usr/include/stdio.h:267:7: error: expected ')'
> /usr/src/stand/libsa/stand.h:271:28: note: expanded from macro 'gets'
> #define gets(x) ngets((x), 0)
>                            ^
> /usr/include/stdio.h:267:7: note: to match this '('
> /usr/src/stand/libsa/stand.h:271:22: note: expanded from macro 'gets'
> #define gets(x) ngets((x), 0)
>                      ^
> In file included from /usr/src/sys/geom/eli/g_eli_hmac.c:46:
> In file included from /usr/src/sys/geom/eli/g_eli.h:49:
> /usr/include/stdio.h:267:7: error: conflicting types for 'ngets'
> char    *gets(char *);
>          ^
> /usr/src/stand/libsa/stand.h:271:17: note: expanded from macro 'gets'
> #define gets(x) ngets((x), 0)
>                 ^
> /usr/src/stand/libsa/stand.h:270:13: note: previous declaration is here
> extern void     ngets(char *, int);
>                 ^
> In file included from /usr/src/sys/geom/eli/g_eli_hmac.c:46:
> In file included from /usr/src/sys/geom/eli/g_eli.h:49:
> /usr/include/stdio.h:271:6: error: conflicting types for 'putchar'
> int      putchar(int);
>          ^
> /usr/src/stand/libsa/stand.h:382:14: note: previous declaration is here
> extern void             putchar(int);
>                         ^
> In file included from /usr/src/sys/geom/eli/g_eli_hmac.c:46:
> In file included from /usr/src/sys/geom/eli/g_eli.h:49:
> /usr/include/stdio.h:286:6: error: conflicting types for 'vprintf'
> int      vprintf(const char * __restrict, __va_list);
>          ^
> /usr/src/stand/libsa/stand.h:262:13: note: previous declaration is here
> extern void     vprintf(const char *fmt, __va_list);
>                 ^
> In file included from /usr/src/sys/geom/eli/g_eli_hmac.c:46:
> /usr/src/stand/libsa/stand.h:265:13: note: previous declaration is here
> extern void     vsprintf(char *buf, const char *cfmt, __va_list);
>                 ^
> 7 errors generated.
> *** [g_eli_hmac.o] Error code 1
>
> make[1]: stopped in /usr/src/stand/geli
> 1 error
>
> make[1]: stopped in /usr/src/stand/geli
> *** [all_subdir_geli] Error code 2
>
> make: stopped in /usr/src/stand
> 1 error
>
> make: stopped in /usr/src/stand
>
>
> Tom
>
> --
> Public Keys:
> PGP KeyID = 0x5F22FDC1
> GnuPG KeyID = 0x620836CF
>