Merge pull request #3755 from joolswills/chroot_builder_changes

Chroot builder changes

Author: joolswills

scriptmodules/admin/builder.sh

@@ -83,16 +83,17 @@ function chroot_build_builder() {
 
     local dist
     local dists="$__builder_dists"
-    [[ -z "$dists" ]] && dists="buster"
+    [[ -z "$dists" ]] && return 1
 
     local platform
     local platforms="$__builder_platforms"
-    [[ -z "$platforms" ]] && platforms="rpi1 rpi2 rpi4"
 
     for dist in $dists; do
+        [[ -z "$platforms" ]] && platforms="$(_get_info_image "$dist" "platforms")"
+
         local chroot_dir="$md_build/$dist"
         local chroot_rps_dir="$chroot_dir/home/pi/RetroPie-Setup"
-        local archive_dir="tmp/archives/$dist"
+        local archive_dir="tmp/archives/$(_get_info_image "$dist" "name")"
 
         local distcc_hosts="$__builder_distcc_hosts"
         if [[ -d "$rootdir/admin/crosscomp/$dist" ]]; then
@@ -117,18 +118,13 @@ function chroot_build_builder() {
                 sudo apt-get install -y git; \
                 "
             # copy existing packages from host if building in a clean chroot to avoid rebuilding everything
-            mkdir -p "$chroot_rps_dir/$archive_dir"
+            mkdir -p "$scriptdir/$archive_dir/" "$chroot_rps_dir/$archive_dir"
             rsync -av "$scriptdir/$archive_dir/" "$chroot_rps_dir/$archive_dir/"
         else
             sudo -u $user git -C "$chroot_rps_dir" pull
         fi
 
         for platform in $platforms; do
-            if [[ "$dist" == "stretch" && "$platform" == "rpi4" ]]; then
-                printMsgs "heading" "Skipping platform $platform on $dist ..."
-                continue
-            fi
-
             rp_callModule image chroot "$chroot_dir" \
                 sudo \
                 __use_ccache="$use_ccache" \

scriptmodules/admin/image.sh

@@ -23,7 +23,8 @@ function depends_image() {
 function _get_info_image() {
     local dist="$1"
     local key="$2"
-    local ini="$md_data/dists/${dist}.ini"
+    # don't use $md_data so this function can be used directly from builder.sh
+    local ini="${__mod_info[image/path]%/*}/image/dists/${dist}.ini"
     [[ ! -f "$ini" ]] && fatalError "Definition file $ini does not exist"
 
     iniConfig "=" "\"" "$ini"
@@ -37,7 +38,7 @@ function create_chroot_image() {
     [[ -z "$dist" ]] && return 1
 
     local chroot="$2"
-    [[ -z "$chroot" ]] && chroot="$md_build/chroot"
+    [[ -z "$chroot" ]] && chroot="$md_build/$dist"
 
     mkdir -p "$md_build"
     pushd "$md_build"
@@ -105,7 +106,7 @@ function install_rp_image() {
     fi
 
     local chroot="$3"
-    [[ -z "$chroot" ]] && chroot="$md_build/chroot"
+    [[ -z "$chroot" ]] && chroot="$md_build/$dist"
 
     local dist_version="$(_get_info_image "$dist" "version")"
 
@@ -180,6 +181,9 @@ _EOF_
 }
 
 function _init_chroot_image() {
+    local chroot="$1"
+    [[ -z "$chroot" ]] && return 1
+
     # unmount on ctrl+c
     trap "_trap_chroot_image '$chroot'" INT
 
@@ -202,7 +206,7 @@ function _init_chroot_image() {
 
 function _deinit_chroot_image() {
     local chroot="$1"
-    [[ -z "$chroot" ]] && chroot="$md_build/chroot"
+    [[ -z "$chroot" ]] && return 1
 
     trap "" INT
 
@@ -224,7 +228,7 @@ function _trap_chroot_image() {
 
 function chroot_image() {
     local chroot="$1"
-    [[ -z "$chroot" ]] && chroot="$md_build/chroot"
+    [[ -z "$chroot" ]] && return 1
     shift
 
     printMsgs "console" "Chrooting to $chroot ..."
@@ -311,7 +315,7 @@ function create_bb_image() {
     [[ -z "$image" ]] && return 1
 
     local chroot="$2"
-    [[ -z "$chroot" ]] && chroot="$md_build/chroot"
+    [[ -z "$chroot" ]] && return 1
 
     # replace fstab
     echo "proc            /proc           proc    defaults          0       0" >"$chroot/etc/fstab"
@@ -346,7 +350,7 @@ function platform_image() {
     printMsgs "heading" "Building $platform image based on $dist ..."
 
     rp_callModule image create_chroot "$dist"
-    rp_callModule image install_rp "$platform" "$dist" "$md_build/chroot"
+    rp_callModule image install_rp "$platform" "$dist" "$md_build/$dist"
 
     local dist_name="$(_get_info_image "$dist" "name")"
     local file_add="$(_get_info_image "$dist" "file_${platform}")"

scriptmodules/admin/image/dists/rpios-stretch.ini

@@ -1,7 +1,7 @@
 name="stretch"
 version="9"
 url="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2019-04-09/2019-04-08-raspbian-stretch-lite.zip"
-format="xz"
+format="zip"
 platforms="rpi1 rpi2"
 file_rpi1="rpi1_zero"
 title_rpi1="RPI 1/Zero"