From 7e46dafa582b8c34290c95fa2ce7e105c4329b3c Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 9 Oct 2020 01:48:14 +0000 Subject: [PATCH] Create in-tree LINT files Now that config(8) has supported include for 19 years, transition to including the NOTES files. include support didn't exist at the time, nor did the envvar stuff recently added. Now that it does, eliminate the building of LINT files by just including everything you need. Note: This may cause conflicts with updating in some cases. find sys -name LINT\* -rm is suggested across this commit to remove the generated LINT files. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D26540 --- UPDATING | 13 +++++++++++++ sys/amd64/conf/LINT | 5 +++++ sys/amd64/conf/LINT-NOINET | 8 ++++++++ sys/amd64/conf/LINT-NOINET6 | 6 ++++++ sys/amd64/conf/LINT-NOIP | 21 +++++++++++++++++++++ sys/amd64/conf/Makefile | 6 ------ sys/arm/conf/LINT | 4 ++++ sys/arm/conf/Makefile | 5 ----- sys/arm64/conf/LINT | 4 ++++ sys/arm64/conf/Makefile | 5 ----- sys/i386/conf/LINT | 5 +++++ sys/i386/conf/LINT-NOINET | 8 ++++++++ sys/i386/conf/LINT-NOINET6 | 6 ++++++ sys/i386/conf/LINT-NOIP | 20 ++++++++++++++++++++ sys/i386/conf/Makefile | 6 ------ sys/powerpc/conf/LINT | 9 +++++++++ sys/powerpc/conf/LINT64 | 5 +++++ sys/powerpc/conf/Makefile | 5 ----- 18 files changed, 114 insertions(+), 27 deletions(-) create mode 100644 sys/amd64/conf/LINT create mode 100644 sys/amd64/conf/LINT-NOINET create mode 100644 sys/amd64/conf/LINT-NOINET6 create mode 100644 sys/amd64/conf/LINT-NOIP delete mode 100644 sys/amd64/conf/Makefile create mode 100644 sys/arm/conf/LINT delete mode 100644 sys/arm/conf/Makefile create mode 100644 sys/arm64/conf/LINT delete mode 100644 sys/arm64/conf/Makefile create mode 100644 sys/i386/conf/LINT create mode 100644 sys/i386/conf/LINT-NOINET create mode 100644 sys/i386/conf/LINT-NOINET6 create mode 100644 sys/i386/conf/LINT-NOIP delete mode 100644 sys/i386/conf/Makefile create mode 100644 sys/powerpc/conf/LINT create mode 100644 sys/powerpc/conf/LINT64 delete mode 100644 sys/powerpc/conf/Makefile diff --git a/UPDATING b/UPDATING index f2ba26c2c41..6b1b78fceaa 100644 --- a/UPDATING +++ b/UPDATING @@ -26,6 +26,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20200923: + LINT files are no longer generated. We now include the relevant NOTES + files. Note: This may cause conflicts with updating in some cases. + find sys -name LINT\* -rm + is suggested across this commit to remove the generated LINT files. + + If you have tried to update with generated files there, the svn + command you want to un-auger the tree is + cd sys/amd64/conf + svn revert -R . + and then do the above find from the top level. Substitute 'amd64' + above with where the error message indicates a conflict. + 20200824: OpenZFS support has been integrated. Do not upgrade root pools until the loader is updated to support zstd. Furthermore, we caution against diff --git a/sys/amd64/conf/LINT b/sys/amd64/conf/LINT new file mode 100644 index 00000000000..9618f78944a --- /dev/null +++ b/sys/amd64/conf/LINT @@ -0,0 +1,5 @@ +# $FreeBSD$ + +include "../../conf/NOTES" +include "../../x86/conf/NOTES" +include NOTES diff --git a/sys/amd64/conf/LINT-NOINET b/sys/amd64/conf/LINT-NOINET new file mode 100644 index 00000000000..2e4366ef899 --- /dev/null +++ b/sys/amd64/conf/LINT-NOINET @@ -0,0 +1,8 @@ +# $FreeBSD$ + +include LINT +ident LINT-NOINET +makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" +nooptions INET +nodevice gre +nodevice netmap diff --git a/sys/amd64/conf/LINT-NOINET6 b/sys/amd64/conf/LINT-NOINET6 new file mode 100644 index 00000000000..ffb275fd68d --- /dev/null +++ b/sys/amd64/conf/LINT-NOINET6 @@ -0,0 +1,6 @@ +# $FreeBSD$ + +include LINT +ident LINT-NOINET6 +makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" +nooptions INET6 diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP new file mode 100644 index 00000000000..bb306691388 --- /dev/null +++ b/sys/amd64/conf/LINT-NOIP @@ -0,0 +1,21 @@ +# $FreeBSD$ + +include LINT +ident LINT-NOIP +makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" +makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" +nooptions INET +nooptions INET6 +nodevice age +nodevice alc +nodevice ale +nodevice bxe +nodevice em +nodevice fxp +nodevice jme +nodevice msk +nodevice mxge +nodevice sge +nodevice sk +nodevice txp +nodevice netmap diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile deleted file mode 100644 index 735e33c8af9..00000000000 --- a/sys/amd64/conf/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -TARGET=amd64 - -NOTES= ${.CURDIR}/../../x86/conf/NOTES -.include "${.CURDIR}/../../conf/makeLINT.mk" diff --git a/sys/arm/conf/LINT b/sys/arm/conf/LINT new file mode 100644 index 00000000000..aaba324bf49 --- /dev/null +++ b/sys/arm/conf/LINT @@ -0,0 +1,4 @@ +# $FreeBSD$ + +include "../../conf/NOTES" +include NOTES diff --git a/sys/arm/conf/Makefile b/sys/arm/conf/Makefile deleted file mode 100644 index a6b24ffb8b4..00000000000 --- a/sys/arm/conf/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -TARGET=arm - -.include "${.CURDIR}/../../conf/makeLINT.mk" diff --git a/sys/arm64/conf/LINT b/sys/arm64/conf/LINT new file mode 100644 index 00000000000..aaba324bf49 --- /dev/null +++ b/sys/arm64/conf/LINT @@ -0,0 +1,4 @@ +# $FreeBSD$ + +include "../../conf/NOTES" +include NOTES diff --git a/sys/arm64/conf/Makefile b/sys/arm64/conf/Makefile deleted file mode 100644 index 5b01233d605..00000000000 --- a/sys/arm64/conf/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -TARGET=arm64 - -.include "${.CURDIR}/../../conf/makeLINT.mk" diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT new file mode 100644 index 00000000000..9618f78944a --- /dev/null +++ b/sys/i386/conf/LINT @@ -0,0 +1,5 @@ +# $FreeBSD$ + +include "../../conf/NOTES" +include "../../x86/conf/NOTES" +include NOTES diff --git a/sys/i386/conf/LINT-NOINET b/sys/i386/conf/LINT-NOINET new file mode 100644 index 00000000000..2e4366ef899 --- /dev/null +++ b/sys/i386/conf/LINT-NOINET @@ -0,0 +1,8 @@ +# $FreeBSD$ + +include LINT +ident LINT-NOINET +makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" +nooptions INET +nodevice gre +nodevice netmap diff --git a/sys/i386/conf/LINT-NOINET6 b/sys/i386/conf/LINT-NOINET6 new file mode 100644 index 00000000000..ffb275fd68d --- /dev/null +++ b/sys/i386/conf/LINT-NOINET6 @@ -0,0 +1,6 @@ +# $FreeBSD$ + +include LINT +ident LINT-NOINET6 +makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" +nooptions INET6 diff --git a/sys/i386/conf/LINT-NOIP b/sys/i386/conf/LINT-NOIP new file mode 100644 index 00000000000..a1ea6fa3202 --- /dev/null +++ b/sys/i386/conf/LINT-NOIP @@ -0,0 +1,20 @@ +# $FreeBSD$ +include LINT +ident LINT-NOIP +makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" +makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" +nooptions INET +nooptions INET6 +nodevice age +nodevice alc +nodevice ale +nodevice bxe +nodevice em +nodevice fxp +nodevice jme +nodevice msk +nodevice mxge +nodevice sge +nodevice sk +nodevice txp +nodevice netmap diff --git a/sys/i386/conf/Makefile b/sys/i386/conf/Makefile deleted file mode 100644 index 0cbafedfaf1..00000000000 --- a/sys/i386/conf/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -TARGET=i386 - -NOTES= ${.CURDIR}/../../x86/conf/NOTES -.include "${.CURDIR}/../../conf/makeLINT.mk" diff --git a/sys/powerpc/conf/LINT b/sys/powerpc/conf/LINT new file mode 100644 index 00000000000..49cb4483a0f --- /dev/null +++ b/sys/powerpc/conf/LINT @@ -0,0 +1,9 @@ +# $FreeBSD$ + +include "../../conf/NOTES" +include NOTES +machine powerpc powerpc +nodevice mlx5 +nodevice mlx5en +nodevice mlx5ib +nooptions RATELIMIT diff --git a/sys/powerpc/conf/LINT64 b/sys/powerpc/conf/LINT64 new file mode 100644 index 00000000000..58e8a55f219 --- /dev/null +++ b/sys/powerpc/conf/LINT64 @@ -0,0 +1,5 @@ +# $FreeBSD$ + +include "../../conf/NOTES" +include NOTES +machine powerpc powerpc64 diff --git a/sys/powerpc/conf/Makefile b/sys/powerpc/conf/Makefile deleted file mode 100644 index 562bc4693cd..00000000000 --- a/sys/powerpc/conf/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -TARGET=powerpc - -.include "${.CURDIR}/../../conf/makeLINT.mk" -- 2.45.0