Unify builder for both FN/TN images

Makefile.inc1

@@ -160,7 +160,7 @@ release:
 
 release-push: update-push
 	@${BUILD_TOOLS}/post-to-storage.py
-	@if [ "${PRODUCT}" == "FreeNAS" -a "${INTERNAL_UPDATE}" != "YES" -a "${INTERNAL_UPDATE}" != "yes" ]; then \
+	@if [ "${INTERNAL_UPDATE}" != "YES" -a "${INTERNAL_UPDATE}" != "yes" ]; then \
 		${BUILD_TOOLS}/post-to-download.py; \
 	fi
 
@@ -244,11 +244,7 @@ debug:
 
 api-docs:
 	@env CHECKOUT_ONLY="freenas" ${BUILD_TOOLS}/checkout.py
-.if ${PRODUCT} == "TrueNAS"
-	(make SPHINXOPTS="-t truenas" -C ${API_PATH}/api html)
-.else
 	(make -C ${API_PATH}/api html)
-.endif
 
 clean-docs:
 	make -C ${API_PATH}/api clean

build/config/env.pyd

@@ -127,8 +127,7 @@ DOWNLOAD_BASEDIR = "/downloads"
 DOWNLOAD_PREFIX = "${DOWNLOAD_BASEDIR}/${VERSION_NUMBER}"
 IX_INTERNAL_PATH_PREFIX = "/builds/${PRODUCT}"
 
-if PRODUCT == "FreeNAS":
-    DOWNLOAD_HOST = "download-master.freenas.org"
+DOWNLOAD_HOST = "download-master.freenas.org"
 
 # Debug info location
 DEBUG_ROOT = "${OBJDIR}/debug"

build/config/ports-installer.pyd

@@ -40,7 +40,6 @@ ports += "freenas/py-bsd"
 ports += {
     "name": "freenas/freenas-installer",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
         "REVISION=" + freenas_git_rev

build/profiles/freenas/config.pyd

@@ -34,10 +34,7 @@ profile = {
     "status": "active"
 }
 
-if PRODUCT == "TrueNAS":
-    kernel_config = "${BE_ROOT}/truenas/build/TRUENAS11.amd64"
-else:
-    kernel_config = "${PROFILE_ROOT}/kernel/FREENAS.amd64"
+kernel_config = "${PROFILE_ROOT}/kernel/FREENAS.amd64"
 
 kernel_modules = [
     "autofs",

build/profiles/freenas/jail.pyd

@@ -69,9 +69,3 @@ copy += {
     "source": "${BE_ROOT}/iocage",
     "dest": "/usr/iocage_src"
 }
-
-if PRODUCT == "TrueNAS":
-    copy += {
-        "source": "${BE_ROOT}/truenas",
-        "dest": "/usr/truenas"
-    }

build/profiles/freenas/ports-freenas.pyd

@@ -39,7 +39,6 @@ iocage_git_rev = sh("git -C ${BE_ROOT}/iocage log -1 --pretty=format:%ct") \
 ports += {
     "name": "freenas/freenas-files",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
         "REVISION=" + freenas_git_rev
@@ -49,30 +48,15 @@ ports += {
 ports += {
     "name": "freenas/pipewatcher",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
         "REVISION=" + freenas_git_rev
     ]
 }
 
-if PRODUCT == "TrueNAS":
-    truenas_git_rev = sh("git -C ${BE_ROOT}/truenas log -1 --pretty=format:%ct") \
-        if exists("${BE_ROOT}/truenas") \
-        else "0"
-    ports += {
-        "name": "truenas/truenas-files",
-        "options": [
-            "PRODUCT_VERSION=${VERSION}",
-            "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
-            "REVISION=" + truenas_git_rev
-        ]
-    }
-
 ports += {
     "name": "freenas/freenas-migrate93",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
     ]
@@ -81,13 +65,14 @@ ports += {
 ports += {
     "name": "freenas/freenas-ui",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
         "REVISION=" + freenas_git_rev
     ]
 }
 
+# TODO: Temporarily we allow passing product to webui port but this support would be removed
+#  once webui gets in shape for FN12
 
 ports += {
     "name": "freenas/freenas-webui",
@@ -102,7 +87,6 @@ ports += {
 ports += {
     "name": "sysutils/iocage",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
         "REVISION=" + iocage_git_rev
@@ -114,7 +98,6 @@ ports += {
 ports += {
     "name": "freenas/py-middlewared",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
         "REVISION=" + freenas_git_rev
@@ -125,7 +108,6 @@ ports += {
 ports += {
     "name": "freenas/py-midcli",
     "options": [
-        "PRODUCT=${PRODUCT}",
         "PRODUCT_VERSION=${VERSION}",
         "BUILD_TIMESTAMP=${BUILD_TIMESTAMP}",
     ]

build/profiles/freenas/ports-system.pyd

@@ -69,12 +69,11 @@ ports += "net/mosh"
 ports += "net/zerotier"
 ports += "net-mgmt/sipcalc"
 
-if LABEL != "TrueNAS":
-    ports += "net/vblade"
-    ports += {
-        "name": "emulators/virtualbox-ose-kmod",
-        "options": ["OPTIONS_FILE_SET+=VIMAGE"]
-    }
+ports += "net/vblade"
+ports += {
+    "name": "emulators/virtualbox-ose-kmod",
+    "options": ["OPTIONS_FILE_SET+=VIMAGE"]
+}
 
 ports += "security/cyrus-sasl2-gssapi"
 ports += {
@@ -222,9 +221,8 @@ ports += {
 ports += "sysutils/arcconf"
 ports += "sysutils/tw_cli"
 ports += "sysutils/megacli"
-if PRODUCT != "TrueNAS":
-    ports += "sysutils/areca-cli"
-    ports += "sysutils/hptcli"
+ports += "sysutils/areca-cli"
+ports += "sysutils/hptcli"
 ports += {
     "name": "net/py-ldap",
     "options": ["OPTIONS_FILE_SET+=SASL"]

build/profiles/freenas/ports.pyd

@@ -31,8 +31,5 @@ port_trees = [
     "${BE_ROOT}/webui/ports",
 ]
 
-if PRODUCT == "TrueNAS":
-    port_trees += "${BE_ROOT}/truenas/ports"
-
 binary_packages = [
 ]

build/profiles/freenas/repos.pyd

@@ -95,11 +95,3 @@ repos += {
     "url": "https://github.com/freenas/iocage.git",
     "branch": "master"
 }
-
-if PRODUCT == "TrueNAS":
-    repos += {
-        "name": "truenas",
-        "path": "truenas",
-        "url": "git@github.com:iXsystems/truenas.git",
-        "branch": "master"
-    }