Sat Apr 20 13:24:49 2024 UTC (19d)
{usr.,}{s,}bin: replace LINT_SUPPORTED with the standard NOLINT

While here, re-enable lint in those cases where lint was skipped due to
a bug in interpreting abstract types, which was fixed in cgram.y 1.469
from 2023-08-02.


(rillig)
diff -r1.18 -r1.19 src/bin/Makefile.inc
diff -r1.23 -r1.24 src/sbin/Makefile.inc
diff -r1.23 -r1.24 src/sbin/fsck_lfs/Makefile
diff -r1.15 -r1.16 src/sbin/newfs_lfs/Makefile
diff -r1.7 -r1.8 src/sbin/resize_ffs/Makefile
diff -r1.11 -r1.12 src/usr.bin/Makefile.inc
diff -r1.36 -r1.37 src/usr.bin/kdump/Makefile
diff -r1.33 -r1.34 src/usr.bin/ktruss/Makefile
diff -r1.17 -r1.18 src/usr.bin/rump_server/Makefile
diff -r1.8 -r1.9 src/usr.sbin/Makefile.inc
cvs diff -r1.18 -r1.19 src/bin/Makefile.inc (expand / switch to unified diff)

--- src/bin/Makefile.inc 2021/10/09 21:06:31 1.18
+++ src/bin/Makefile.inc 2024/04/20 13:24:48 1.19
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.inc,v 1.18 2021/10/09 21:06:31 rillig Exp $ 1# $NetBSD: Makefile.inc,v 1.19 2024/04/20 13:24:48 rillig Exp $
2# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 2# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
3 3
4.include <bsd.own.mk> # for MKDYNAMICROOT definition 4.include <bsd.own.mk> # for MKDYNAMICROOT definition
5 5
6WARNS?= 5 6WARNS?= 5
7BINDIR?= /bin 7BINDIR?= /bin
8 8
9.if (${MKDYNAMICROOT} == "no") 9.if (${MKDYNAMICROOT} == "no")
10LDSTATIC?= -static 10LDSTATIC?= -static
11.endif 11.endif
12 12
13.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes" 13.if ${MKLINT} != "no" && !defined(NOLINT)
14realall: lint 14realall: lint
15.endif 15.endif
cvs diff -r1.23 -r1.24 src/sbin/Makefile.inc (expand / switch to unified diff)

--- src/sbin/Makefile.inc 2021/09/14 20:13:03 1.23
+++ src/sbin/Makefile.inc 2024/04/20 13:24:48 1.24
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.inc,v 1.23 2021/09/14 20:13:03 rillig Exp $ 1# $NetBSD: Makefile.inc,v 1.24 2024/04/20 13:24:48 rillig Exp $
2# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93 2# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93
3 3
4.include <bsd.own.mk> # for MKDYNAMICROOT definition 4.include <bsd.own.mk> # for MKDYNAMICROOT definition
5 5
6WARNS?= 5 6WARNS?= 5
7BINDIR?= /sbin 7BINDIR?= /sbin
8 8
9.if (${MKDYNAMICROOT} == "no") 9.if (${MKDYNAMICROOT} == "no")
10LDSTATIC?= -static 10LDSTATIC?= -static
11.endif 11.endif
12 12
13.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes" 13.if ${MKLINT} != "no" && !defined(NOLINT)
14realall: lint 14realall: lint
15.endif 15.endif
cvs diff -r1.23 -r1.24 src/sbin/fsck_lfs/Makefile (expand / switch to unified diff)

