Merge branch 'master' into deploy

Author: mpe

build/Makefile

@@ -10,8 +10,8 @@ ifeq ($(or ${x86},${isa_3}),)
 export UBUNTU_LATEST := 21.10
 UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST}
 else
-export UBUNTU_LATEST := 22.10
-UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu@22.04
+export UBUNTU_LATEST := 23.04
+UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu@22.10 ubuntu@22.04
 endif
 
 UBUNTU_DISTROS += ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu

build/scripts/container-build.sh

@@ -113,16 +113,20 @@ if [[ "$1" == "kernel" ]]; then
     fi
 
     if [[ $rc -eq 0 && -n "$MODULES" ]]; then
-        echo "## Installing modules"
+        if grep CONFIG_MODULES=y /output/.config > /dev/null; then
+            echo "## Installing modules"
 
-        mod_path=/output/modules
-        # Clean out any old modules
-        rm -rf $mod_path
+            mod_path=/output/modules
+            # Clean out any old modules
+            rm -rf $mod_path
 
-        (set -x; make $verbose $quiet -j $JFACTOR "$cc" INSTALL_MOD_PATH=$mod_path modules_install)
-        rc=$?
-        if [[ $rc -eq 0 ]]; then
-            tar -cjf /output/modules.tar.bz2 -C $mod_path lib
+            (set -x; make $verbose $quiet -j $JFACTOR "$cc" INSTALL_MOD_PATH=$mod_path modules_install)
+            rc=$?
+            if [[ $rc -eq 0 ]]; then
+                tar -cjf /output/modules.tar.bz2 -C $mod_path lib
+            fi
+        else
+            echo "## Modules not configured"
         fi
     fi