From owner-freebsd-current@freebsd.org Wed Feb 17 15:33:48 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 302E2545AA6 for ; Wed, 17 Feb 2021 15:33:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-54.consmr.mail.gq1.yahoo.com (sonic316-54.consmr.mail.gq1.yahoo.com [98.137.69.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DghhB71mVz3hk9 for ; Wed, 17 Feb 2021 15:33:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1613576025; bh=um4F8/JGk1JfkJclaDjteJlbPHbXRKPmYBEm/w6gj7U=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=mbJI1k0cFgkCkRX8ZGvno1gYGoaL9ZGbAr2dQpAK4O7lo1TBxGCInqcE829rnuacWSThJYB//4QeAe7vLSagqMpvL0wBc3BoJsesIR9QbdS6psoM9Bnji9s724Upp1vgSbXGtcgbhMz/AagvF7nlEQ6pSnDOV/jgdFpzQPLj9ujkY4rCv7S6UCLGGmg0UZzpRXe9H5Yuje8rHgIh+/pHaOZVmMPJeMM1ALtCvQnc+/PmalGgE8NfbV/Y7jIgkp4VjfLWkc0UHctshvFME0Znr1LoNt+5e5q18Dkt4tI71jbtqxg7hJ6uTCFmOakJvzE2PKtB3J4dnjHomoi5XVxGDA== X-YMail-OSG: G9ZcZ5EVM1l1sbviWvAzwZ.RZQy6bAB2OPYmKU6.m1vnoeT1JLYQEaeHZlk82mz m8NNHOpGbhIfnPbCSpYoHukEK0JUWR9zVpyAWp.09qbSTjlu657nsAkQ3kGHytNkTTlo7WxYUEHc GlfCnorPZC0EkzPkLdl3REdfWoYZVSlrU4urxlykVfP.1Ugu7CwXiJWmrBAnviDGowHNuesuYndT V1Dx5eeMGYA1Fnn7U1UBQlzPxM8gbien73LtaMIV_DAlxBaqSrBnMuqDZjRWPLigyJ0hX3FlU7xZ cdh0FBeKXblI_034XwC55xIHnxai51.hD_NH294fTyqdKQJpApGudHlUOgdKhvSOWe300bCEamwR 1Og1JcfDKPxBqGOR66AvgxeI5EbQOwCfGjDSjiGMPIXbH.nU4HOK4oO2wyVYnp0c9Lyr_sLRCEpc QFevMga9YbUaCPzQP1c2xLjNrXIslBn3gzQoBSp22ZsJiB5JlaBzZY27xGOc3cDdtCgHTQ2ac8oF 5iP0OX0n3UTc_z3hu94VQ.fb8dwHwWJw6OxF4asXVj0jptwAfiPvsHTHNFZle34Sb3NMbjDFFiSQ GVZzHR4RWhGnLTdbF_rOgHNOukXBHtopzVLPws1wTSpGmUKUiWizbtnFNJAKBrJWdcgwaBMo3NVc zMuIbvXRO7MYeA7XFV3eM8S22OZJi8khphtiE3KjMQZYXHZH1h2dXIs1Y72W_w5P2UiQUJvlutHS QAcy3P2cmJzIZnSky_uJSaVNgZ1cCTYHeBwajwcasR26FQ.8vOCxIFKI1KiwmA76Pt27SJAKJS.p vuf0T1RjMRPSg1HBYDcem3yqFoky_Ve2dy7F80hqYYlMyDqulj.r8nFoZWm6KEEnGj21yB2nzkwu 9hXDgpKaw81_yT9rI74D65ilLytitdo4JEbph3BNNibceBXZ6YWcsVpZNeKgju5uq3bANnL.anSl omOGwKl3lwjRPHj3KvV_DtmubJqrAb9Q9oQmqNaoW92aExDOeZUKFsFYNVaCMogddNW4cMZppFZp 5CvVa7SELhotMGMRO3d6SClSPauAfWemOUJtvR_Z2MaCBS.ZORcyYc25PfdoosiSGRcjRV95xpEs IAc4.yoV0Mpes3Su5GgRFhw_mn1NQ5YgGNAPv7gplc.x2.0rK1e4zq._dsv0rDrPfj1PudEJAOPS GH7CW1xYWsf7pA2XTMDrdsBTBVPbSacV2RDFCcwxy8bvYy4.aQbqRnORD1Q1MnpV35EWC4tlcT.z QtQbYWyUzH46Oz.zcWm4G55ttpreviqbzUQDSc1a63g_Uodj1WAvx5.Ba.nM2eCQnh6fgXmW_..8 nKNSEjy7BetQJb_GNYdWvjf.wQYwG.9NPP.N6bi34_SdZe0QOhsYUu.wVT3vz0pUaOOWrtCVYRjA ZvmdxkkOvCRFeZTYfj4zThspGDtlh56jpz10f13xZFQQdLtop7cK0P_RXvRUqG0eWpTpmwNfAgtr edgI_E6Tj2Uo2D6T0FTyH266RUNE.3jzrXbIxov9olsVhyd4V3VKehh_hE_ac7Hxx_wXtv4GLc3l IjYddH2nj5fP7RzpR.RTBJRK2tfiS4OKP6Yhb2mMpvLLvSg._DmeLVAzfBpTfDWUNQFtDF809_li d0udPnVgnCF0YEbgqv8WoxiD71lWXcDOlmMmDiNRcanCOg0grdGFFUZDA_J6y2qVMaRH1eLTiHQu KH._c3TZyq_raPSVE.2jHkk27r0RMnG8Sv7rsZIa8FN3DsNkLzHM_NTO1ZVldkQRtWk3OnGpsi9Y ONgudfAiSlBsGpOggFdpmbxxG_IShQnYk0IJrzmwTDKTciFupaldnEQaVoVOn1luv1dqIz3deexU LSdvTZMBRN.1aDru6CPVdKOBwESV0JeVEqJ3FenAn8Q83CEX1TDOgKkk86G4smeSMMXG5mY4Wm_a dgrb_z6HdDtvfdAZMpjJx5nZHWmmk3ItbocA7KE9kyF29Q2lw9MYjpuxJCz8VjId15AXwii_otO. E6ToZErs7ux8QZZ.h35q0S7VX2ARuYfsRH06f4FWGvcA2QUgHFOYB3Kh4zkvDB7Uinljgk440Wdo GOivHyV0cbKoKAvnwHoG87QonfFkyGVLkwHO7iVietfcuN4ZOZcQ5a_Yih75u2ZJMWZzeZVHhel5 dDkxpEnZ8oqNX2LhnuG4QOT6_VkEkEsAXXWwjekTaxNsHH2O1sJEjvrbJRIEofs8u3he8bwnw6A8 D2FEm_ktaplIRrAX4iSlrpJRGWUbkfYrjPDC_qlWkpBu87LIavOusITuilnPtzg.5ZKgGQEKW7XM uQX_rOG_54rBGYimrYgEh8tPkl5Jx4AuTNoD0VHyKcoSViOC1PzIBOHp0R7juXdhOuIF.XU4TRPH ra0kRCuifnH22O8n4qKEgDCZvX26psriMEDJbme0dz7AqYxoSOo5nah8yn3oIPtRRHagMQ0NlYjL BUg3tWhm872dgY2gWQekCdzeikmi1dmWFCDiap0uFmZRYxN9gVkDMLSpfG55LnrXTtcWW_nTtFKt o6t3_XYkKZYhobxtrE3eUZPW43WXsu2fiYMmWkV0D.TxKCfs3eA-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Wed, 17 Feb 2021 15:33:45 +0000 Received: by smtp401.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 52514676db0a3f12ae04e4abc7ff27e5; Wed, 17 Feb 2021 15:33:42 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: Is stand/kshim/bsd_kernel.h 's __FreeBSD_version supposed to track main's 13->14 change? From: Mark Millard In-Reply-To: <08432804-9b2c-0697-ddef-a87a34b2bf65@selasky.org> Date: Wed, 17 Feb 2021 07:33:40 -0800 Cc: freebsd-current Content-Transfer-Encoding: quoted-printable Message-Id: <80FC7402-5DFB-42E7-BC88-61424E52B541@yahoo.com> References: <08432804-9b2c-0697-ddef-a87a34b2bf65@selasky.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4DghhB71mVz3hk9 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.69.30:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.69.30:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.30:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.30:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current] 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 15:33:48 -0000 On 2021-Feb-17, at 01:29, Hans Petter Selasky = 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 = 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=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 >> #include >=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)