--- src/sbin/fsck_lfs/Makefile 2021/09/14 20:13:03 1.23
+++ src/sbin/fsck_lfs/Makefile 2024/04/20 13:24:48 1.24
@@ -1,27 +1,22 @@ @@ -1,27 +1,22 @@
1# $NetBSD: Makefile,v 1.23 2021/09/14 20:13:03 rillig Exp $ 1# $NetBSD: Makefile,v 1.24 2024/04/20 13:24:48 rillig Exp $
2# @(#)Makefile 8.1 (Berkeley) 6/5/93 2# @(#)Makefile 8.1 (Berkeley) 6/5/93
3 3
4WARNS?= 3 # XXX: sign-compare issues 4WARNS?= 3 # XXX: sign-compare issues
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8PROG= fsck_lfs 8PROG= fsck_lfs
9MAN= fsck_lfs.8 9MAN= fsck_lfs.8
10SRCS= bufcache.c dir.c fsutil.c inode.c lfs.c lfs_cksum.c lfs_itimes.c main.c 10SRCS= bufcache.c dir.c fsutil.c inode.c lfs.c lfs_cksum.c lfs_itimes.c main.c
11SRCS+= pass0.c pass1.c pass2.c pass3.c pass4.c pass5.c pass6.c 11SRCS+= pass0.c pass1.c pass2.c pass3.c pass4.c pass5.c pass6.c
12SRCS+= segwrite.c setup.c utilities.c vars.c vnode.c 12SRCS+= segwrite.c setup.c utilities.c vars.c vnode.c
13SRCS+= kernelops.c 13SRCS+= kernelops.c
14FSCK= ${NETBSDSRCDIR}/sbin/fsck 14FSCK= ${NETBSDSRCDIR}/sbin/fsck
15.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK} 15.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK}
16CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FSCK_LFS 16CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FSCK_LFS
17# -DVERBOSE_BLOCKMAP  17# -DVERBOSE_BLOCKMAP
18 18
19LDADD+=-lutil 19LDADD+=-lutil
20DPADD+=${LIBUTIL} 20DPADD+=${LIBUTIL}
21 21
22# As of 2021-09-14, lint does not recognize the types as equal, but it should. 
23# vnode.c(104): error: redeclaration of register_vget [27] 
24# vnode.h(75): previous declaration of register_vget [260] 
25LINT_SUPPORTED= no 
26 
27.include <bsd.prog.mk> 22.include <bsd.prog.mk>
cvs diff -r1.15 -r1.16 src/sbin/newfs_lfs/Makefile (expand / switch to unified diff)

--- src/sbin/newfs_lfs/Makefile 2021/09/14 20:13:03 1.15
+++ src/sbin/newfs_lfs/Makefile 2024/04/20 13:24:49 1.16
@@ -1,33 +1,28 @@ @@ -1,33 +1,28 @@
1# $NetBSD: Makefile,v 1.15 2021/09/14 20:13:03 rillig Exp $ 1# $NetBSD: Makefile,v 1.16 2024/04/20 13:24:49 rillig Exp $
2# @(#)Makefile 8.1 (Berkeley) 6/18/93 2# @(#)Makefile 8.1 (Berkeley) 6/18/93
3 3
4WARNS?= 3 # XXX: sign-compare issues 4WARNS?= 3 # XXX: sign-compare issues
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8PROG= newfs_lfs 8PROG= newfs_lfs
9SRCS= dkcksum.c make_lfs.c lfs_cksum.c misc.c newfs.c 9SRCS= dkcksum.c make_lfs.c lfs_cksum.c misc.c newfs.c
10SRCS+= bufcache.c vnode.c lfs.c segwrite.c lfs_itimes.c partutil.c 10SRCS+= bufcache.c vnode.c lfs.c segwrite.c lfs_itimes.c partutil.c
11SRCS+= kernelops.c 11SRCS+= kernelops.c
12MAN= newfs_lfs.8 12MAN= newfs_lfs.8
13 13
14DISKLABEL= ${NETBSDSRCDIR}/sbin/disklabel 14DISKLABEL= ${NETBSDSRCDIR}/sbin/disklabel
15FSCK_LFS= ${NETBSDSRCDIR}/sbin/fsck_lfs 15FSCK_LFS= ${NETBSDSRCDIR}/sbin/fsck_lfs
16FSCK= ${NETBSDSRCDIR}/sbin/fsck 16FSCK= ${NETBSDSRCDIR}/sbin/fsck
17 17
18.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${DISKLABEL} ${FSCK_LFS} ${FSCK} 18.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${DISKLABEL} ${FSCK_LFS} ${FSCK}
19 19
20DPADD= ${LIBUTIL} 20DPADD= ${LIBUTIL}
21LDADD= -lutil 21LDADD= -lutil
22 22
23LDADD+=-lprop 23LDADD+=-lprop
24DPADD+=${LIBPROP} 24DPADD+=${LIBPROP}
25 25
26CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP 26CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP
27 27
28# As of 2021-09-14, lint does not recognize the types as equal, but it should. 
29# vnode.c(104): error: redeclaration of register_vget [27] 
30# vnode.h(75): previous declaration of register_vget [260] 
31LINT_SUPPORTED= no 
32 
33.include <bsd.prog.mk> 28.include <bsd.prog.mk>
cvs diff -r1.7 -r1.8 src/sbin/resize_ffs/Makefile (expand / switch to unified diff)

