From nobody Wed Aug 16 20:25:23 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 4RR04g54tcz4Tq0N; Wed, 16 Aug 2023 20:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR04g4TGpz3dXh; Wed, 16 Aug 2023 20:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692217523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgL0OF4+Eab/22aBa5p/fAqa96V+LaYnhZDRmY4R7PY=; b=bQyvdslX2l4Zuwi/wLBVCVais/sDSFV2Ep6+vwlSj7DIhrUt1JnHMxd2qMAdvnBbboyE5G rhbAW8ZzUHCmx6AbSp1p8mfVUOICpi6q4oIBsNjhUIk8HobpX64jbX3wV6jbliZZvIQKqO QuW1rL8MggcCG2IFx2urPfwt39Kj1oSkZtwjWg2UXn+JrTfLWTo15lqNwIaYXi84qTrSuk wdNhFsOzSp0KZ1+ymUjcsuPVsOgeoLDDabrGexDwI1Hsvfo/c9mdIoGZDA2YbWEzF1zkJM krxrXwiGwKPefzjNqrPNRcM9Le5Gb/pv5s4RlByG8moI7ZEXcXYRaJ77eM/mOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692217523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgL0OF4+Eab/22aBa5p/fAqa96V+LaYnhZDRmY4R7PY=; b=cMdE9y0OhG2gS7cglNl4n1kNlwk39oxxp/op262IaQwf0JNXD06kizJow4blHyoOKAKC5+ cIqACR/EakwpubepYKxiYh5jwryzG07Eg+lug4ystqCN3rPa69MoLrWUGeMyuMgoFjVShB PbsBhmx4wVyUcSU6/CjRCZjIx72fpUCKeKrczAC7E/eK4S+W33kxVpp4S/coDtP4Ee3bzy A1fA3AhwYV0fuP6I+gm3pv+OSU4Xob2TF1NDSbms+p+80z1ILEnUQQ4JK0jh76oZRAQlYO kXRdcsvCZIpFn1mjtvl1SBE3qnmM7L1cA4tDPX51n0xySsouVCrZXv3fSTdgNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692217523; a=rsa-sha256; cv=none; b=resZB8lguFFzCJT0O2MhsrGdhc3zo5SgPGvi0b23vY3jT8tyPcCwKBlNFfvgl7BstxuiNz c7plKFK9+dWeyK60KZ43JgXa/TeflUDtgjkAMTVLEXpd27R7Z2vvx/PQrcQvaVhamvZmc2 CzS+GF0RLo1aWxPM4zVL5gk0+B5/NJ6kgLgLD7nO79uflYK03EZ5J/8ZoA39pe3Ga+7ArH qEnZUraBgn0z3pye6RQWvkU7Xb3uc5aWLHmHo4xyFOceXlYGwwGT785HntT6Yd6SnXrceV HinEbreeo70zE+Phobve2q0Ic3dZYzxRxEV1c5xOV6NMLBAF8DnPAxl6eFgASg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR04g3Sq7z15D0; Wed, 16 Aug 2023 20:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GKPNPQ029787; Wed, 16 Aug 2023 20:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GKPNrw029784; Wed, 16 Aug 2023 20:25:23 GMT (envelope-from git) Date: Wed, 16 Aug 2023 20:25:23 GMT Message-Id: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 90aad5d3e44d - main - makefs: clean up some leftovers after $FreeBSD$ tag removal 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90aad5d3e44d137ce80d2ec257de07c7c1367bd3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90aad5d3e44d137ce80d2ec257de07c7c1367bd3 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+=-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+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c SRCS+= 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 -#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= ${SRCTOP}/sys/fs/msdosfs MSDOS_NEWFS= ${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="makefs -t ffs" MOUNT="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=1024 : ${TMPDIR=/tmp}