From nobody Wed Aug 16 18:11:32 2023 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQx6K0h1tz4qwQ2 for ; Wed, 16 Aug 2023 18:11:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQx6J3VM2z4G8l for ; Wed, 16 Aug 2023 18:11:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20221208.gappssmtp.com header.s=20221208 header.b=qjOoDGDT; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52d) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5236b2b4cdbso8911870a12.3 for ; Wed, 16 Aug 2023 11:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692209495; x=1692814295; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=xrdoMrvwMo4JCRJJv7XEuo/7Si3bJdZYD7YqhGRc1mE=; b=qjOoDGDTKWQtrCCl+qwrcpZ5iIvFCCCSR6Jqy1Y5nhI4qm/R7KJiG4NIKynxR5HGr6 MiVRRp+0nh0V3Hxy97pRRqrik7SRLCLPYXxAjLfFFioc6rMXZjfmD8FS9cwISc22Px4Y cMb9vMp6m+bxxomuaPpxqoHbwo9ZCHdKdYqXtdchGiuZfTvS4UAv2su263X6gzP+ga9A AzAwacTM+W5XIMcq6KFe5vsajf4UvodCx67F/uWcs6v3ZmrT/Ni+2AW0xALAy+2VRUwc 0WTKLQgnFChBLPcn7wGuGgTQrxOAU09T/Ud0Wr1qfAhau/WUkL4WDc3XiECVKPhkvPP1 SJGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209495; x=1692814295; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xrdoMrvwMo4JCRJJv7XEuo/7Si3bJdZYD7YqhGRc1mE=; b=TPMZ+iFHmyoN+Tx/Xpi2aO4hrChH5t4pwispzqpI+MYY04f+gCniaIOKwU9eoTH6rq u/H5fxVWp9kvmyP/dCYL/l6HRmoHOkV7WZPYzs/FBOortFDEtB81cG/rtFDXs/xjF+Uv EfV2iF8OQKxpSTPPFcHxGkVsm1I5xPI2+BjKgC/LDZzocfL3i6uqBoiUmudBjB0AbpHm SXop2M6YfGDPSv7TWIDFwKNbzrBXOEn8OejiICs2QaSCt6sOAJhjF9IsDD6yZCc/RwYC uG8SvuC3LUhRsx6Mk1Z+xhO4+6/mAZfIkGVyna/hPd/YYjN2ohOLXNb8PWpXVJwGN0gx wvOA== X-Gm-Message-State: AOJu0YwyhCbUp6NNKs/AJpmkbAvjH+mnkH6zFeML/MeVI1kFWfRjcBIE c0aLawpCFNv0KDVPjtA68GzkMTFRYqpB9RCLq0QN7KYAGweJH7Uk X-Google-Smtp-Source: AGHT+IF/SOhT5ja5snJ8Jav3eYoi8bkBo7orvQw9dz1IUfHvcKPnD9fYCOlGglI72jC1ghX2aCKFzwyhjYo2uUfbqkQ= X-Received: by 2002:aa7:d482:0:b0:523:38eb:395d with SMTP id b2-20020aa7d482000000b0052338eb395dmr2147050edr.9.1692209494681; Wed, 16 Aug 2023 11:11:34 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 From: Warner Losh Date: Wed, 16 Aug 2023 12:11:32 -0600 Message-ID: Subject: HEADS UP: $FreeBSD$ Removed from main To: FreeBSD Current Content-Type: multipart/alternative; boundary="000000000000d1017b06030e390a" X-Spamd-Result: default: False [-2.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20221208.gappssmtp.com:s=20221208]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; R_SPF_NA(0.00)[no SPF record]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52d:from]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; TO_DN_ALL(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20221208.gappssmtp.com:+]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_ONE(0.00)[1]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] X-Spamd-Bar: - X-Rspamd-Queue-Id: 4RQx6J3VM2z4G8l --000000000000d1017b06030e390a Content-Type: text/plain; charset="UTF-8" Greetings, I've just pushed the results that remove 31,035 instances of $FreeBSD$ from the main branch. >From this point out, we are effectively done with $FreeBSD$, though there's 4 places where $FreeBSD$ still exists in the tree: (1) In the contrib area, we have 621 remaining. I didn't remove any from contrib code. (2) There's 140 $FreeBSD$ or similar tags part of 'static const char rcsid[] = "$FreeBSD$". There's too many different styles to get with automation, and they are also intertwingled with sccsid[] entries, other SCCS tags and copyright strings. These will be sorted out separately, since we need to talk about old sccs tags in the tree and sort that out too at the same time. (3) There's one $FreeBSD$ in a version tag for bootinfo for chrp bootinfo.txt. I don't know the effects of removing this entry, so I left it in place. Not sure it's worth fixing. (4) indent tests remove $FreeBSD$ so that it doesn't screw them up. This is likely harmless, but could be removed. I didn't want to mess with it, though. I've removed 99.5%+ of the 'live' instances in the tree. The ones from contrib should be removed upstream and I plan to do a MFC-like thing where I cherry-pick some commits, and run my script against stable/13 and include the main hash so our scripting things it's a real MFC (the diff hashes will differ, so git's native tooling will take the slow path, at least, and may get confused otherwise. I've built world on aarch64 and amd64. I've built kernels on all the architectures after this change... or well, last night's main. I eye-balled today's changes and they all look good, but there's no incremental building with this change, so I'm starting a new universe after I loop the change back into my tree. Also: expect long build times, git fetch times, etc after this. Thanks to the many people who gave me feedback on the details of this change and how to chunk it up. Hopefully the 40ish commits was the right balance between 'all at once' and 'every dir'. As always, if there's any problems after this change, please let me know. Warner --000000000000d1017b06030e390a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Greetings,

I've just pus= hed the results that remove 31,035 instances of $FreeBSD$ from the main bra= nch.

From this point out, we are effectively done = with $FreeBSD$, though there's 4 places where $FreeBSD$ still exists in= the tree:
(1) In the contrib area, we have 621 remaining. I didn= 't remove any from contrib code.
(2) There's 140 $FreeBSD= $ or similar tags part of 'static const char rcsid[] =3D "$FreeBSD= $". There's too many different styles to get with automation, and = they are also intertwingled with sccsid[] entries, other SCCS tags and copy= right strings. These will be sorted out separately, since
we need= to talk about old sccs tags in the tree and sort that out too at the same = time.
(3) There's one $FreeBSD$ in a version tag for boot= info for chrp bootinfo.txt. I don't know the effects of removing this e= ntry, so I left it in place. Not sure it's worth fixing.
= (4) indent tests remove $FreeBSD$ so that it doesn't screw them up. Thi= s is likely harmless, but could be removed. I didn't want to mess with = it, though.

I've removed 99.5%+ of the 'li= ve' instances in the tree. The ones from contrib should be removed upst= ream and

I plan to do a MFC-like thing where = I cherry-pick some commits, and run my script against stable/13 and include= the main hash so our scripting things it's a real MFC (the diff hashes= will differ, so git's native tooling will take the slow path, at least= , and may get confused otherwise.

I've built w= orld on aarch64 and amd64. I've built kernels on all the architectures = after this change... or well, last night's main. I eye-balled today'= ;s changes and they all look good, but there's no incremental building = with this change, so I'm starting a new universe after I loop the chang= e back into my tree. Also: expect long build times, git fetch times, etc af= ter this.

Thanks to the many people who gave me fe= edback on the details of this change and how to chunk it up. Hopefully the = 40ish commits was the right balance between 'all at once' and '= every dir'.

As always, if there's any prob= lems after this change, please let me know.

Warner=
--000000000000d1017b06030e390a--