Merge pull request #2913 from joolswills/builder_tweaks

builder - variable / parameter changes

Author: joolswills

scriptmodules/admin/builder.sh

@@ -76,41 +76,37 @@ function chroot_build_builder() {
     local ip="$(getIPAddress)"
 
     local dist
-    local dists="$__dists"
+    local dists="$__builder_dists"
     [[ -z "$dists" ]] && dists="stretch buster"
-    local sys
+
+    local platform
+    local platforms="$__builder_platforms"
+    [[ -z "$platforms" ]] && platforms="rpi1 rpi2 rpi4"
 
     for dist in $dists; do
-        local use_distcc=0
+        local distcc_hosts="$__builder_distcc_hosts"
         if [[ -d "$rootdir/admin/crosscomp/$dist" ]]; then
-            use_distcc=1
             rp_callModule crosscomp switch_distcc "$dist"
+            [[ -z "$distcc_hosts" ]] && distcc_hosts="$ip"
         fi
 
+        local makeflags="$__builder_makeflags"
+        [[ -z "$makeflags" ]] && makeflags="-j$(nproc)"
+
         [[ ! -d "$md_build/$dist" ]] && rp_callModule image create_chroot "$dist" "$md_build/$dist"
         if [[ ! -d "$md_build/$dist/home/pi/RetroPie-Setup" ]]; then
             sudo -u $user git clone "$home/RetroPie-Setup" "$md_build/$dist/home/pi/RetroPie-Setup"
-            cat > "$md_build/$dist/home/pi/install.sh" <<_EOF_
-#!/bin/bash
-cd
-sudo apt-get update
-sudo apt-get install -y git
-if [[ "$use_distcc" -eq 1 ]]; then
-    sudo apt-get install -y distcc
-    sudo sed -i s/\+zeroconf/$ip/ /etc/distcc/hosts;
-fi
-_EOF_
-            rp_callModule image chroot "$md_build/$dist" bash /home/pi/install.sh
+            rp_callModule image chroot "$md_build/$dist" bash -c "sudo apt-get update; sudo apt-get install -y git"
         else
             sudo -u $user git -C "$md_build/$dist/home/pi/RetroPie-Setup" pull
         fi
 
-        for sys in rpi1 rpi2; do
+        for platform in $platforms; do
             rp_callModule image chroot "$md_build/$dist" \
                 sudo \
-                PATH="/usr/lib/distcc:$PATH" \
-                MAKEFLAGS="-j4 PATH=/usr/lib/distcc:$PATH" \
-                __platform="$sys" \
+                MAKEFLAGS="$makeflags" \
+                DISTCC_HOSTS="$distcc_hosts" \
+                __platform="$platform" \
                 /home/pi/RetroPie-Setup/retropie_packages.sh builder "$@"
         done
 

scriptmodules/system.sh

@@ -48,6 +48,12 @@ function setup_env() {
     [[ -z "${ASFLAGS}" ]] && export ASFLAGS="${__default_asflags}"
     [[ -z "${MAKEFLAGS}" ]] && export MAKEFLAGS="${__default_makeflags}"
 
+    # if using distcc, add /usr/lib/distcc to PATH/MAKEFLAGS
+    if [[ -n "$DISTCC_HOSTS" ]]; then
+        PATH="/usr/lib/distcc:$PATH"
+        MAKEFLAGS+=" PATH=/usr/lib/distcc:$PATH"
+    fi
+
     # test if we are in a chroot
     if [[ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]]; then
         [[ -z "$QEMU_CPU" && -n "$__qemu_cpu" ]] && export QEMU_CPU=$__qemu_cpu
@@ -197,6 +203,8 @@ function get_os_version() {
 function get_retropie_depends() {
     local depends=(git dialog wget gcc g++ build-essential unzip xmlstarlet python-pyudev ca-certificates)
 
+    [[ -n "$DISTCC_HOSTS" ]] && depends+=(distcc)
+
     if ! getDepends "${depends[@]}"; then
         fatalError "Unable to install packages required by $0 - ${md_ret_errors[@]}"
     fi