Merge branch 'master' into OS-8525

Author: danmcd

CONTRIBUTING.md

@@ -6,7 +6,7 @@
 
 <!--
     Copyright 2019 Joyent, Inc.
-    Copyright 2024 MNX Cloud, Inc.
+    Copyright 2025 MNX Cloud, Inc.
 -->
 
 # Triton Contribution Guidelines
@@ -55,7 +55,7 @@ tracking -- primarily to allow interaction with those without access to JIRA.
 
 ## Code of Conduct
 
-All persons and/or organizations contributing to, or intercting with our
+All persons and/or organizations contributing to, or interacting with our
 repositories or communities are required to abide by the
 [illumos Code of Conduct][coc].
 

Jenkinsfile

@@ -6,7 +6,7 @@
 
 /*
  * Copyright 2022 Joyent, Inc.
- * Copyright 2023 MNX Cloud, Inc.
+ * Copyright 2025 MNX Cloud, Inc.
  */
 
 @Library('jenkins-joylib@v1.0.8') _
@@ -45,8 +45,8 @@ pipeline {
                 '<dd>platform root password [default: randomly chosen]</dd>\n' +
                 '<dt>-S</dt>\n' +
                 '<dd>do *not* run smatch [default is to run smatch]</dd>\n' +
-                '<dt>-s gcc7</dt>\n' +
-                '<dd>shadow compilers, comma delimited (gcc7,gcc#) [default: none]</dd>\n' +
+                '<dt>-s gcc14</dt>\n' +
+                '<dd>shadow compilers, comma delimited (gcc14,gcc#) [default: none]</dd>\n' +
                 '</dl>'
         )
         text(
@@ -112,8 +112,9 @@ pipeline {
         stage('check') {
             agent {
                 node {
-                    label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
-                    'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
+                    label 'platform:true && image_ver:24.4.1 && ' +
+                    'pkgsrc_arch:x86_64 && (dram:16gb || dram:32gb ) && ' +
+                    '!virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
                     customWorkspace "workspace/smartos-${BRANCH_NAME}-check"
                 }
             }
@@ -157,8 +158,9 @@ set -o pipefail
                     // completes).
                     // Use ${BRANCH_NAME} instead.
                     node {
-                        label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
-                        'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
+                        label 'platform:true && image_ver:24.4.1 && ' +
+                        'pkgsrc_arch:x86_64 && (dram:16gb || dram:32gb ) && ' +
+                        '!virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
                         customWorkspace "workspace/smartos-${BRANCH_NAME}-default"
                     }
                 }
@@ -197,15 +199,16 @@ export ENGBLD_BITS_UPLOAD_IMGAPI=true
                             cleanWhenNotBuilt: true,
                             deleteDirs: true
                         joySlackNotifications(
-                            channel: 'smartos', comment: 'default')
+                            channel: 'cloud-smartos', comment: 'default')
                     }
                 }
             }
             stage('debug') {
                 agent {
                     node {
-                        label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
-                            'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
+                        label 'platform:true && image_ver:24.4.1 && ' +
+                        'pkgsrc_arch:x86_64 && (dram:16gb || dram:32gb ) && ' +
+                        '!virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
                         customWorkspace "workspace/smartos-${BRANCH_NAME}-debug"
                     }
                 }
@@ -246,16 +249,17 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
                             cleanWhenNotBuilt: true,
                             deleteDirs: true
                         joySlackNotifications(
-                            channel: 'smartos', comment: 'debug')
+                            channel: 'cloud-smartos', comment: 'debug')
                     }
                 }
             }
