diff --git a/Makefile.inc1 b/Makefile.inc1 index 17c1111..259eb4e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -55,10 +55,12 @@ 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 f0709c7..7bfa6f1 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/${VERSION_NUMBER}/${PRODUCT}/RELEASE/" +RELEASE_DOCS_PATH = "${BUILD_ROOT}/release/${PRODUCT}/${VERSION_NUMBER}/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 413977a..b65bd16 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/10/FreeNAS/BETA2/ChangeLog" +# CHANGELOG := "${BUILD_ROOT}/release/FreeNAS/10/BETA2/ChangeLog" # URLs PROJECT_SITE = "http://www.freenas.org" diff --git a/release/10/FreeNAS/BETA2/ReleaseNotes.txt b/build/profiles/default/release/FreeNAS/10/BETA2/ReleaseNotes.txt similarity index 100% rename from release/10/FreeNAS/BETA2/ReleaseNotes.txt rename to build/profiles/default/release/FreeNAS/10/BETA2/ReleaseNotes.txt diff --git a/build/profiles/freenas9/env.pyd b/build/profiles/freenas9/env.pyd index c309f22..06f35d1 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/9.10/FreeNAS/RELEASE/ChangeLog" +CHANGELOG := "${BUILD_ROOT}/release/FreeNAS/9.10/RELEASE/ChangeLog" # URLs PROJECT_SITE = "http://www.freenas.org" diff --git a/release/9.10/FreeNAS/RELEASE/ChangeLog b/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ChangeLog similarity index 100% rename from release/9.10/FreeNAS/RELEASE/ChangeLog rename to build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ChangeLog diff --git a/release/9.10/FreeNAS/RELEASE/README.md b/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/README.md similarity index 100% rename from release/9.10/FreeNAS/RELEASE/README.md rename to build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/README.md diff --git a/release/9.10/FreeNAS/RELEASE/ReleaseNotes b/build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ReleaseNotes similarity index 100% rename from release/9.10/FreeNAS/RELEASE/ReleaseNotes rename to build/profiles/freenas9/release/FreeNAS/9.10/RELEASE/ReleaseNotes diff --git a/build/tools/select-profile.py b/build/tools/select-profile.py old mode 100644 new mode 100755 diff --git a/build/tools/terminal-server.py b/build/tools/terminal-server.py old mode 100644 new mode 100755 diff --git a/build/tools/update-release-info.py b/build/tools/update-release-info.py new file mode 100755 index 0000000..bd18c74 --- /dev/null +++ b/build/tools/update-release-info.py @@ -0,0 +1,53 @@ +#!/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/release/9.10/TrueNAS/RELEASE/ChangeLog b/release/9.10/TrueNAS/RELEASE/ChangeLog deleted file mode 100644 index 12c2433..0000000 --- a/release/9.10/TrueNAS/RELEASE/ChangeLog +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 42c2724..0000000 --- a/release/9.10/TrueNAS/RELEASE/README.md +++ /dev/null @@ -1,61 +0,0 @@ -# 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 deleted file mode 100644 index 7158d94..0000000 --- a/release/9.10/TrueNAS/RELEASE/ReleaseNotes +++ /dev/null @@ -1,30 +0,0 @@ - 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.