git: 8a8daeafaf70 - main - sys/*/conf: do not use "../../conf/" when including std.*
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 23 Apr 2024 21:43:25 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=8a8daeafaf7094fd6e65f93fa4e7687591e23fc2
commit 8a8daeafaf7094fd6e65f93fa4e7687591e23fc2
Author: Lexi Winter <lexi@le-Fay.ORG>
AuthorDate: 2024-04-23 21:11:24 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-23 21:13:31 +0000
sys/*/conf: do not use "../../conf/" when including std.*
Since config(8) searches sys/conf by default, there's no need to specify
the full relative path here; replace it by the filename alone.
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1124
---
sys/amd64/conf/GENERIC | 2 +-
sys/amd64/conf/GENERIC-NODEBUG | 2 +-
sys/amd64/conf/MINIMAL | 2 +-
sys/amd64/conf/MINIMAL-NODEBUG | 2 +-
sys/arm/conf/GENERIC-NODEBUG | 2 +-
sys/arm/conf/std.armv6 | 2 +-
sys/arm/conf/std.armv7 | 2 +-
sys/arm64/conf/GENERIC-MMCCAM-NODEBUG | 2 +-
sys/arm64/conf/GENERIC-NODEBUG | 2 +-
sys/arm64/conf/std.arm64 | 2 +-
sys/i386/conf/GENERIC | 2 +-
sys/i386/conf/GENERIC-NODEBUG | 2 +-
sys/i386/conf/MINIMAL | 2 +-
sys/i386/conf/MINIMAL-NODEBUG | 2 +-
sys/powerpc/conf/GENERIC | 2 +-
sys/powerpc/conf/GENERIC-NODEBUG | 2 +-
sys/powerpc/conf/GENERIC64 | 2 +-
sys/powerpc/conf/GENERIC64-NODEBUG | 2 +-
sys/powerpc/conf/GENERIC64LE | 2 +-
sys/powerpc/conf/GENERIC64LE-NODEBUG | 2 +-
sys/riscv/conf/GENERIC-NODEBUG | 2 +-
21 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a49a5c006d77..4a84e8e56596 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -94,7 +94,7 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG
index 85ff32ea329b..1939b0efd352 100644
--- a/sys/amd64/conf/GENERIC-NODEBUG
+++ b/sys/amd64/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-NODEBUG
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index c413590586e6..3447cbc366fb 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -79,7 +79,7 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
diff --git a/sys/amd64/conf/MINIMAL-NODEBUG b/sys/amd64/conf/MINIMAL-NODEBUG
index 35281b2212d9..7b7c22bbcaf6 100644
--- a/sys/amd64/conf/MINIMAL-NODEBUG
+++ b/sys/amd64/conf/MINIMAL-NODEBUG
@@ -6,6 +6,6 @@
#NO_UNIVERSE
include MINIMAL
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident MINIMAL-NODEBUG
diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG
index 58f78036470d..0b3199245187 100644
--- a/sys/arm/conf/GENERIC-NODEBUG
+++ b/sys/arm/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-NODEBUG
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index 9ae37eab90d5..a24227fc838f 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -66,7 +66,7 @@ options KDB_TRACE # Print a stack trace for a panic.
options USB_DEBUG # Enable usb debug support code
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Optional extras, never enabled by default:
#options BOOTVERBOSE
diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7
index 72f22efd0c28..4ef60c331212 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -66,7 +66,7 @@ options KDB_TRACE # Print a stack trace for a panic.
options USB_DEBUG # Enable usb debug support code
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Optional extras, never enabled by default:
#options BOOTVERBOSE
diff --git a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG
index 6a475c8c6325..b2e865129012 100644
--- a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG
+++ b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG
@@ -9,6 +9,6 @@
#NO_UNIVERSE
include GENERIC-MMCCAM
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-MMCCAM-NODEBUG
diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG
index a0dbb030c109..086942dfaab1 100644
--- a/sys/arm64/conf/GENERIC-NODEBUG
+++ b/sys/arm64/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-NODEBUG
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index cb3c591947fc..cc4a5acbb314 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -73,7 +73,7 @@ options PERTHREAD_SSP # Per-thread SSP canary
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Kernel Sanitizers
#options COVERAGE # Generic kernel coverage. Used by KCOV
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7bd01d4e60e7..b32986e13769 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -88,7 +88,7 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG
index 64b9ecb8a332..ea07613a796f 100644
--- a/sys/i386/conf/GENERIC-NODEBUG
+++ b/sys/i386/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-NODEBUG
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index b29a179d2bdf..c70fd27a5c69 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -87,7 +87,7 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
diff --git a/sys/i386/conf/MINIMAL-NODEBUG b/sys/i386/conf/MINIMAL-NODEBUG
index 35281b2212d9..7b7c22bbcaf6 100644
--- a/sys/i386/conf/MINIMAL-NODEBUG
+++ b/sys/i386/conf/MINIMAL-NODEBUG
@@ -6,6 +6,6 @@
#NO_UNIVERSE
include MINIMAL
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident MINIMAL-NODEBUG
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index bb7865301fcb..6083b4d2baca 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -91,7 +91,7 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG
index 9d069a41acc1..0761376a8160 100644
--- a/sys/powerpc/conf/GENERIC-NODEBUG
+++ b/sys/powerpc/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-NODEBUG
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index b077cf3f2feb..26b308a4e06e 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -101,7 +101,7 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
diff --git a/sys/powerpc/conf/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG
index 2659899940ef..a4c3dbd856e2 100644
--- a/sys/powerpc/conf/GENERIC64-NODEBUG
+++ b/sys/powerpc/conf/GENERIC64-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC64
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC64-NODEBUG
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index f090cd47ecf8..84c27690211d 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -97,7 +97,7 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
diff --git a/sys/powerpc/conf/GENERIC64LE-NODEBUG b/sys/powerpc/conf/GENERIC64LE-NODEBUG
index ab48bf7a0547..fd2d3ca84a19 100644
--- a/sys/powerpc/conf/GENERIC64LE-NODEBUG
+++ b/sys/powerpc/conf/GENERIC64LE-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC64LE
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC64LE-NODEBUG
diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG
index ca4d07fbd2da..e4f4b41f2c41 100644
--- a/sys/riscv/conf/GENERIC-NODEBUG
+++ b/sys/riscv/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
#
include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
ident GENERIC-NODEBUG