From 154512831966d12c1e32e6271d4ab1440a25b96e Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Wed, 4 Apr 2018 17:09:39 +0200 Subject: [PATCH] FBSD: param.h consistency Commit 88dc4d93f5ef080da8f56fac453f095e6c79d4a0 ("Add param.h files for recent FreeBSD") introduced an inconsistency between the i386 and amd64 param.h files for 11.1 and 12.0 regarding the *_FBSD101_ENV #defines. Citing Benjamin Kaduk: "Traditionally we have the param.h for a FreeBSD N.0 release include the (N-1).Y values that existed at the time of the N.0 release, and freeze that set of (N-1).Y values for the lifetime of FreeBSD N.x, if that makes sense." Given that FreeBSD 11.0 was released shortly after 10.3, and 12.0 is not yet released, consistently #define *_FBSD10{1..3}_ENV for 11.1 and *_FBSD10{1..4}_ENV for 12.0 Change-Id: Ibb7e6c4caaab7aa97b32eeec7aa0bbe998bb57f7 Reviewed-on: https://gerrit.openafs.org/12990 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/config/param.amd64_fbsd_111.h | 9 +++++++++ src/config/param.amd64_fbsd_120.h | 12 ++++++++++++ src/config/param.i386_fbsd_111.h | 6 ++++++ src/config/param.i386_fbsd_120.h | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/src/config/param.amd64_fbsd_111.h b/src/config/param.amd64_fbsd_111.h index 34d724e..7c3af71 100644 --- a/src/config/param.amd64_fbsd_111.h +++ b/src/config/param.amd64_fbsd_111.h @@ -33,6 +33,9 @@ #define AFS_FBSD92_ENV 1 #define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 +#define AFS_FBSD101_ENV 1 +#define AFS_FBSD102_ENV 1 +#define AFS_FBSD103_ENV 1 #define AFS_FBSD110_ENV 1 #define AFS_FBSD111_ENV 1 @@ -53,6 +56,9 @@ #define AFS_X86_FBSD92_ENV 1 #define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 +#define AFS_X86_FBSD101_ENV 1 +#define AFS_X86_FBSD102_ENV 1 +#define AFS_X86_FBSD103_ENV 1 #define AFS_X86_FBSD110_ENV 1 #define AFS_X86_FBSD111_ENV 1 @@ -80,6 +86,9 @@ #define AFS_USR_FBSD92_ENV 1 #define AFS_USR_FBSD93_ENV 1 #define AFS_USR_FBSD100_ENV 1 +#define AFS_USR_FBSD101_ENV 1 +#define AFS_USR_FBSD102_ENV 1 +#define AFS_USR_FBSD103_ENV 1 #define AFS_USR_FBSD110_ENV 1 #define AFS_USR_FBSD111_ENV 1 diff --git a/src/config/param.amd64_fbsd_120.h b/src/config/param.amd64_fbsd_120.h index dac0f28..2398c50 100644 --- a/src/config/param.amd64_fbsd_120.h +++ b/src/config/param.amd64_fbsd_120.h @@ -33,6 +33,10 @@ #define AFS_FBSD92_ENV 1 #define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 +#define AFS_FBSD101_ENV 1 +#define AFS_FBSD102_ENV 1 +#define AFS_FBSD103_ENV 1 +#define AFS_FBSD104_ENV 1 #define AFS_FBSD110_ENV 1 #define AFS_FBSD111_ENV 1 #define AFS_FBSD120_ENV 1 @@ -54,6 +58,10 @@ #define AFS_X86_FBSD92_ENV 1 #define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 +#define AFS_X86_FBSD101_ENV 1 +#define AFS_X86_FBSD102_ENV 1 +#define AFS_X86_FBSD103_ENV 1 +#define AFS_X86_FBSD104_ENV 1 #define AFS_X86_FBSD110_ENV 1 #define AFS_X86_FBSD111_ENV 1 #define AFS_X86_FBSD120_ENV 1 @@ -82,6 +90,10 @@ #define AFS_USR_FBSD92_ENV 1 #define AFS_USR_FBSD93_ENV 1 #define AFS_USR_FBSD100_ENV 1 +#define AFS_USR_FBSD101_ENV 1 +#define AFS_USR_FBSD102_ENV 1 +#define AFS_USR_FBSD103_ENV 1 +#define AFS_USR_FBSD104_ENV 1 #define AFS_USR_FBSD110_ENV 1 #define AFS_USR_FBSD111_ENV 1 #define AFS_USR_FBSD120_ENV 1 diff --git a/src/config/param.i386_fbsd_111.h b/src/config/param.i386_fbsd_111.h index bc68b98..4649ac8 100644 --- a/src/config/param.i386_fbsd_111.h +++ b/src/config/param.i386_fbsd_111.h @@ -33,6 +33,8 @@ #define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 +#define AFS_FBSD102_ENV 1 +#define AFS_FBSD103_ENV 1 #define AFS_FBSD110_ENV 1 #define AFS_FBSD111_ENV 1 @@ -58,6 +60,8 @@ #define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 +#define AFS_X86_FBSD102_ENV 1 +#define AFS_X86_FBSD103_ENV 1 #define AFS_X86_FBSD110_ENV 1 #define AFS_X86_FBSD111_ENV 1 @@ -87,6 +91,8 @@ #define AFS_USR_FBSD93_ENV 1 #define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 +#define AFS_USR_FBSD102_ENV 1 +#define AFS_USR_FBSD103_ENV 1 #define AFS_USR_FBSD110_ENV 1 #define AFS_USR_FBSD111_ENV 1 diff --git a/src/config/param.i386_fbsd_120.h b/src/config/param.i386_fbsd_120.h index e27faa5..7c12258 100644 --- a/src/config/param.i386_fbsd_120.h +++ b/src/config/param.i386_fbsd_120.h @@ -33,6 +33,9 @@ #define AFS_FBSD93_ENV 1 #define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 +#define AFS_FBSD102_ENV 1 +#define AFS_FBSD103_ENV 1 +#define AFS_FBSD104_ENV 1 #define AFS_FBSD110_ENV 1 #define AFS_FBSD111_ENV 1 #define AFS_FBSD120_ENV 1 @@ -59,6 +62,9 @@ #define AFS_X86_FBSD93_ENV 1 #define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 +#define AFS_X86_FBSD102_ENV 1 +#define AFS_X86_FBSD103_ENV 1 +#define AFS_X86_FBSD104_ENV 1 #define AFS_X86_FBSD110_ENV 1 #define AFS_X86_FBSD111_ENV 1 #define AFS_X86_FBSD120_ENV 1 @@ -89,6 +95,9 @@ #define AFS_USR_FBSD93_ENV 1 #define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 +#define AFS_USR_FBSD102_ENV 1 +#define AFS_USR_FBSD103_ENV 1 +#define AFS_USR_FBSD104_ENV 1 #define AFS_USR_FBSD110_ENV 1 #define AFS_USR_FBSD111_ENV 1 #define AFS_USR_FBSD120_ENV 1 -- 1.9.4