Upstream.

Author: mirage335

.github/workflows/zCustom.yml

@@ -53,13 +53,30 @@ on:
         - latest
         - internal
         - base
-      customTimeout:
-        required: false
-        default: '45'
-        type: choice
-        options:
-          - '45'
-          - '300'
+      ## ATTENTION: NOTICE: Updating core will already update the kernel packages used by _custom_kernel ... . Except to ensure the very latest 'lts' desktop kernel is used, this usually just wastes time.
+      #upgradeKernel:
+        #required: false
+        #default: none
+        #type: choice
+        #options:
+        #- none
+        #- lts
+        #- mainline-server
+      ## ATTENTION: Delays custom/build cycle time by ~3 minutes . Enabled by default, but may be disabled for very rapid testing if not useful.
+      #upgradeCore:
+        #type: boolean
+        #default: true
+      # ATTENTION: Delays custom/build cycle time by ~6 minutes . Causes possibly redundant upgrade of core and kernel. Enabled by default, but may be disabled for very rapid testing if not useful.
+      upgradeSlow:
+        type: boolean
+        default: true
+      #customTimeout:
+        #required: false
+        #default: '45'
+        #type: choice
+        #options:
+          #- '45'
+          #- '300'
       DANGERfast_EXPERIMENT:
         required: false
         default: 'build'
@@ -114,7 +131,7 @@ jobs:
         run: |
           echo releaseOrigin ${{ github.event.inputs.releaseOrigin }}
           echo releaseLabel ${{ github.event.inputs.releaseLabel }}
-          echo customTimeout ${{ github.event.inputs.customTimeout }}
+          #echo customTimeout
           echo DANGERfast_EXPERIMENT ${{ github.event.inputs.DANGERfast_EXPERIMENT }}
           echo DISABLE_RELEASE ${{ github.event.inputs.DISABLE_RELEASE }}
           echo DISABLE_ROOTFS ${{ github.event.inputs.DISABLE_ROOTFS }}
@@ -794,6 +811,46 @@ jobs:
           true
 
 
+      - name: _upgrade_apt
+        shell: bash
+        run: |
+          ./ubiquitous_bash.sh _upgrade_apt
+        timeout-minutes: 90
+      
+      # Also updates kernel packages available for _custom_kernel ... .
+      - name: upgrade_core
+        if: ${{ github.event.inputs.upgradeSlow != 'false' }}
+        shell: bash
+        run: |
+          ./ubiquitous_bash.sh _upgrade_core
+        timeout-minutes: 90
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+
+      
+      - name: upgrade_kernel-lts
+        if: ${{ github.event.inputs.upgradeSlow != 'false' }}
+        shell: bash
+        run: |
+          ./ubiquitous_bash.sh _upgrade_kernel_lts
+          #./ubiquitous_bash.sh _upgrade_kernel
+        timeout-minutes: 90
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+
+      - name: upgrade_kernel-mainline-server
+        if: ${{ github.event.inputs.upgradeSlow != 'false' }}
+        shell: bash
+        run: |
+          ./ubiquitous_bash.sh _upgrade_kernel_mainline_server
+        timeout-minutes: 90
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+
+
       - name: upgrade_installers
         shell: bash
         run: |
@@ -820,7 +877,8 @@ jobs:
         shell: bash
         run: |
           ./ubiquitous_bash.sh _custom || true
-        timeout-minutes: ${{ github.event.inputs.customTimeout == '300' && 300 || 45 }}
+        #timeout-minutes: customTimeout
+        timeout-minutes: 300
 
 
       - name: _custom-bundle

_lib/ubDistBuild

@@ -125,6 +125,8 @@ _upgrade_apt() {
     echo
     echo 'init: _upgrade_apt'
     echo
+
+	! _messagePlain_probe_cmd _openChRoot && _messagePlain_bad 'fail: openChroot' && _messageFAIL
 
 	# ATTRIBUTION-AI: ChatGPT o1-preview 2024-11-20 .
     _messagePlain_probe sudo -n tee /etc/apt/apt.conf.d/99autoremove-recommends
@@ -140,6 +142,8 @@ APT::AutoRemove::SuggestsImportant "true";' | sudo -n tee /etc/apt/apt.conf.d/99
 
 
 
+    ! _messagePlain_probe_cmd _closeChRoot && _messagePlain_bad 'fail: closeChroot' && _messageFAIL
+
     cd "$functionEntryPWD"
     echo
     echo '          PASS'

_prog/core-upgrade.sh

@@ -36,7 +36,7 @@ _ub_cksum_special_derivativeScripts_contents() {
 #export ub_setScriptChecksum_disable='true'
 ( [[ -e "$0".nck ]] || [[ "${BASH_SOURCE[0]}" != "${0}" ]] || [[ "$1" == '--profile' ]] || [[ "$1" == '--script' ]] || [[ "$1" == '--call' ]] || [[ "$1" == '--return' ]] || [[ "$1" == '--devenv' ]] || [[ "$1" == '--shell' ]] || [[ "$1" == '--bypass' ]] || [[ "$1" == '--parent' ]] || [[ "$1" == '--embed' ]] || [[ "$1" == '--compressed' ]] || [[ "$0" == "/bin/bash" ]] || [[ "$0" == "-bash" ]] || [[ "$0" == "/usr/bin/bash" ]] || [[ "$0" == "bash" ]] ) && export ub_setScriptChecksum_disable='true'
 export ub_setScriptChecksum_header='2591634041'
-export ub_setScriptChecksum_contents='615733136'
+export ub_setScriptChecksum_contents='648402823'
 
 # CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
 # WARNING: Performance may be crucial here.
@@ -54523,6 +54523,8 @@ _upgrade_apt() {
     echo
     echo 'init: _upgrade_apt'
     echo
+
+	! _messagePlain_probe_cmd _openChRoot && _messagePlain_bad 'fail: openChroot' && _messageFAIL
 
 	# ATTRIBUTION-AI: ChatGPT o1-preview 2024-11-20 .
     _messagePlain_probe sudo -n tee /etc/apt/apt.conf.d/99autoremove-recommends
@@ -54538,6 +54540,8 @@ APT::AutoRemove::SuggestsImportant "true";' | sudo -n tee /etc/apt/apt.conf.d/99
 
 
 
+    ! _messagePlain_probe_cmd _closeChRoot && _messagePlain_bad 'fail: closeChroot' && _messageFAIL
+
     cd "$functionEntryPWD"
     echo
     echo '          PASS'