From 44ca4aa90ef101fb13b3b5327ca19381b5464fb3 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Wed, 27 Jun 2012 22:04:24 -0400 Subject: [PATCH] Patch up FreeBSD-10 support The auto-guessing code for sysnames produces *_fbsd_100, so we can't just claim that we'll be *_fbsd_1000 for kicks. Revert back to the old behavior so as to be less disruptive. Change-Id: Iddbff8f6e03a1bd0cf140b6eaad1de72ad3b76b4 Reviewed-on: http://gerrit.openafs.org/7595 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/config/afs_sysnames.h | 4 ++-- ...{param.amd64_fbsd_1000.h => param.amd64_fbsd_100.h} | 10 +++++----- .../{param.i386_fbsd_1000.h => param.i386_fbsd_100.h} | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/config/{param.amd64_fbsd_1000.h => param.amd64_fbsd_100.h} (96%) rename src/config/{param.i386_fbsd_1000.h => param.i386_fbsd_100.h} (96%) diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 454ab4b0b..81ec4c96f 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -206,7 +206,7 @@ #define SYS_NAME_ID_i386_fbsd_84 2123 #define SYS_NAME_ID_i386_fbsd_90 2120 #define SYS_NAME_ID_i386_fbsd_91 2122 -#define SYS_NAME_ID_i386_fbsd_1000 2130 +#define SYS_NAME_ID_i386_fbsd_100 2130 #define SYS_NAME_ID_ia64_linux2 2200 #define SYS_NAME_ID_ia64_linux22 2201 @@ -302,7 +302,7 @@ #define SYS_NAME_ID_amd64_fbsd_84 3015 #define SYS_NAME_ID_amd64_fbsd_90 3020 #define SYS_NAME_ID_amd64_fbsd_91 3022 -#define SYS_NAME_ID_amd64_fbsd_1000 3030 +#define SYS_NAME_ID_amd64_fbsd_100 3030 #define SYS_NAME_ID_amd64_w2k 3400 diff --git a/src/config/param.amd64_fbsd_1000.h b/src/config/param.amd64_fbsd_100.h similarity index 96% rename from src/config/param.amd64_fbsd_1000.h rename to src/config/param.amd64_fbsd_100.h index fb6533c89..bc2135008 100644 --- a/src/config/param.amd64_fbsd_1000.h +++ b/src/config/param.amd64_fbsd_100.h @@ -2,8 +2,8 @@ #define AFS_PARAM_H /* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_1000" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_1000 +#define SYS_NAME "amd64_fbsd_100" +#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_100 #define AFSLITTLE_ENDIAN 1 #define AFS_HAVE_FFS 1 /* Use system's ffs. */ @@ -40,7 +40,7 @@ #define AFS_FBSD81_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 -#define AFS_FBSD1000_ENV 1 +#define AFS_FBSD100_ENV 1 #define AFS_X86_FBSD_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ @@ -51,7 +51,7 @@ #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD1000_ENV 1 +#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 @@ -160,7 +160,7 @@ enum vcexcl { NONEXCL, EXCL }; #define AFS_USR_FBSD81_ENV 1 #define AFS_USR_FBSD90_ENV 1 #define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD1000_ENV 1 +#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD_ENV 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 diff --git a/src/config/param.i386_fbsd_1000.h b/src/config/param.i386_fbsd_100.h similarity index 96% rename from src/config/param.i386_fbsd_1000.h rename to src/config/param.i386_fbsd_100.h index c07853f90..03ac0fc14 100644 --- a/src/config/param.i386_fbsd_1000.h +++ b/src/config/param.i386_fbsd_100.h @@ -2,8 +2,8 @@ #define AFS_PARAM_H /* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_1000" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_1000 +#define SYS_NAME "i386_fbsd_100" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_100 #define AFSLITTLE_ENDIAN 1 #define AFS_HAVE_FFS 1 /* Use system's ffs. */ @@ -39,7 +39,7 @@ #define AFS_FBSD81_ENV 1 #define AFS_FBSD90_ENV 1 #define AFS_FBSD91_ENV 1 -#define AFS_FBSD1000_ENV 1 +#define AFS_FBSD100_ENV 1 #define AFS_X86_FBSD_ENV 1 #define AFS_X86_FBSD50_ENV 1 #define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */ @@ -50,7 +50,7 @@ #define AFS_X86_FBSD81_ENV 1 #define AFS_X86_FBSD90_ENV 1 #define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD1000_ENV 1 +#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_ENV 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 @@ -159,7 +159,7 @@ enum vcexcl { NONEXCL, EXCL }; #define AFS_USR_FBSD81_ENV 1 #define AFS_USR_FBSD90_ENV 1 #define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD1000_ENV 1 +#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD_ENV 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 -- 2.39.5