From owner-freebsd-current@freebsd.org Wed Feb 17 00:58:25 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 2218D529A2D for ; Wed, 17 Feb 2021 00:58:25 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic307-8.consmr.mail.gq1.yahoo.com (sonic307-8.consmr.mail.gq1.yahoo.com [98.137.64.32]) (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 4DgKG80WCKz4Tx3 for ; Wed, 17 Feb 2021 00:58:23 +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=1613523502; bh=X84T7hVsa/aWKKs+qUkTI8BDnlo+CCljTj3v9TwbgTx=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=pk6KJWqU0wHHJEBbYEWWD+OEdVL5UuaXQ1G389c0vNrTOCpYcNrZNEcM5P9lDS/Zh4Ng8eu8k9fLz/8CwaRGsNzNoaegKybCyLt63eji1eTTmv/xFA2V9UQKxuupeC2t63pFKPDn5kVJ5CzOGxMgGGPAJCxWvJ3ULYWBgzqc/OVvvlSdOwbJk2YtIUMZ6RwaUBoiVxiQGTE0wL5PkMPQ9EUfr3k90kdfWxg7NR9HyuDHCAHRfDiCg+ioht704i+pfPciu00nyxUUL1iTZbJBVnMi2FJ0N1TE8VGUCBC+jjIz0eVeEj46v5Snai1jf9FceUoqtmysSdOYYf2mNZSUPQ== X-YMail-OSG: vNaCddkVM1kOz.eS2byRfg2do5v3HeWjL1Z9MmBZiiJl2eLd10S6xg55QKsJTW9 _BQgffx0RvOMhtdh1p1nVO8GBCNVO8lLvj05CtW1qiBoouvScsuB4hInJcSKsbdsOxXadPo_8eaa ImQ_jAwgZmULa4dsBPq6a9v7fXJ.tDn8_Gz42s77StyNKsRqUrh2krJTXYjayxqzBZRqAJPmAEer WHKP5tz.YGK.CC8bJc8pazBxGcdve81SYg86XgpSx08sfKQFNUk3Dug.kvi7JoZfujueA2hG3b.5 YjVE8k3Hr4Rr89c6HqHkKQDPvYNxFZW0PAHq0CO6qJw3dCitBxfXKLgJTN7dnvnIwgpBCRcGaoRN PCBn0GhfwN_B44iEzxBwl8RwVnT9MdvkXSM41mEqH54Eq85EiUn1jkNs.4vR4Mxpu7EErIm4Ao.I SQkMOtR0SXOpJ5aYCVIXVPUbNClkRvEsN055doQLgwBUtCdXR3vMRv1xzIKbXaTwvEmoN7K9VuMF us8A2xedXf8CdTq8CLerg.4g2CSa4aiApZUEt4LVqzOJOylLRDzrMSIoKXI9qP4nhS9E.dEqbi_T 2t3aR6v5eNr3R8m0YnjDh8hWM1ci45IyduZS145uDslOg54bqj.a.E_bUpnVxApS64.jznpCQkP9 WEH4CLUHw3pDq_To7HpAzBTr4ebzRIwlo8m6G2CQ0rePSajriz6kFRRtux..Ed1GaaT5j6czsQ0z NL3XJxoVOum64zDnB35TPNdINfw0b44rkhPiWgGSa0lhVBhERHoKyeOMqNpKzCG_kTKloG1_l1or 3HwZhFCJCtyBRJFlzD4Sv8UYiHJV60bZcjKQOjRKn.1WPJ3_QHSNIQgsa0ys0SFA80yUqBjdqAD2 tVVRGiBxrXKlcX_s6rQ_57DfID9W9PTFtflzwdwLIPxjE_P5vy.YoJ7If0ojW93JdtKE57GTfsxb XkrxPK3LiRhrQH6dtcI255fTny_6lp5rklUDL2lSdIDK0wE6Jj0PpMCb5rhMCK0ESk2voAc_rBRk Y3vEaXzRkqrWGsPdJYP59s28VEnKv0StTtnr8HpYB.u7C0nUV.ADpg.QohuIBrOzhqGwBUxVQuN3 18C19uK3ANpbFqyABT2RnoKbNuy4KcO2M_3Vy00adYSlyAzaTj7K..Qwg3u.joitUE0_S5s4vfgo 1LvpyCMPh7zYYlUjazYtrOYs3dU304u4WkrRMPKctw0o_2hYaLosyEc5KpmjI_PMovw9ahsZCS9D aE0fDNvvLtPoExzPqfXxXB2iIp7DzILUU4GzeT3CEZcMuZQjFQw032lM_r2BiWWEchnfQIL0PhqK fFSQyXUrqRCX403GyiDjb2HepohXtmj0rH3BQIx14CptxAVn7xfHw2fToU05gU5cl17MmdxuNGB4 aYSDpuwO.dIeCqOY2o1gHThJh7rPOGlafMomObcG_PNDml_VvsDuSJjSIykFb6AfHTM31W_KCgrl V3.AcJOTRne6HECspe638GH9f3mvKFesBbnomv23hH8WTDtrZ1CkCUIOrXvWTkR.uE4K8FRA0DHT X21IkEzPH5z.q0UXOs7HJnxVqPgapvaEUvqsRGhd7Gt9ggEDN1QNSsqyuWYRgCrw6r9aLod244Rf wbwC6e8uKC9K3fctoZDirFfokd0qPEd6Mr7Td3cpH6O6nphMUSsFfxAOjXI87cQtKDLy5IsCDZuW xBr4MRENGhkUzSPAqMa.HOJs_QP60MQp8cW2floD5SMkxGQAgSahdiUw4O2bCq..ClRajbtRsc1V GBjOxRvecgLAco4_s1KwXP_AM2ljJCwypEqIfIqJzkOnH0zqNfPpersgL.RMyPjetK8SgMia92Lx YlYcDkbZSQaa3tPoQ_J_xNW4tMaLo6gmYKHeHXjAEYDDYrkMyAsf2km2bOdylPFD3GtqiX8FEOPc D_FFrWNHoS3_T3uDBo69I1D3K9srIlGbbT2RrDDykzJNeqU8p51KESx5u1YCX7xhlCnaXfc8vHgQ eU21P0AQbNoSpvYedbq8cOzWssttdbpvO2V9r.MiLYl3BVve2lbLvSAGk2Ww6VS5.MwAvf5Zfh91 .i3.CYn_XuAWG6MoRrSEw.qW7kl4hth.4Q8uDnI0djsq9TkuLPgJwnFBKTDW6af6xNVuT5NHmjl0 Sdv0mO6aJ2NO.L9x34sw63sWIvxeunboZPTtO2HR0qUa48GwIIoJQjBXHUQQDOvg.6Bt0AM7iAut uqCQ3NAhgYgEk5oUQmXV1dpY_R91m7_p1mYuvaHOtWaSL9u.d2.f11Aj2HXK8KSFbBzEoH0txOwg WPIU1zDP.kLV168FWACQzpfxJVkQDF1M8yrRk.MDUGpNrDbbxkZXs0LW.XekHTxFExtLT3E1DZnu TsiU7brKeXaWVPrLgF_ToKWq5I8jAL8CLcf.7Dar9a7ocW7BCWN1MdLdY58A9pJ.uGy0BpcRNgOa FpZ1CTVxHdAmZaSg- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.gq1.yahoo.com with HTTP; Wed, 17 Feb 2021 00:58:22 +0000 Received: by smtp410.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID b8a23f2501bc23ed9894311a2cbfc9e4; Wed, 17 Feb 2021 00:58:17 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Is stand/kshim/bsd_kernel.h 's __FreeBSD_version supposed to track main's 13->14 change? Message-Id: Date: Tue, 16 Feb 2021 16:58:15 -0800 To: freebsd-current X-Mailer: Apple Mail (2.3654.60.0.2.21) References: X-Rspamd-Queue-Id: 4DgKG80WCKz4Tx3 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:+]; 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.64.32: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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[98.137.64.32:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.32:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.32: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 00:58:25 -0000 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_ =20 -#define _KERNEL +#if !defined(_STANDALONE) +#error "_STANDALONE is not defined!" +#endif + #undef __FreeBSD_version -#define __FreeBSD_version 1100000 +#define __FreeBSD_version 1300000 =20 #include #include =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)