--- src/sbin/resize_ffs/Makefile 2021/09/14 20:13:03 1.7
+++ src/sbin/resize_ffs/Makefile 2024/04/20 13:24:49 1.8
@@ -1,20 +1,17 @@ @@ -1,20 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2021/09/14 20:13:03 rillig Exp $ 1# $NetBSD: Makefile,v 1.8 2024/04/20 13:24:49 rillig Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG=resize_ffs 5PROG=resize_ffs
6MAN=resize_ffs.8 6MAN=resize_ffs.8
7SRCS=resize_ffs.c ffs_bswap.c progress.c 7SRCS=resize_ffs.c ffs_bswap.c progress.c
8 8
9CPPFLAGS+=-I${NETBSDSRCDIR}/sbin/fsck 9CPPFLAGS+=-I${NETBSDSRCDIR}/sbin/fsck
10 10
11DPADD+= ${LIBUTIL} 11DPADD+= ${LIBUTIL}
12LDADD+= -lutil 12LDADD+= -lutil
13 13
14.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs 14.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
15.PATH: ${NETBSDSRCDIR}/sbin/fsck 15.PATH: ${NETBSDSRCDIR}/sbin/fsck
16 16
17# resize_ffs.c(90): error: cannot take size/alignment of incomplete type [143] 
18LINT_SUPPORTED= no 
19 
20.include <bsd.prog.mk> 17.include <bsd.prog.mk>
cvs diff -r1.11 -r1.12 src/usr.bin/Makefile.inc (expand / switch to unified diff)

--- src/usr.bin/Makefile.inc 2021/08/22 22:24:11 1.11
+++ src/usr.bin/Makefile.inc 2024/04/20 13:24:49 1.12
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.inc,v 1.11 2021/08/22 22:24:11 rillig Exp $ 1# $NetBSD: Makefile.inc,v 1.12 2024/04/20 13:24:49 rillig Exp $
2# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 2# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
3 3
4WARNS?= 5 4WARNS?= 5
5BINDIR?=/usr/bin 5BINDIR?=/usr/bin
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes" 8.if ${MKLINT} != "no" && !defined(NOLINT)
9realall: lint 9realall: lint
10.endif 10.endif
cvs diff -r1.36 -r1.37 src/usr.bin/kdump/Makefile (expand / switch to unified diff)

--- src/usr.bin/kdump/Makefile 2023/06/03 08:52:59 1.36
+++ src/usr.bin/kdump/Makefile 2024/04/20 13:24:49 1.37
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.36 2023/06/03 08:52:59 lukem Exp $ 1# $NetBSD: Makefile,v 1.37 2024/04/20 13:24:49 rillig Exp $
2# @(#)Makefile 8.1 (Berkeley) 6/6/93 2# @(#)Makefile 8.1 (Berkeley) 6/6/93
3 3
4.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR 4.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
5 5
6USE_FORT?= yes # cryptographic software 6USE_FORT?= yes # cryptographic software
7 7
8PROG= kdump 8PROG= kdump
9LINKS= ${BINDIR}/kdump ${BINDIR}/ioctlprint 9LINKS= ${BINDIR}/kdump ${BINDIR}/ioctlprint
10MAN= kdump.1 ioctlprint.1 10MAN= kdump.1 ioctlprint.1
11SRCS= kdump.c subr.c setemul.c siginfo.c 11SRCS= kdump.c subr.c setemul.c siginfo.c
12.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace 12.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace
13CLEANFILES+=siginfo.c 13CLEANFILES+=siginfo.c
14LINT_SUPPORTED= no # kdump-ioctl.c defines uio_t twice. 14NOLINT= # kdump-ioctl.c defines uio_t twice.
15 15
16.if (${MKDYNAMICROOT} == "no") 16.if (${MKDYNAMICROOT} == "no")
17LDSTATIC?=-static 17LDSTATIC?=-static
18.endif 18.endif
19 19
20.include "Makefile.ioctl-c" 20.include "Makefile.ioctl-c"
21.include "Makefile.siginfo-c" 21.include "Makefile.siginfo-c"
22 22
23CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys -D_KERNTYPES 23CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys -D_KERNTYPES
24 24
25LDADD+=-lutil 25LDADD+=-lutil
26DPADD+=${LIBUTIL} 26DPADD+=${LIBUTIL}
27 27
cvs diff -r1.33 -r1.34 src/usr.bin/ktruss/Makefile (expand / switch to unified diff)

