From owner-freebsd-current@freebsd.org Wed Feb 17 09:29:40 2021 Return-Path: Delivered-To: freebsd-current@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 374AA53903D for ; Wed, 17 Feb 2021 09:29:40 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DgXc30thzz51Tg for ; Wed, 17 Feb 2021 09:29:38 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [178.17.145.105]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 31CF02601CE; Wed, 17 Feb 2021 10:29:31 +0100 (CET) Subject: Re: Is stand/kshim/bsd_kernel.h 's __FreeBSD_version supposed to track main's 13->14 change? To: Mark Millard , freebsd-current References: From: Hans Petter Selasky Message-ID: <08432804-9b2c-0697-ddef-a87a34b2bf65@selasky.org> Date: Wed, 17 Feb 2021 10:29:15 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DgXc30thzz51Tg X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 88.99.82.50 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-2.30 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[88.99.82.50:from]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; ARC_NA(0.00)[]; SPAMHAUS_ZRD(0.00)[88.99.82.50:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEMAIL_TO(0.00)[yahoo.com,freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 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: Wed, 17 Feb 2021 09:29:40 -0000 On 2/17/21 1:58 AM, Mark Millard via freebsd-current wrote: > stand/kshim/bsd_kernel.h has its own define of __FreeBSD_version and > seems to have last had it changed in the main branch as shown below. > Is it as it should be for main 14? It does seem to have skipped > being updated for HEAD 12. > > Last change . . . > > author Hans Petter Selasky 2020-11-18 13:22:22 +0000 > committer Hans Petter Selasky 2020-11-18 13:22:22 +0000 > commit a2dd1caade2f9cb829261a42812431781c685d46 (patch) > tree 466a86138a99f5f6c73c54cd531dbdb9884678c0 /stand/kshim/bsd_kernel.h > parent ac8c4a61af5007487eabf882e969dd9768549078 (diff) > download src-a2dd1caade2f9cb829261a42812431781c685d46.tar.gz > src-a2dd1caade2f9cb829261a42812431781c685d46.zip > > Fix build of USB bootloader code by adding checks for _STANDALONE being defined. > Currently the USB bootloader code is not part of buildworld. > > MFC after: 1 week > Sponsored by: Mellanox Technologies // NVIDIA Networking > > Notes > > Notes: > svn path=/head/; revision=367787 > > Diffstat (limited to 'stand/kshim/bsd_kernel.h') > -rw-r--r-- stand/kshim/bsd_kernel.h 7 > 1 files changed, 5 insertions, 2 deletions > diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h > index 4dfe307fef0c..89d87121c63e 100644 > --- a/stand/kshim/bsd_kernel.h > +++ b/stand/kshim/bsd_kernel.h > @@ -27,9 +27,12 @@ > #ifndef _BSD_KERNEL_H_ > #define _BSD_KERNEL_H_ > > -#define _KERNEL > +#if !defined(_STANDALONE) > +#error "_STANDALONE is not defined!" > +#endif > + > #undef __FreeBSD_version > -#define __FreeBSD_version 1100000 > +#define __FreeBSD_version 1300000 > > #include > #include Yes, please bump, though not critical. --HPS