From nobody Wed Aug 16 20:26:40 2023 X-Original-To: dev-commits-src-main@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 4RR06R4fg5z4TqL8 for ; Wed, 16 Aug 2023 20:26:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 4RR06R23hdz3dpF for ; Wed, 16 Aug 2023 20:26:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-523bf06f7f8so7549691a12.1 for ; Wed, 16 Aug 2023 13:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692217612; x=1692822412; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pkFYtNYQpSltj4B2SSYr9NqhhaeVTaIRarknFW3be4Q=; b=ofttfl1VHXFtIdeocuqS8bMfZAgzEqHtbR34HDXFBPwirBjCNZnJuqPkaf4bDmBrJU YI1qoIv5t4xFK4I80ogWQpuwt1PRviLbuBs5JaSCLITeOw3jsH9D3014htav3BDFzR7F FNxYfHaKKH3sObsHsno4Nd5h1U7BAHmfwu5OljrdBP3YulzolT1+auyn6RcLWQy6WP0L bGfjf5LOK9XBF4clGjg99uO00yxp0rKKUkFIM2zRQi9ImXp0OZ+U+sN8E7b560H6lgsW H3O4scBMsOFbLJsWsJBCx+hpzyLLfpY/Z5oUcFmlmOiNqCGLhTrPrLEMyvdfariKryN6 Xdbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692217612; x=1692822412; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pkFYtNYQpSltj4B2SSYr9NqhhaeVTaIRarknFW3be4Q=; b=WLKbsy7ifcKjhcXYUU4TgP9YXZ5DaKxz2HmIXKXVVtv4CqpE9hQk3TBT1hx3PbFhRy EGME25RVTY9+UpQo0kSzTwHl4XcvvN9wBniN3C5Wj+IGpXV/argnxy+VAFACkbzykBXo gn2jV9fe+gzaNR4WwfmF8mnZtbP0743Kb1FztdHYcbfCVl8xNG7iAWbwpWwv1Ivrbles C/2L7d/o3XPnXTR5ai25RjyDUf0E80cDiHCAcDf7VldP/t34WAkXpS5GzAgJQ6d/Zkvi P9t1cCHcK6Fse5V5GHRaTbUaUGl7grrRvtwvNETWDLCKgA2E785rj5cmOGsESdIoVUpZ sAxg== X-Gm-Message-State: AOJu0YwEj4ODScxx8v9B9y81PFVbFDgWRJtV5JjPn5T+POHUI+TeKb9h QcZCDXNRGgivkO+EIO09ZJotzePnd4/72t9eNCDRHg== X-Google-Smtp-Source: AGHT+IHxoi+uoOYqcfMa3Q9rbUjPIeYKCwEM10p5Gp2xCdbDzbMq1POXyNNcURniCjXoSzZGAMJ5L21sIwN6tIwfG0k= X-Received: by 2002:a05:6402:164e:b0:525:d95b:cd46 with SMTP id s14-20020a056402164e00b00525d95bcd46mr486838edx.2.1692217611667; Wed, 16 Aug 2023 13:26:51 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> In-Reply-To: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 16 Aug 2023 14:26:40 -0600 Message-ID: Subject: Re: git: 90aad5d3e44d - main - makefs: clean up some leftovers after $FreeBSD$ tag removal To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000a060400603101d8a" X-Rspamd-Queue-Id: 4RR06R23hdz3dpF X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000a060400603101d8a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 16, 2023 at 2:25=E2=80=AFPM Ed Maste wrote= : > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D90aad5d3e44d137ce80d2ec257de07c= 7c1367bd3 > > commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3 > Author: Ed Maste > AuthorDate: 2023-03-30 14:02:02 +0000 > Commit: Ed Maste > CommitDate: 2023-08-16 20:24:37 +0000 > > makefs: clean up some leftovers after $FreeBSD$ tag removal > > Fixes: 2a63c3be1582 > --- > usr.sbin/makefs/cd9660/Makefile.inc | 2 -- > usr.sbin/makefs/ffs/Makefile.inc | 2 -- > usr.sbin/makefs/msdos.c | 3 --- > usr.sbin/makefs/msdos/Makefile.inc | 2 -- > usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 -- > usr.sbin/makefs/tests/makefs_ffs_tests.sh | 2 -- > usr.sbin/makefs/tests/makefs_tests_common.sh | 2 -- > 7 files changed, 15 deletions(-) > > diff --git a/usr.sbin/makefs/cd9660/Makefile.inc > b/usr.sbin/makefs/cd9660/Makefile.inc > index be08e8e34cd9..e596309a6243 100644 > --- a/usr.sbin/makefs/cd9660/Makefile.inc > +++ b/usr.sbin/makefs/cd9660/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > .PATH: ${SRCDIR}/cd9660 > > CFLAGS+=3D-I${SRCTOP}/sys/fs/cd9660/ > diff --git a/usr.sbin/makefs/ffs/Makefile.inc > b/usr.sbin/makefs/ffs/Makefile.inc > index bf62ac8bf926..0db1750ab282 100644 > --- a/usr.sbin/makefs/ffs/Makefile.inc > +++ b/usr.sbin/makefs/ffs/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > .PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs > SRCS+=3D ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c > SRCS+=3D buf.c mkfs.c > diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c > index 75aad6949203..8353f06315ac 100644 > --- a/usr.sbin/makefs/msdos.c > +++ b/usr.sbin/makefs/msdos.c > @@ -33,9 +33,6 @@ > #endif > > #include > This should have likely been deleted as well... I'll add it to the fix for the other minor issues people are coming in with. Warner > -#if defined(__RCSID) && !defined(__lint) > -#endif /* !__lint */ > - > #include > > #if !HAVE_NBTOOL_CONFIG_H > diff --git a/usr.sbin/makefs/msdos/Makefile.inc > b/usr.sbin/makefs/msdos/Makefile.inc > index 3fb55c5394fc..78ddc7804b31 100644 > --- a/usr.sbin/makefs/msdos/Makefile.inc > +++ b/usr.sbin/makefs/msdos/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > MSDOS=3D ${SRCTOP}/sys/fs/msdosfs > MSDOS_NEWFS=3D ${SRCTOP}/sbin/newfs_msdos > > diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > index 3f9b37abee4c..2fdf47f76a4c 100644 > --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > # A note on specs: > # - A copy of the ISO-9660 spec can be found here: > diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh > b/usr.sbin/makefs/tests/makefs_ffs_tests.sh > index fafec4c885fb..2505b2e24d72 100644 > --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh > +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > MAKEFS=3D"makefs -t ffs" > MOUNT=3D"mount" > diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh > b/usr.sbin/makefs/tests/makefs_tests_common.sh > index 08f687fa44a4..12c7c7c84fb7 100644 > --- a/usr.sbin/makefs/tests/makefs_tests_common.sh > +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > KB=3D1024 > : ${TMPDIR=3D/tmp} > --000000000000a060400603101d8a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Aug 16, 2023 at 2:25=E2=80=AF= PM Ed Maste <emaste@freebsd.org> wrote:
The= branch main has been updated by emaste:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D90aad5d3e44d137ce80d2ec257de07c7c1367bd3
commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3
Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-03-30 14:02:02 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-08-16 20:24:37 +0000