--- src/usr.bin/ktruss/Makefile 2023/06/03 08:53:00 1.33
+++ src/usr.bin/ktruss/Makefile 2024/04/20 13:24:49 1.34
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.33 2023/06/03 08:53:00 lukem Exp $ 1# $NetBSD: Makefile,v 1.34 2024/04/20 13:24:49 rillig Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR 5.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
6 6
7PROG= ktruss 7PROG= ktruss
8SRCS= ktrace.c dump.c subr.c misc.c setemul.c 8SRCS= ktrace.c dump.c subr.c misc.c setemul.c
9CLEANFILES+= misc.c misc.h 9CLEANFILES+= misc.c misc.h
10LINT_SUPPORTED= no # ktruss-ioctl.c defines uio_t twice. 10NOLINT= # ktruss-ioctl.c defines uio_t twice.
11 11
12.if (${MKDYNAMICROOT} == "no") 12.if (${MKDYNAMICROOT} == "no")
13LDSTATIC?=-static 13LDSTATIC?=-static
14.endif 14.endif
15 15
16# Hint for mkdep(1). 16# Hint for mkdep(1).
17dump.c: misc.h 17dump.c: misc.h
18 18
19# Avoid race. 19# Avoid race.
20.ORDER: misc.c misc.h 20.ORDER: misc.c misc.h
21 21
22# Build-time generation. 22# Build-time generation.
23misc.c misc.h: ${DESTDIR}/usr/include/sys/errno.h makeerrnos.sh \ 23misc.c misc.h: ${DESTDIR}/usr/include/sys/errno.h makeerrnos.sh \
cvs diff -r1.17 -r1.18 src/usr.bin/rump_server/Makefile (expand / switch to unified diff)

--- src/usr.bin/rump_server/Makefile 2021/11/01 21:37:33 1.17
+++ src/usr.bin/rump_server/Makefile 2024/04/20 13:24:49 1.18
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.17 2021/11/01 21:37:33 nia Exp $ 1# $NetBSD: Makefile,v 1.18 2024/04/20 13:24:49 rillig Exp $
2# 2#
3 3
4NOFULLRELRO= yes 4NOFULLRELRO= yes
5 5
6.PATH: ${.CURDIR}/../rump_allserver 6.PATH: ${.CURDIR}/../rump_allserver
7 7
8PROG= rump_server 8PROG= rump_server
9SRCS= rump_allserver.c 9SRCS= rump_allserver.c
10NOMAN= installed by ../rump_allserver 10NOMAN= installed by ../rump_allserver
11LINT_SUPPORTED= no # LDADD contains -Wl,... 11NOLINT= # LDADD contains -Wl,...
12 12
13LDADD+= \ 13LDADD+= \
14 -Wl,--whole-archive \ 14 -Wl,--whole-archive \
15 -lrumpkern_sysproxy -lrump -lrumpvfs_nofifofs -lrumpvfs -lrumpuser \ 15 -lrumpkern_sysproxy -lrump -lrumpvfs_nofifofs -lrumpvfs -lrumpuser \
16 -Wl,--no-whole-archive 16 -Wl,--no-whole-archive
17LDADD+= -lpthread 17LDADD+= -lpthread
18 18
19.if ${RUMP_SANITIZE:Uno} != "no" 19.if ${RUMP_SANITIZE:Uno} != "no"
20LDADD+= -fsanitize=${RUMP_SANITIZE} 20LDADD+= -fsanitize=${RUMP_SANITIZE}
21.endif 21.endif
22 22
23.include <bsd.prog.mk> 23.include <bsd.prog.mk>
cvs diff -r1.8 -r1.9 src/usr.sbin/Makefile.inc (expand / switch to unified diff)

--- src/usr.sbin/Makefile.inc 2021/09/14 20:36:02 1.8
+++ src/usr.sbin/Makefile.inc 2024/04/20 13:24:49 1.9
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1# $NetBSD: Makefile.inc,v 1.8 2021/09/14 20:36:02 rillig Exp $ 1# $NetBSD: Makefile.inc,v 1.9 2024/04/20 13:24:49 rillig Exp $
2# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 2# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
3 3
4BINDIR?= /usr/sbin 4BINDIR?= /usr/sbin
5WARNS?= 4 5WARNS?= 4
6CPPFLAGS+= -D_KERNTYPES 6CPPFLAGS+= -D_KERNTYPES
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes" 9.if ${MKLINT} != "no" && !defined(NOLINT)
10realall: lint 10realall: lint
11.endif 11.endif