From nobody Wed Aug 23 17:50:14 2023 X-Original-To: dev-commits-src-branches@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 4RWDJQ3BjNz4r9jf; Wed, 23 Aug 2023 17:50:14 +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 4RWDJQ2Tllz4Vj8; Wed, 23 Aug 2023 17:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813014; 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=HHoKJmYBANkowXh4bHoOv5m4H22T/pVk6SkqGGoghow=; b=RkqiP53g0aWjj5PgZ6Dwy3cJQrtwO/B6cAU9ZqkiXuHFr0l70AG8y2F5SPtoDs+EM8C5n/ iemf1SvQE+R14rdD01RrklxrJB4FoP66HAhLfEHpsSl2Mn7rMn+OihqokfxM60bVRLESF5 dN9cQEBnRV32zGFO5SQ1rjhHuiU7fgm6jyy0hVmc9ZEUJ8GfTAPsThDwhdIiS7YeSHfleE v9IUExJfTJ24bLN6y5lJUc6F3SrCON8C9eNEIAi17Mqyr4AhgXKrPk1TwVv/AdIuoyIWIk yF0dQ2xOsmPZeDTa4QxVaibbs9uwMpqzyCPdp8K1NexO0XvdxEqDSVxcT4cl5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813014; 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=HHoKJmYBANkowXh4bHoOv5m4H22T/pVk6SkqGGoghow=; b=SJX5hKB0cq+JqXo/WXsOH4JCpaRf36pIDE40R7CyFxEx3CtfU5UKsLjFAZHuBcwU0OhoYS jBayR10l0cGTWzQWBAAZ7fc5Hz2MjhM9v1jn0k63ggNiOIEcDRkbMFCBEKB6Qps41WluIJ CUNTOAuQQEpe/MBk298qdnaI4c/n++HQW6/28KqqW2oQxY74ksvqJG6f1dipiqG6+Z13Ve bIPM25od26Yo7C88IlqNbeGGjmuZTOTJ0c4+QYHrguN7BUb5kv9suNbVvTeqaUjgnDybXr nqRxy+caR5u8EkolaHreNBRI3FEe/8vzHAjDYa+KcbGifDdNZ+n3XJ1iRhEJTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813014; a=rsa-sha256; cv=none; b=pdlDGEPY3ZijiNb03LeLSlzxti2mL0AKgr2MnjxuiXZzhyB0UptdNyB7uu3QGIMJk1dhRP YS8U5wCIMp60DuvURHQQOBJyXQNOQBlwgXN6PBDQQj1YQHiO9YP+JL3onZ7Hx7+yT5qznd y2L36aJSE/cKSR9I8xQKyzVwltb+4+zCXcP507SlEVzsqfEP8jZsUY+Wm02NrsuPmo+7Bq vAWq3brPo6asZ0LxkNsv/Iv/KoNUfusm58UVFxf8sabDCxyEY8J2joIcu9RyIbC5aS+KpB Sb5z6NUzEFaBY71uAwoH3Yoyap2iQ3SOq0UKfl+hXp6R+a9QcJJCzt1kEsGyww== 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 4RWDJQ10K1zv8J; Wed, 23 Aug 2023 17:50:14 +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 37NHoEcM048291; Wed, 23 Aug 2023 17:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoEms048286; Wed, 23 Aug 2023 17:50:14 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:14 GMT Message-Id: <202308231750.37NHoEms048286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: fcd0bbbd4aa9 - stable/13 - makefs: clean up some leftovers after $FreeBSD$ tag removal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 commit fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 Author: Ed Maste AuthorDate: 2023-03-30 14:02:02 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 makefs: clean up some leftovers after $FreeBSD$ tag removal Fixes: 2a63c3be1582 (cherry picked from commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3) --- 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 07238a9aed63..c310e24c4908 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}