=C2=A0 =C2=A0 makefs: clean up some leftovers after $FreeBSD$ tag removal
=C2=A0 =C2=A0 Fixes: 2a63c3be1582
---
=C2=A0usr.sbin/makefs/cd9660/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= | 2 --
=C2=A0usr.sbin/makefs/ffs/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 --
=C2=A0usr.sbin/makefs/msdos.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 3 ---
=C2=A0usr.sbin/makefs/msdos/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 2 --
=C2=A0usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 --
=C2=A0usr.sbin/makefs/tests/makefs_ffs_tests.sh=C2=A0 =C2=A0 | 2 --
=C2=A0usr.sbin/makefs/tests/makefs_tests_common.sh | 2 --
=C2=A07 files changed, 15 deletions(-)

diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/M= akefile.inc
index be08e8e34cd9..e596309a6243 100644
--- a/usr.sbin/makefs/cd9660/Makefile.inc
+++ b/usr.sbin/makefs/cd9660/Makefile.inc
@@ -1,5 +1,3 @@
-#
-
=C2=A0.PATH: ${SRCDIR}/cd9660

=C2=A0CFLAGS+=3D-I${SRCTOP}/sys/fs/cd9660/
diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefil= e.inc
index bf62ac8bf926..0db1750ab282 100644
--- a/usr.sbin/makefs/ffs/Makefile.inc
+++ b/usr.sbin/makefs/ffs/Makefile.inc
@@ -1,5 +1,3 @@
-#
-
=C2=A0.PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs
=C2=A0SRCS+=3D ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c =C2=A0SRCS+=3D buf.c mkfs.c
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index 75aad6949203..8353f06315ac 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -33,9 +33,6 @@
=C2=A0#endif

=C2=A0#include <sys/cdefs.h>

This= should have likely been deleted as well... I'll add it to the fix for = the other minor issues people are coming in with.

= Warner
=C2=A0
-#if defined(__RCSID) && !defined(__lint)
-#endif /* !__lint */
-
=C2=A0#include <sys/param.h>

=C2=A0#if !HAVE_NBTOOL_CONFIG_H
diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Mak= efile.inc
index 3fb55c5394fc..78ddc7804b31 100644
--- a/usr.sbin/makefs/msdos/Makefile.inc
+++ b/usr.sbin/makefs/msdos/Makefile.inc
@@ -1,5 +1,3 @@
-#
-
=C2=A0MSDOS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${SRCTOP}/sys/fs/msdosfs =C2=A0MSDOS_NEWFS=3D=C2=A0 =C2=A0${SRCTOP}/sbin/newfs_msdos

diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs= /tests/makefs_cd9660_tests.sh
index 3f9b37abee4c..2fdf47f76a4c 100644
--- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
@@ -23,8 +23,6 @@
=C2=A0# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT=
=C2=A0# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE
=C2=A0# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE= .
-#
-#

=C2=A0# A note on specs:
=C2=A0# - A copy of the ISO-9660 spec can be found here:
diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/te= sts/makefs_ffs_tests.sh
index fafec4c885fb..2505b2e24d72 100644
--- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
@@ -23,8 +23,6 @@
=C2=A0# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT=
=C2=A0# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE
=C2=A0# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE= .
-#
-#

=C2=A0MAKEFS=3D"makefs -t ffs"
=C2=A0MOUNT=3D"mount"
diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs= /tests/makefs_tests_common.sh
index 08f687fa44a4..12c7c7c84fb7 100644
--- a/usr.sbin/makefs/tests/makefs_tests_common.sh
+++ b/usr.sbin/makefs/tests/makefs_tests_common.sh
@@ -23,8 +23,6 @@
=C2=A0# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT=
=C2=A0# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE
=C2=A0# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE= .
-#
-#

=C2=A0KB=3D1024
=C2=A0: ${TMPDIR=3D/tmp}
--000000000000a060400603101d8a--