From 564c871584bd1e1b2184df5a1a86a3533b8a0d33 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Wed, 19 Apr 2017 10:52:05 -0400 Subject: [PATCH] Rename freenas9 build profile to just "freenas" and do the same with fn9_head -> fn_head Change internal 9.10 strings to '11' --- Makefile | 2 +- build/profiles/{fn9_head => fn_head}/ValidateUpdate | 2 +- build/profiles/{fn9_head => fn_head}/config.pyd | 2 +- build/profiles/{fn9_head => fn_head}/env.pyd | 4 ++-- build/profiles/{fn9_head => fn_head}/jail.pyd | 0 build/profiles/{fn9_head => fn_head}/kernel/DEBUG | 0 build/profiles/{fn9_head => fn_head}/kernel/FREENAS.amd64 | 0 build/profiles/{fn9_head => fn_head}/packages.pyd | 0 build/profiles/{fn9_head => fn_head}/packages/base-os/config | 0 build/profiles/{fn9_head => fn_head}/packages/docs/config | 0 .../{fn9_head => fn_head}/packages/freebsd-pkgdb/config | 0 .../{fn9_head => fn_head}/packages/freenas-pkg-tools/config | 0 .../profiles/{fn9_head => fn_head}/packages/freenasUI/config | 0 build/profiles/{fn9_head => fn_head}/ports-freenas.pyd | 0 build/profiles/{fn9_head => fn_head}/ports-system.pyd | 0 build/profiles/{fn9_head => fn_head}/ports.pyd | 0 .../release/FreeNAS/9.10/RELEASE/ChangeLog | 0 .../release/FreeNAS/9.10/RELEASE/README.md | 0 .../release/FreeNAS/9.10/RELEASE/ReleaseNotes | 0 build/profiles/{fn9_head => fn_head}/repos.pyd | 0 build/profiles/{freenas9 => freenas}/ValidateUpdate | 2 +- build/profiles/{freenas9 => freenas}/config.pyd | 4 ++-- build/profiles/{freenas9 => freenas}/env.pyd | 4 ++-- build/profiles/{freenas9 => freenas}/jail.pyd | 0 build/profiles/{freenas9 => freenas}/kernel/DEBUG | 0 build/profiles/{freenas9 => freenas}/kernel/FREENAS.amd64 | 0 build/profiles/{freenas9 => freenas}/packages.pyd | 0 build/profiles/{freenas9 => freenas}/packages/base-os/config | 0 build/profiles/{freenas9 => freenas}/packages/docs/config | 0 .../{freenas9 => freenas}/packages/freebsd-pkgdb/config | 0 .../{freenas9 => freenas}/packages/freenas-pkg-tools/config | 0 .../profiles/{freenas9 => freenas}/packages/freenasUI/config | 0 build/profiles/{freenas9 => freenas}/ports-freenas.pyd | 0 build/profiles/{freenas9 => freenas}/ports-system.pyd | 0 build/profiles/{freenas9 => freenas}/ports.pyd | 0 .../release/FreeNAS/9.10/RELEASE/ChangeLog | 0 .../release/FreeNAS/9.10/RELEASE/README.md | 0 .../release/FreeNAS/9.10/RELEASE/ReleaseNotes | 0 build/profiles/{freenas9 => freenas}/repos.pyd | 0 39 files changed, 10 insertions(+), 10 deletions(-) rename build/profiles/{fn9_head => fn_head}/ValidateUpdate (68%) rename build/profiles/{fn9_head => fn_head}/config.pyd (99%) rename build/profiles/{fn9_head => fn_head}/env.pyd (78%) rename build/profiles/{fn9_head => fn_head}/jail.pyd (100%) rename build/profiles/{fn9_head => fn_head}/kernel/DEBUG (100%) rename build/profiles/{fn9_head => fn_head}/kernel/FREENAS.amd64 (100%) rename build/profiles/{fn9_head => fn_head}/packages.pyd (100%) rename build/profiles/{fn9_head => fn_head}/packages/base-os/config (100%) rename build/profiles/{fn9_head => fn_head}/packages/docs/config (100%) rename build/profiles/{fn9_head => fn_head}/packages/freebsd-pkgdb/config (100%) rename build/profiles/{fn9_head => fn_head}/packages/freenas-pkg-tools/config (100%) rename build/profiles/{fn9_head => fn_head}/packages/freenasUI/config (100%) rename build/profiles/{fn9_head => fn_head}/ports-freenas.pyd (100%) rename build/profiles/{fn9_head => fn_head}/ports-system.pyd (100%) rename build/profiles/{fn9_head => fn_head}/ports.pyd (100%) rename build/profiles/{fn9_head => fn_head}/release/FreeNAS/9.10/RELEASE/ChangeLog (100%) rename build/profiles/{fn9_head => fn_head}/release/FreeNAS/9.10/RELEASE/README.md (100%) rename build/profiles/{fn9_head => fn_head}/release/FreeNAS/9.10/RELEASE/ReleaseNotes (100%) rename build/profiles/{fn9_head => fn_head}/repos.pyd (100%) rename build/profiles/{freenas9 => freenas}/ValidateUpdate (68%) rename build/profiles/{freenas9 => freenas}/config.pyd (98%) rename build/profiles/{freenas9 => freenas}/env.pyd (77%) rename build/profiles/{freenas9 => freenas}/jail.pyd (100%) rename build/profiles/{freenas9 => freenas}/kernel/DEBUG (100%) rename build/profiles/{freenas9 => freenas}/kernel/FREENAS.amd64 (100%) rename build/profiles/{freenas9 => freenas}/packages.pyd (100%) rename build/profiles/{freenas9 => freenas}/packages/base-os/config (100%) rename build/profiles/{freenas9 => freenas}/packages/docs/config (100%) rename build/profiles/{freenas9 => freenas}/packages/freebsd-pkgdb/config (100%) rename build/profiles/{freenas9 => freenas}/packages/freenas-pkg-tools/config (100%) rename build/profiles/{freenas9 => freenas}/packages/freenasUI/config (100%) rename build/profiles/{freenas9 => freenas}/ports-freenas.pyd (100%) rename build/profiles/{freenas9 => freenas}/ports-system.pyd (100%) rename build/profiles/{freenas9 => freenas}/ports.pyd (100%) rename build/profiles/{freenas9 => freenas}/release/FreeNAS/9.10/RELEASE/ChangeLog (100%) rename build/profiles/{freenas9 => freenas}/release/FreeNAS/9.10/RELEASE/README.md (100%) rename build/profiles/{freenas9 => freenas}/release/FreeNAS/9.10/RELEASE/ReleaseNotes (100%) rename build/profiles/{freenas9 => freenas}/repos.pyd (100%) diff --git a/Makefile b/Makefile index a8fecaa..5012120 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ PROFILE_SETTING = ${BUILD_ROOT}/build/profiles/profile-setting . if exists(${PROFILE_SETTING}) PROFILE != cat ${PROFILE_SETTING} . else -PROFILE := freenas9 +PROFILE := freenas . endif .endif diff --git a/build/profiles/fn9_head/ValidateUpdate b/build/profiles/fn_head/ValidateUpdate similarity index 68% rename from build/profiles/fn9_head/ValidateUpdate rename to build/profiles/fn_head/ValidateUpdate index 8b66dd0..e323a72 100644 --- a/build/profiles/fn9_head/ValidateUpdate +++ b/build/profiles/fn_head/ValidateUpdate @@ -2,7 +2,7 @@ pciconf -l | grep -q "chip=0x....1aed" if [ $? = 0 ]; then # Fusion-I/O card has been found -echo "TrueNAS 9.10 does not support Fusion-I/O cards" 1>&2 +echo "TrueNAS 11 does not support Fusion-I/O cards" 1>&2 exit 1 else exit 0 diff --git a/build/profiles/fn9_head/config.pyd b/build/profiles/fn_head/config.pyd similarity index 99% rename from build/profiles/fn9_head/config.pyd rename to build/profiles/fn_head/config.pyd index 7dfe821..344fdbb 100644 --- a/build/profiles/fn9_head/config.pyd +++ b/build/profiles/fn_head/config.pyd @@ -29,7 +29,7 @@ include("packages.pyd") profile = { "name": "freenas_head", - "description": "FreeNAS 9.10 with FreeBSD HEAD", + "description": "FreeNAS 11 with FreeBSD HEAD", "owner": "dev@ixsystems.com", "status": "active" } diff --git a/build/profiles/fn9_head/env.pyd b/build/profiles/fn_head/env.pyd similarity index 78% rename from build/profiles/fn9_head/env.pyd rename to build/profiles/fn_head/env.pyd index 458083e..8555587 100644 --- a/build/profiles/fn9_head/env.pyd +++ b/build/profiles/fn_head/env.pyd @@ -1,10 +1,10 @@ MILESTONE = MILESTONE or "FREEBSD-HEAD" FREEBSD_RELEASE_VERSION = "12.0-CURRENT" -VERSION_NUMBER = "9.10" +VERSION_NUMBER = "11" FREENAS_ROOT = "${BE_ROOT}/freenas" SRC_ROOT = "${FREENAS_ROOT}/src" -CHANGELOG = "${BUILD_ROOT}/release/FreeNAS/9.10/RELEASE/ChangeLog" +CHANGELOG = "${BUILD_ROOT}/release/FreeNAS/11/RELEASE/ChangeLog" if exists("${FREENAS_ROOT}"): GIT_REVISION = sh("git -C ${FREENAS_ROOT} rev-parse --verify --short HEAD") diff --git a/build/profiles/fn9_head/jail.pyd b/build/profiles/fn_head/jail.pyd similarity index 100% rename from build/profiles/fn9_head/jail.pyd rename to build/profiles/fn_head/jail.pyd diff --git a/build/profiles/fn9_head/kernel/DEBUG b/build/profiles/fn_head/kernel/DEBUG similarity index 100% rename from build/profiles/fn9_head/kernel/DEBUG rename to build/profiles/fn_head/kernel/DEBUG diff --git a/build/profiles/fn9_head/kernel/FREENAS.amd64 b/build/profiles/fn_head/kernel/FREENAS.amd64 similarity index 100% rename from build/profiles/fn9_head/kernel/FREENAS.amd64 rename to build/profiles/fn_head/kernel/FREENAS.amd64 diff --git a/build/profiles/fn9_head/packages.pyd b/build/profiles/fn_head/packages.pyd similarity index 100% rename from build/profiles/fn9_head/packages.pyd rename to build/profiles/fn_head/packages.pyd diff --git a/build/profiles/fn9_head/packages/base-os/config b/build/profiles/fn_head/packages/base-os/config similarity index 100% rename from build/profiles/fn9_head/packages/base-os/config rename to build/profiles/fn_head/packages/base-os/config diff --git a/build/profiles/fn9_head/packages/docs/config b/build/profiles/fn_head/packages/docs/config similarity index 100% rename from build/profiles/fn9_head/packages/docs/config rename to build/profiles/fn_head/packages/docs/config diff --git a/build/profiles/fn9_head/packages/freebsd-pkgdb/config b/build/profiles/fn_head/packages/freebsd-pkgdb/config similarity index 100% rename from build/profiles/fn9_head/packages/freebsd-pkgdb/config rename to build/profiles/fn_head/packages/freebsd-pkgdb/config diff --git a/build/profiles/fn9_head/packages/freenas-pkg-tools/config b/build/profiles/fn_head/packages/freenas-pkg-tools/config similarity index 100% rename from build/profiles/fn9_head/packages/freenas-pkg-tools/config rename to build/profiles/fn_head/packages/freenas-pkg-tools/config diff --git a/build/profiles/fn9_head/packages/freenasUI/config b/build/profiles/fn_head/packages/freenasUI/config similarity index 100% rename from build/profiles/fn9_head/packages/freenasUI/config rename to build/profiles/fn_head/packages/freenasUI/config diff --git a/build/profiles/fn9_head/ports-freenas.pyd b/build/profiles/fn_head/ports-freenas.pyd similarity index 100% rename from build/profiles/fn9_head/ports-freenas.pyd rename to build/profiles/fn_head/ports-freenas.pyd diff --git a/build/profiles/fn9_head/ports-system.pyd b/build/profiles/fn_head/ports-system.pyd similarity index 100% rename from build/profiles/fn9_head/ports-system.pyd rename to build/profiles/fn_head/ports-system.pyd diff --git a/build/profiles/fn9_head/ports.pyd b/build/profiles/fn_head/ports.pyd similarity index 100% rename from build/profiles/fn9_head/ports.pyd rename to build/profiles/fn_head/ports.pyd diff --git a/build/profiles/fn9_head/release/FreeNAS/9.10/RELEASE/ChangeLog b/build/profiles/fn_head/release/FreeNAS/9.10/RELEASE/ChangeLog similarity index 100% rename from build/profiles/fn9_head/release/FreeNAS/9.10/RELEASE/ChangeLog rename to build/profiles/fn_head/release/FreeNAS/9.10/RELEASE/ChangeLog diff --git a/build/profiles/fn9_head/release/FreeNAS/9.10/RELEASE/README.md b/build/profiles/fn_head/release/FreeNAS/9.10/RELEASE/README.md similarity index 100% rename from build/profiles/fn9_head/release/FreeNAS/9.10/RELEASE/README.md rename to build/profiles/fn_head/release/FreeNAS/9.10/RELEASE/README.md diff --git a/build/profiles/fn9_head/release/FreeNAS/9.10/RELEASE/ReleaseNotes b/build/profiles/fn_head/release/FreeNAS/9.10/RELEASE/ReleaseNotes similarity index 100% rename from build/profiles/fn9_head/release/FreeNAS/9.10/RELEASE/ReleaseNotes rename to build/profiles/fn_head/release/FreeNAS/9.10/RELEASE/ReleaseNotes diff --git a/build/profiles/fn9_head/repos.pyd b/build/profiles/fn_head/repos.pyd similarity index 100% rename from build/profiles/fn9_head/repos.pyd rename to build/profiles/fn_head/repos.pyd diff --git a/build/profiles/freenas9/ValidateUpdate b/build/profiles/freenas/ValidateUpdate similarity index 68% rename from build/profiles/freenas9/ValidateUpdate rename to build/profiles/freenas/ValidateUpdate index 8b66dd0..e323a72 100644 --- a/build/profiles/freenas9/ValidateUpdate +++ b/build/profiles/freenas/ValidateUpdate @@ -2,7 +2,7 @@ pciconf -l | grep -q "chip=0x....1aed" if [ $? = 0 ]; then # Fusion-I/O card has been found -echo "TrueNAS 9.10 does not support Fusion-I/O cards" 1>&2 +echo "TrueNAS 11 does not support Fusion-I/O cards" 1>&2 exit 1 else exit 0 diff --git a/build/profiles/freenas9/config.pyd b/build/profiles/freenas/config.pyd similarity index 98% rename from build/profiles/freenas9/config.pyd rename to build/profiles/freenas/config.pyd index 38ead18..b84329a 100644 --- a/build/profiles/freenas9/config.pyd +++ b/build/profiles/freenas/config.pyd @@ -28,8 +28,8 @@ include("ports.pyd") include("packages.pyd") profile = { - "name": "freenas9", - "description": "FreeNAS 9.10 with FreeBSD 11 stable", + "name": "freenas11", + "description": "FreeNAS 11", "owner": "dev@ixsystems.com", "status": "active" } diff --git a/build/profiles/freenas9/env.pyd b/build/profiles/freenas/env.pyd similarity index 77% rename from build/profiles/freenas9/env.pyd rename to build/profiles/freenas/env.pyd index cf3cae7..0f7737f 100644 --- a/build/profiles/freenas9/env.pyd +++ b/build/profiles/freenas/env.pyd @@ -1,10 +1,10 @@ MILESTONE = MILESTONE or "MASTER" FREEBSD_RELEASE_VERSION = "11.0-RELEASE" -VERSION_NUMBER = "9.10" +VERSION_NUMBER = "11" FREENAS_ROOT = "${BE_ROOT}/freenas" SRC_ROOT = "${FREENAS_ROOT}/src" -CHANGELOG = "${BUILD_ROOT}/release/FreeNAS/9.10/RELEASE/ChangeLog" +CHANGELOG = "${BUILD_ROOT}/release/FreeNAS/11/RELEASE/ChangeLog" if exists("${FREENAS_ROOT}"): GIT_REVISION = sh("git -C ${FREENAS_ROOT} rev-parse --verify --short HEAD") diff --git a/build/profiles/freenas9/jail.pyd b/build/profiles/freenas/jail.pyd similarity index 100% rename from build/profiles/freenas9/jail.pyd rename to build/profiles/freenas/jail.pyd diff --git a/build/profiles/freenas9/kernel/DEBUG b/build/profiles/freenas/kernel/DEBUG similarity index 100% rename from build/profiles/freenas9/kernel/DEBUG rename to build/profiles/freenas/kernel/DEBUG diff --git a/build/profiles/freenas9/kernel/FREENAS.amd64 b/build/profiles/freenas/kernel/FREENAS.amd64 similarity index 100% rename from build/profiles/freenas9/kernel/FREENAS.amd64 rename to build/profiles/freenas/kernel/FREENAS.amd64 diff --git a/build/profiles/freenas9/packages.pyd b/build/profiles/freenas/packages.pyd similarity index 100% rename from build/profiles/freenas9/packages.pyd rename to build/profiles/freenas/packages.pyd diff --git a/build/profiles/freenas9/packages/base-os/config b/build/profiles/freenas/packages/base-os/config similarity index 100% rename from build/profiles/freenas9/packages/base-os/config rename to build/profiles/freenas/packages/base-os/config diff --git a/build/profiles/freenas9/packages/docs/config b/build/profiles/freenas/packages/docs/config similarity index 100% rename from build/profiles/freenas9/packages/docs/config rename to build/profiles/freenas/packages/docs/config diff --git a/build/profiles/freenas9/packages/freebsd-pkgdb/config b/build/profiles/freenas/packages/freebsd-pkgdb/config similarity index 100% rename from build/profiles/freenas9/packages/freebsd-pkgdb/config rename to build/profiles/freenas/packages/freebsd-pkgdb/config diff --git a/build/profiles/freenas9/packages/freenas-pkg-tools/config b/build/profiles/freenas/packages/freenas-pkg-tools/config similarity index 100% rename from build/profiles/freenas9/packages/freenas-pkg-tools/config rename to build/profiles/freenas/packages/freenas-pkg-tools/config diff --git a/build/profiles/freenas9/packages/freenasUI/config b/build/profiles/freenas/packages/freenasUI/config similarity index 100% rename from build/profiles/freenas9/packages/freenasUI/config rename to build/profiles/freenas/packages/freenasUI/config diff --git a/build/profiles/freenas9/ports-freenas.pyd b/build/profiles/freenas/ports-freenas.pyd similarity index 100% rename from build/profiles/freenas9/ports-freenas.pyd rename to build/profiles/freenas/ports-freenas.pyd diff --git a/build/profiles/freenas9/ports-system.pyd b/build/profiles/freenas/ports-system.pyd similarity index 100% rename from build/profiles/freenas9/ports-system.pyd rename to build/profiles/freenas/ports-system.pyd diff --git a/build/profiles/freenas9/ports.pyd b/build/profiles/freenas/ports.pyd similarity index 100% rename from build/profiles/freenas9/ports.pyd rename to build/profiles/freenas/ports.pyd diff --git a/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ChangeLog b/build/profiles/freenas/release/FreeNAS/9.10/RELEASE/ChangeLog similarity index 100% rename from build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ChangeLog rename to build/profiles/freenas/release/FreeNAS/9.10/RELEASE/ChangeLog diff --git a/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/README.md b/build/profiles/freenas/release/FreeNAS/9.10/RELEASE/README.md similarity index 100% rename from build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/README.md rename to build/profiles/freenas/release/FreeNAS/9.10/RELEASE/README.md diff --git a/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ReleaseNotes b/build/profiles/freenas/release/FreeNAS/9.10/RELEASE/ReleaseNotes similarity index 100% rename from build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ReleaseNotes rename to build/profiles/freenas/release/FreeNAS/9.10/RELEASE/ReleaseNotes diff --git a/build/profiles/freenas9/repos.pyd b/build/profiles/freenas/repos.pyd similarity index 100% rename from build/profiles/freenas9/repos.pyd rename to build/profiles/freenas/repos.pyd