git: fcd0bbbd4aa9 - stable/13 - makefs: clean up some leftovers after $FreeBSD$ tag removal
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Aug 2023 17:50:14 UTC
The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 commit fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-03-30 14:02:02 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <sys/cdefs.h> -#if defined(__RCSID) && !defined(__lint) -#endif /* !__lint */ - #include <sys/param.h> #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}