-            stage('gcc7') {
+            stage('gcc14') {
                 agent {
                     node {
-                        label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
-                            'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
-                        customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc7"
+                        label 'platform:true && image_ver:24.4.1 && ' +
+                        'pkgsrc_arch:x86_64 && (dram:16gb || dram:32gb ) && ' +
+                        '!virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
+                        customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc14"
                     }
                 }
                 when {
@@ -272,18 +276,18 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
                 steps {
                     sh('git clean -fdx')
                     sh('''
-export PLAT_CONFIGURE_ARGS="-p gcc7 -r $PLAT_CONFIGURE_ARGS"
+export PLAT_CONFIGURE_ARGS="-p gcc14 -r $PLAT_CONFIGURE_ARGS"
 # enough to make sure we don't pollute the main Manta dir
-# Also for now we implicitly promise that the gcc7 deliverables are DEBUG,
-# but we could choose to make -gcc7 *and* -debug-gcc7 stages later and alter
+# Also for now we implicitly promise that the gcc14 deliverables are DEBUG,
+# but we could choose to make -gcc14 *and* -debug-gcc14 stages later and alter
 # PLATFORM_DEBUG_SUFFIX accordingly.
-export PLATFORM_DEBUG_SUFFIX=-gcc7
-./tools/build_jenkins -c -d -S gcc7
+export PLATFORM_DEBUG_SUFFIX=-gcc14
+./tools/build_jenkins -c -d -S gcc14
                     ''')
                 }
                 post {
                     always {
-                        archiveArtifacts artifacts: 'output/gcc7/**',
+                        archiveArtifacts artifacts: 'output/gcc14/**',
                             onlyIfSuccessful: false,
                             allowEmptyArchive: true
                         cleanWs cleanWhenSuccess: true,
@@ -292,15 +296,16 @@ export PLATFORM_DEBUG_SUFFIX=-gcc7
                             cleanWhenNotBuilt: true,
                             deleteDirs: true
                         joySlackNotifications(
-                            channel: 'smartos', comment: 'gcc7')
+                            channel: 'cloud-smartos', comment: 'gcc14')
                     }
                 }
             }
             stage('strap-cache') {
                 agent {
                     node {
-                        label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
-                            'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
+                        label 'platform:true && image_ver:24.4.1 && ' +
+                        'pkgsrc_arch:x86_64 && (dram:16gb || dram:32gb ) && ' +
+                        '!virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
                         customWorkspace "workspace/smartos-${BRANCH_NAME}-strap-cache"
                     }
                 }
@@ -335,7 +340,7 @@ export MANTA_TOOLS_PATH=/root/bin/
                             cleanWhenNotBuilt: true,
                             deleteDirs: true
                         joySlackNotifications(
-                            channel: 'smartos', comment: 'strap-cache')
+                            channel: 'cloud-smartos', comment: 'strap-cache')
                     }
                 }
             }
@@ -344,10 +349,9 @@ export MANTA_TOOLS_PATH=/root/bin/
     }
     post {
         always {
+            joySlackNotifications(comment: 'pipeline complete')
             joySlackNotifications(
-                channel: 'jenkins', comment: 'pipeline complete')
-            joySlackNotifications(
-                channel: 'smartos', comment: 'pipeline complete')
+                channel: 'cloud-smartos', comment: 'pipeline complete')
         }
     }
 }

Makefile

@@ -11,7 +11,7 @@
 
 #
 # Copyright 2022 Joyent, Inc.
-# Copyright 2022 MNX Cloud, Inc.
+# Copyright 2025 MNX Cloud, Inc.
 #
 
 #
@@ -357,7 +357,7 @@ FORCEARG_yes=-f
 	touch $@
 
 # build our proto.strap area
-0-strap-stamp:
+0-strap-stamp: 0-preflight-stamp
 	$(ROOT)/tools/build_strap make \
 	    -a $(ADJUNCT_TARBALL) -d $(STRAP_PROTO) -j $(MAX_JOBS) \
 	    $(FORCEARG_$(FORCE_STRAP_REBUILD))

README.md

@@ -165,33 +165,32 @@ QEMU
 ## Setting up a Build Environment
 
 The first step when building is to set up a build environment. The SmartOS
