Date: Wed, 17 Feb 2021 07:33:40 -0800 From: Mark Millard <marklmi@yahoo.com> To: Hans Petter Selasky <hps@selasky.org> Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: Is stand/kshim/bsd_kernel.h 's __FreeBSD_version supposed to track main's 13->14 change? Message-ID: <80FC7402-5DFB-42E7-BC88-61424E52B541@yahoo.com> In-Reply-To: <08432804-9b2c-0697-ddef-a87a34b2bf65@selasky.org> References: <B7840F9A-C579-4C77-9714-269A93D9BCE1.ref@yahoo.com> <B7840F9A-C579-4C77-9714-269A93D9BCE1@yahoo.com> <08432804-9b2c-0697-ddef-a87a34b2bf65@selasky.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2021-Feb-17, at 01:29, Hans Petter Selasky <hps at selasky.org> = wrote: > 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 <hselasky@FreeBSD.org> = 2020-11-18 13:22:22 +0000 >> committer Hans Petter Selasky <hselasky@FreeBSD.org> = 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=3D/head/; revision=3D367787 >> Diffstat (limited to 'stand/kshim/bsd_kernel.h') >> -rw-r--r-- stand/kshim/bsd_kernel.h 7=09 >> 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 <sys/cdefs.h> >> #include <sys/queue.h> >=20 > Yes, please bump, though not critical. I'm not a committer. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?80FC7402-5DFB-42E7-BC88-61424E52B541>