From 2734bb064a5bdf2b6156c1f6fb255d457f9c60df Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 3 Dec 2016 21:41:00 -0800 Subject: [PATCH] Revert "Merge pull request #17 from DennisJensen-OWC/master" This reverts commit edf90aca18068e2bd276f6a3f8f7d549604dc776, reversing changes made to eea0edd1275a6ae4cc71cd57ad75a8c3dd340ee6. --- Makefile.inc1 | 2 - build/config/env.pyd | 2 +- build/profiles/default/env.pyd | 2 +- build/profiles/freenas9/env.pyd | 2 +- build/tools/select-profile.py | 0 build/tools/terminal-server.py | 0 build/tools/update-release-info.py | 53 ---------------- .../10/FreeNAS}/BETA2/ReleaseNotes.txt | 0 .../9.10/FreeNAS}/RELEASE/ChangeLog | 0 .../9.10/FreeNAS}/RELEASE/README.md | 0 .../9.10/FreeNAS}/RELEASE/ReleaseNotes | 0 release/9.10/TrueNAS/RELEASE/ChangeLog | 41 +++++++++++++ release/9.10/TrueNAS/RELEASE/README.md | 61 +++++++++++++++++++ release/9.10/TrueNAS/RELEASE/ReleaseNotes | 30 +++++++++ 14 files changed, 135 insertions(+), 58 deletions(-) mode change 100755 => 100644 build/tools/select-profile.py mode change 100755 => 100644 build/tools/terminal-server.py delete mode 100755 build/tools/update-release-info.py rename {build/profiles/default/release/FreeNAS/10 => release/10/FreeNAS}/BETA2/ReleaseNotes.txt (100%) rename {build/profiles/freenas9/release/FreeNAS/9.10 => release/9.10/FreeNAS}/RELEASE/ChangeLog (100%) rename {build/profiles/freenas9/release/FreeNAS/9.10 => release/9.10/FreeNAS}/RELEASE/README.md (100%) rename {build/profiles/freenas9/release/FreeNAS/9.10 => release/9.10/FreeNAS}/RELEASE/ReleaseNotes (100%) create mode 100644 release/9.10/TrueNAS/RELEASE/ChangeLog create mode 100644 release/9.10/TrueNAS/RELEASE/README.md create mode 100644 release/9.10/TrueNAS/RELEASE/ReleaseNotes diff --git a/Makefile.inc1 b/Makefile.inc1 index 259eb4e..17c1111 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -55,12 +55,10 @@ packages: checkout: @${BUILD_TOOLS}/checkout.py - @${BUILD_TOOLS}/update-release-info.py update: @git pull @${BUILD_TOOLS}/checkout.py - @${BUILD_TOOLS}/update-release-info.py buildenv: @sh diff --git a/build/config/env.pyd b/build/config/env.pyd index 7bfa6f1..f0709c7 100644 --- a/build/config/env.pyd +++ b/build/config/env.pyd @@ -84,7 +84,7 @@ TRAIN = TRAIN or "${PRODUCT}-${VERSION_NUMBER}-Nightlies" RELEASE_STAGEDIR = "${BE_ROOT}/release/${PRODUCT}-${VERSION}" UPGRADE_STAGEDIR = "${BE_ROOT}/release/${TRAIN}-${BUILD_TIMESTAMP}-Update" LATEST = "${OBJDIR}/LATEST" -RELEASE_DOCS_PATH = "${BUILD_ROOT}/release/${PRODUCT}/${VERSION_NUMBER}/RELEASE/" +RELEASE_DOCS_PATH = "${BUILD_ROOT}/release/${VERSION_NUMBER}/${PRODUCT}/RELEASE/" UPDATE_DB = "sqlite:${PRODUCT}-updates.db" UPDATE_DEST = "/tank/www/${PRODUCT}" diff --git a/build/profiles/default/env.pyd b/build/profiles/default/env.pyd index b65bd16..413977a 100644 --- a/build/profiles/default/env.pyd +++ b/build/profiles/default/env.pyd @@ -8,7 +8,7 @@ SRC_ROOT = "${MIDDLEWARE_ROOT}/src" DOWNLOAD_HOST = "download.freenas.org" -# CHANGELOG := "${BUILD_ROOT}/release/FreeNAS/10/BETA2/ChangeLog" +# CHANGELOG := "${BUILD_ROOT}/release/10/FreeNAS/BETA2/ChangeLog" # URLs PROJECT_SITE = "http://www.freenas.org" diff --git a/build/profiles/freenas9/env.pyd b/build/profiles/freenas9/env.pyd index 06f35d1..c309f22 100644 --- a/build/profiles/freenas9/env.pyd +++ b/build/profiles/freenas9/env.pyd @@ -9,7 +9,7 @@ SRC_ROOT = "${FREENAS_ROOT}/src" DOWNLOAD_HOST = "download.freenas.org" -CHANGELOG := "${BUILD_ROOT}/release/FreeNAS/9.10/RELEASE/ChangeLog" +CHANGELOG := "${BUILD_ROOT}/release/9.10/FreeNAS/RELEASE/ChangeLog" # URLs PROJECT_SITE = "http://www.freenas.org" diff --git a/build/tools/select-profile.py b/build/tools/select-profile.py old mode 100755 new mode 100644 diff --git a/build/tools/terminal-server.py b/build/tools/terminal-server.py old mode 100755 new mode 100644 diff --git a/build/tools/update-release-info.py b/build/tools/update-release-info.py deleted file mode 100755 index bd18c74..0000000 --- a/build/tools/update-release-info.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python3 -#+ -# Copyright 2010-2016 The FreeNAS Project -# All rights reserved -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted providing that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# This Software is Provided by the Author ''As Is'' and Any Express or -# Implied Warranties, Including, But Not Limited To, the Implied -# Warranties of Merchantability and Fitness For a Particular Purpose -# Are Disclaimed. In No Event Shall the Author be Liable For Any -# Direct, Indirect, Incidental, Special, Exemplary, or Consequential -# Damages (Including, But Not Limited To, Procurement of Substitute -# Goods or Services; Loss of Use, Data, or Profits; or Business -# Interruption) However Caused And on Any Theory of Liability, Whether -# in Contract, Strict Liability, or Tort (Including Negligence or -# Otherwise) Arising in Any Way Out of the Use of This Software, Even -# if Advised of the Possibility of Such Damage. -# -###################################################################### - -import os -import sys -import shutil -import inspect -from utils import e , info - -dsl = load_profile_config() - -def main(): - source = e('${PROFILE_ROOT}/release') - destination = e('${BUILD_ROOT}/release') - - # Delete the ./release directory thus removing current content - shutil.rmtree(destination) - - # Copy the complete profile/release directory to ./release - # thus recreating ./release with the up-to-date content - shutil.copytree(source, destination) - -if __name__ == '__main__': - info('Updating Release Information') - sys.exit(main()) diff --git a/build/profiles/default/release/FreeNAS/10/BETA2/ReleaseNotes.txt b/release/10/FreeNAS/BETA2/ReleaseNotes.txt similarity index 100% rename from build/profiles/default/release/FreeNAS/10/BETA2/ReleaseNotes.txt rename to release/10/FreeNAS/BETA2/ReleaseNotes.txt diff --git a/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ChangeLog b/release/9.10/FreeNAS/RELEASE/ChangeLog similarity index 100% rename from build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ChangeLog rename to release/9.10/FreeNAS/RELEASE/ChangeLog diff --git a/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/README.md b/release/9.10/FreeNAS/RELEASE/README.md similarity index 100% rename from build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/README.md rename to release/9.10/FreeNAS/RELEASE/README.md diff --git a/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ReleaseNotes b/release/9.10/FreeNAS/RELEASE/ReleaseNotes similarity index 100% rename from build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ReleaseNotes rename to release/9.10/FreeNAS/RELEASE/ReleaseNotes diff --git a/release/9.10/TrueNAS/RELEASE/ChangeLog b/release/9.10/TrueNAS/RELEASE/ChangeLog new file mode 100644 index 0000000..12c2433 --- /dev/null +++ b/release/9.10/TrueNAS/RELEASE/ChangeLog @@ -0,0 +1,41 @@ +Security Fixes: + +o FreeBSD libarchive SA https://security.freebsd.org/advisories/FreeBSD-SA-16:22.libarchive.asc + +o FreeBSD libarchive SA https://security.freebsd.org/advisories/FreeBSD-SA-16:23.libarchive.asc + +o FreeBSD ntp SA https://security.freebsd.org/advisories/FreeBSD-SA-16:24.ntp.asc + +Enhancements: + +o FreeBSD 10 under the hood, bringing with it hundreds of + performance and stability improvements. + +o Autotuning values refresh. Autotuner enabled by default on new installs. + These changes provide for stability and performance improvements in + environments with 10Gbe or faster networking configurations. + +o Hardware faults result in automatic ticket creation in the iXsystems support + portal if TrueNAS has access to the internet. + +Critical Fixes: + +o Several bugs in encrypted HA addressed. + +o Fix several bugs in the behavior of an HA pair when failover is + administratively disabled and one or both heads are cold started. + +o Fixed LDAP bind issues using SSL /TLS. + +Non-Critical Fixes: + +o HA status reporting distinguishes between administratively disabled and + unavailable due to non-administrative circumstances. + +o Fixed handling of disk descriptions in HA nodes where the two nodes may not + agree on device handles. + +o Don't warn that an action will cause a failover of an HA pair if failover is + admistratively disabled. + +o Added an alert to let user know if Active Directory bind was unsuccessful. diff --git a/release/9.10/TrueNAS/RELEASE/README.md b/release/9.10/TrueNAS/RELEASE/README.md new file mode 100644 index 0000000..42c2724 --- /dev/null +++ b/release/9.10/TrueNAS/RELEASE/README.md @@ -0,0 +1,61 @@ +# Building / Updating FreeNAS 10 + +To update an existing FreeNAS 10 instance that you are using for development +purposes: + +* ```make update``` +* ```make ports``` +* ```make reinstall-package package=freenas host=root@1.2.3.4``` + +Where 1.2.3.4 is the IP address of your development platform. SSH will be +used to push and install the new packages onto that host. + +To build FreeNAS 10 from scratch (experts only): + +## Requirements: + +* Your build environment must be FreeBSD 10.2-RELEASE or FreeBSD 10-STABLE +(building on FreeBSD 9 or 11 is not supported at this time). + +* An amd64 capable processor. 12GB of memory, or an equal/greater amount + of swap space, is also required. + +* You will need the following ports/packages when compiling anything + FreeNAS-related: + * ports-mgmt/poudriere-devel + * devel/git + * sysutils/cdrtools + * archivers/pxz + * lang/python3 (3.4 or later, must also be installed) + * sysutils/grub2-pcbsd + * sysutils/xorriso + * devel/gmake + + (and all the dependencies that these ports/pkgs install, of course) + + You can also use ```make bootstrap-pkgs``` to let it install required + dependencies automatically. It will only install whats listed in the Makefile + you will need to install textproc/py-sphinx_numfig + from the ports systems as there are no packages available. + +## Building the System Quickstart Flow: + +Note: All these commands must be run as `root`. + +``` +% make checkout +% make release +``` + +* Update the source tree to pull in new source code changes + +``` +% make update +``` + +This will also fetch TrueOS and ports for the build from github. + +## The End Result: + +If your build completes successfully, you'll have release bits in the _BE +directory. diff --git a/release/9.10/TrueNAS/RELEASE/ReleaseNotes b/release/9.10/TrueNAS/RELEASE/ReleaseNotes new file mode 100644 index 0000000..7158d94 --- /dev/null +++ b/release/9.10/TrueNAS/RELEASE/ReleaseNotes @@ -0,0 +1,30 @@ + OS: + The base OS version for TrueNAS 9.10 is now FreeBSD-10.3-STABLE, + bringing in a huge number of OS-related bug fixes, performance + improvements and new features (new drivers, new CPU chipset support, + USB 3.0, etc). + + + Directory Services: + You can now connect to large AD domains with cache disabled. + + + Reporting: + Add the ability to send collectd data to a remote graphite server. + Support ticket is automatically created when there is a hardware system alert. + + + Filesharing: + Samba (SMB filesharing) updated from version 4.1 to 4.3.6. + Added GUI feature to allow NFSv3-like ownership when using NFSv4. + Various bug fixes related to FreeBSD 10. For more in-depth information, + see the ChangeLog file. + + + Trains: + This release, and all future updates to it, are on the TrueNAS-9.10-STABLE + train. + + + API: + New API endpoints were added and quite a few bugs were addressed to improve existing endpoints.