-build requires building on SmartOS.  As of the `base-64-lts 21.4.0` build
-image, the SmartOS Platform Image must be 20211007 or newer. This can be done
+build requires building on SmartOS.  As of the `base-64-lts 24.4.1` build
+image, the SmartOS Platform Image must be 20220728 or newer. This can be done
 in VMware, on an existing SmartOS machine, or other virtualization. You must
 build inside of a non-global zone.
 
 ### Minimum Platform Image
 
-As of [OS-8412](https://smartos.org/bugview/OS-8412), OpenSSH requires OpenSSL
-3.0 to build, which means that you'll need to use a platform that includes
-[OS-8334](https://smartos.org/bugview/OS-8334). Release builds as of
-20211216T012707Z will satisfy this requirement.
+Because of changes in our build system regarding python3, you'll need to use a
+platform that includes [OS-8397](https://smartos.org/bugview/OS-8397). Release
+builds as of 20220728T031731Z will satisfy this requirement.
 
 ### Importing the Zone Image
 
-The SmartOS build currently uses the `base-64-lts 21.4.0` image
-which has a UUID of `c8715b60-7e98-11ec-82d1-03d16599f529 `. To import
+The SmartOS build currently uses the `base-64-lts 24.4.1` image
+which has a UUID of `2f1dc911-6401-4fa4-8e9d-67ea2e39c271`. To import
 the image, you should run the imgadm command from the global zone:
 
 ```
-# imgadm import c8715b60-7e98-11ec-82d1-03d16599f529
-Importing c8715b60-7e98-11ec-82d1-03d16599f529 (base-64-lts@21.4.0) from "https://images.smartos.org"
-Gather image c8715b60-7e98-11ec-82d1-03d16599f529 ancestry
-Must download and install 1 image (148.6 MiB)
-Download 1 image     [=======================>] 100% 148.62MB 497.77KB/s  5m 5s
-Downloaded image c8715b60-7e98-11ec-82d1-03d16599f529 (148.6 MiB)
-...82d1-03d16599f529 [=======================>] 100% 148.62MB   5.12MB/s    29s
-Imported image c8715b60-7e98-11ec-82d1-03d16599f529 (base-64-lts@21.4.0)
+# imgadm import 2f1dc911-6401-4fa4-8e9d-67ea2e39c271
+Importing 2f1dc911-6401-4fa4-8e9d-67ea2e39c271 (base-64-lts@24.4.1) from "https://images.smartos.org"
+Gather image 2f1dc911-6401-4fa4-8e9d-67ea2e39c271 ancestry
+Must download and install 1 image (237.1 MiB)
+Download 1 image     [=======================>] 100% 237.16MB  18.90MB/s    12s
+Downloaded image 2f1dc911-6401-4fa4-8e9d-67ea2e39c271 (237.1 MiB)
+...8e9d-67ea2e39c271 [=======================>] 100% 237.16MB  31.69MB/s     7s
+Imported image 2f1dc911-6401-4fa4-8e9d-67ea2e39c271 (base-64-lts@24.4.1)
 #
 ```
 
@@ -201,7 +200,7 @@ To create a zone, you need to create a `joyent` branded zone with
 `vmadm`. We recommend that the zone have the following attributes:
 
 * The brand set to `"joyent"`
-* The `image_uuid` set to `"c8715b60-7e98-11ec-82d1-03d16599f529"`
+* The `image_uuid` set to `"2f1dc911-6401-4fa4-8e9d-67ea2e39c271"`
 * At least 25 GiB of disk space specified in the `quota` property
 * At least 2-4 GiB of DRAM specified in the `max-physical-memory`
 property

configure

@@ -13,7 +13,7 @@
 
 #
 # Copyright 2021 Joyent, Inc.
-# Copyright 2023 MNX Cloud, Inc.
+# Copyright 2024 MNX Cloud, Inc.
 #
 shopt -s xpg_echo
 unalias -a
@@ -40,7 +40,7 @@ fi
 # We configure the projects framework using a 'configure-projects' file. This
 # is a plain text file which contains the project name, the branch we wish to
 # build it at, and either a URL to a git repository or 'origin' to denote the
-# github.com/joyent/<repo> location. See create_projects.
+# github.com/TritonDataCenter/<repo> location. See create_projects.
 #
 read -r -d '' configure_projects < default.configure-projects
 
@@ -154,7 +154,7 @@ function checkout_project
 function create_projects
 {
 	local dir="projects/local"
-	local git_stem="https://github.com/joyent"
+	local git_stem="https://github.com/TritonDataCenter"
 
 	[[ -d "$dir" ]] || mkdir -p "$dir" || fatal "failed to create $dir"
 
@@ -202,9 +202,9 @@ function install_pkgin
 	local pkglist
 
 	pkglist="build-essential flex libxslt openjdk11 nodejs"
-	pkglist="$pkglist p5-XML-Parser gettext python27 py39-expat python39"
+	pkglist="$pkglist p5-XML-Parser gettext python27 python312"
 	pkglist="$pkglist coreutils gsed pkg_alternatives cdrtools"
-	pkglist="$pkglist py27-sqlite3 nasm pigz smartos-build-tools"
+	pkglist="$pkglist nasm pigz smartos-build-tools"
 
 	$conf_priv pkgin -f update || fatal "failed to update pkgsrc repository"
 
@@ -384,9 +384,9 @@ SHADOW_CCCS="$SHADOW_CCCS";			export SHADOW_CCCS
 JAVA_ROOT=/opt/local/java/openjdk11;		export JAVA_ROOT
 FLEX=/opt/local/bin/flex;			export FLEX
 GNUXGETTEXT=/opt/local/bin/xgettext;		export GNUXGETTEXT
-PYTHON3=/opt/local/bin/python3.9;		export PYTHON3
-PYTHON3_VERSION=3.9;				export PYTHON3_VERSION
-PYTHON3_PKGVERS=-39;				export PYTHON3_PKGVERS
+PYTHON3=/opt/local/bin/python3.12;		export PYTHON3
+PYTHON3_VERSION=3.12;				export PYTHON3_VERSION
+PYTHON3_PKGVERS=-312;				export PYTHON3_PKGVERS
 PYTHON3_SUFFIX='';				export PYTHON3_SUFFIX
 BLD_JAVA_11='';					export BLD_JAVA_11
 
@@ -414,8 +414,8 @@ AR=/usr/bin/ar;					export AR
 if [[ -z "\$MAKE" ]]; then
 MAKE="\$SRC/tools/proto/root_i386-nd/opt/onbld/bin/i386/dmake";	export MAKE
 fi
-LEX=/opt/local/bin/lex;				export LEX
-YACC=/opt/local/bin/yacc;			export YACC
+# As of illumos#16873, we no longer need to define LEX, as it's in tools.
+# As of illumos#16319, we no longer need to define YACC, as it's in tools.
 BISON=/opt/local/bin/bison;			export BISON
 GM4=/opt/local/bin/gm4;				export GM4
 ASTBINDIR=/opt/local/ast/bin;			export ASTBINDIR

default.configure-build

@@ -2,4 +2,4 @@ PUBLISHER="joyent"
 RELEASE_VER="joyent_147"
 ON_CLOSED_BINS_URL="https://us-central.manta.mnx.io/Joyent_Dev/public/releng/illumos/on-closed-bins.i386.tar.bz2"
 ON_CLOSED_BINS_ND_URL="https://us-central.manta.mnx.io/Joyent_Dev/public/releng/illumos/on-closed-bins-nd.i386.tar.bz2"
-ILLUMOS_ADJUNCT_TARBALL_URL="https://us-central.manta.mnx.io/Joyent_Dev/public/releng/adjuncts/illumos-adjunct.20220720.tgz"
+ILLUMOS_ADJUNCT_TARBALL_URL="https://us-central.manta.mnx.io/Joyent_Dev/public/releng/adjuncts/illumos-adjunct.20240926.tgz"