From owner-freebsd-current@freebsd.org Fri Dec 8 20:08:59 2017 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C1F0E8DE69 for ; Fri, 8 Dec 2017 20:08:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2020D2A67 for ; Fri, 8 Dec 2017 20:08:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22e.google.com with SMTP id f190so7046195ita.5 for ; Fri, 08 Dec 2017 12:08:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=UJ1EmXPHoOwGPUNb50e3uuKJKeWhwsD4XLedcHNuYnc=; b=ludvwp/HNvUioseolXujVly7xilj409b0+ReDbx71bT+iGQ1vLzc6LWKhRwHnhxCfi Jw3JIzB9budl3qsRq9AZFYzYQVRNdGMwkR1/GAyZhDCOBN96ktrXwvqTuXxu3a6SnqaF gavq8iYqy9ogPDqBgnctSFUaiaV0kFjhHtdX7lalqn/EsCf/ELlKZRlwI6vlI6Sf4zfb HUQVZYSN9r5RmOe+odJkxquCdCo5IE6HFwRnKbnEPyuiUNfb6uyM96MKFMBtGf2cMTkg LQmCiVo5LkRO6ykrVkkT7lr8ICh9aCGmhprfcEAvQf+VtFTFV26fTzvmZyg7e7QUuHpi 09DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=UJ1EmXPHoOwGPUNb50e3uuKJKeWhwsD4XLedcHNuYnc=; b=mbWwhyeH9HCTL6sSaHJlpXmNm/7w/+XLGci4C9gugLLD8RRrZ2KQFnBP2KSBnflorn /SKgjpCyc56B3fBfVjs+9DsPsivaJlMrFAnMZwiwBRPBTHv6N4HyHOeARs4dkCoh3k/f xhv9fDRm6gc7qp1lKazR7bc3+XLqnbwjwT80yW8uqu/MgyBaqGR83bQQqPSf7vHp3ScS /jUIEeXvPoTMtPCbdarTdZqqG7pQjNTXShKx/gVH5jM/M7OB3ZPHT+FACNg6yF958CDQ koCGn9BqHnSXsKhRwT7fx0m3OBtMsgk3qW4JZMXni+sslA02hFSgRQgUx0FW6AzrIKST A8wg== X-Gm-Message-State: AKGB3mLQBbxRj3eNCIplQGfD0C936RA5VHNxjrbDrvYhwx5YxwqVQnLj dApJuXaYTeh/cQa3i0EwLWier54q9cJp/BM67fFCWw== X-Google-Smtp-Source: AGs4zMYmY5zvEaCZ9TbvxGFGH10yuRJatSZv2sqherPLABvGTXKMEB9Bmp+nOiZZUNr2Xl6skduTpe+FYe0zeZ9AhJ8= X-Received: by 10.36.77.143 with SMTP id l137mr7597868itb.50.1512763738436; Fri, 08 Dec 2017 12:08:58 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.108.204 with HTTP; Fri, 8 Dec 2017 12:08:57 -0800 (PST) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: References: <20171206164801.GA1055@mail.laus.org> <20171206222155.GA1792@mail.laus.org> <20171207001720.GA2058@mail.laus.org> From: Warner Losh Date: Fri, 8 Dec 2017 13:08:57 -0700 X-Google-Sender-Auth: -d2_xZo3b0JN_ct84cnHsUxc_kE Message-ID: Subject: Re: GPTZFSBOOT in Current r326622 has problems To: lausts@acm.org Cc: FreeBSD Current Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2017 20:08:59 -0000 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 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 >