Merge pull request RetroPie#3739 from joolswills/image_bullseye

Image creation changes for bullseye

Author: joolswills

scriptmodules/admin/image.sh

@@ -15,14 +15,26 @@ rp_module_section=""
 rp_module_flags=""
 
 function depends_image() {
-    local depends=(kpartx unzip binfmt-support rsync parted squashfs-tools dosfstools e2fsprogs openssl xz-utils)
+    local depends=(kpartx unzip binfmt-support rsync parted squashfs-tools dosfstools e2fsprogs xz-utils)
     isPlatform "x86" && depends+=(qemu-user-static)
     getDepends "${depends[@]}"
 }
 
+function _get_info_image() {
+    local dist="$1"
+    local key="$2"
+    local ini="$md_data/dists/${dist}.ini"
+    [[ ! -f "$ini" ]] && fatalError "Definition file $ini does not exist"
+
+    iniConfig "=" "\"" "$ini"
+    iniGet "$key"
+    [[ -z "$ini_value" ]] && fatalError "Unable to locate key '$key' in definition file $ini"
+    echo "$ini_value"
+}
+
 function create_chroot_image() {
     local dist="$1"
-    [[ -z "$dist" ]] && dist="buster"
+    [[ -z "$dist" ]] && return 1
 
     local chroot="$2"
     [[ -z "$chroot" ]] && chroot="$md_build/chroot"
@@ -32,42 +44,21 @@ function create_chroot_image() {
 
     mkdir -p "$chroot"
 
-    local url
-    local image
-    local fmt=".img.xz"
-    case "$dist" in
-        jessie)
-            url="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2017-07-05/2017-07-05-raspbian-jessie-lite.zip"
-            fmt=".zip"
-            ;;
-        stretch)
-            url="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2019-04-09/2019-04-08-raspbian-stretch-lite.zip"
-            fmt=".zip"
-            ;;
-        buster)
-            url="https://downloads.raspberrypi.org/raspios_oldstable_lite_armhf_latest"
-            ;;
-        bullseye)
-            url="https://downloads.raspberrypi.org/raspios_lite_armhf_latest"
-            ;;
-        *)
-            md_ret_errors+=("Unknown/unsupported Raspbian version")
-            return 1
-            ;;
-    esac
+    local url=$(_get_info_image "$dist" "url")
+    local format=$(_get_info_image "$dist" "format")
 
     local base="raspbian-${dist}-lite"
-    local image="$base.img"
+    local image="${dist}.img"
+    local dest="${image}.${format}"
     if [[ ! -f "$image" ]]; then
-        local dest="$base$fmt"
-        case "$fmt" in
-            .zip)
+        case "$format" in
+            zip)
                 download "$url" "$dest"
                 unzip -o "$dest"
                 mv "$(unzip -Z -1 "$dest")" "$image"
                 rm "$dest"
                 ;;
-            .img.xz)
+            xz)
                 download "$url" "$dest"
                 xz -d -v "$dest"
                 ;;
@@ -94,19 +85,30 @@ function create_chroot_image() {
     umount -l "$tmp/boot" "$tmp"
     rm -rf "$tmp"
 
-    kpartx -d "$image"
+    dmsetup remove "${partitions[@]}"
 
     popd
     return 0
 }
 
 function install_rp_image() {
     local platform="$1"
-    [[ -z "$platform" ]] && return
+    if [[ -z "$platform" ]]; then
+        printMsgs "console" "Requires a platform (eg rpi3/rpi4)"
+        return 1
+    fi
 
-    local chroot="$2"
+    local dist="$2"
+    if [[ -z "$dist" ]]; then
+        printMsgs "Requires a distribution name (eg rpios-buster/rpios-bullseye)"
+        return 1
+    fi
+
+    local chroot="$3"
     [[ -z "$chroot" ]] && chroot="$md_build/chroot"
 
+    local dist_version="$(_get_info_image "$dist" "version")"
+
     # hostname to retropie
     echo "retropie" >"$chroot/etc/hostname"
     sed -i "s/raspberrypi/retropie/" "$chroot/etc/hosts"
@@ -123,17 +125,25 @@ function install_rp_image() {
 
     # set default GPU mem (videocore only) and overscan_scale so ES scales to overscan settings.
     iniConfig "=" "" "$chroot/boot/config.txt"
-    if ! [[ "$platform" =~ rpi.*kms|rpi4 ]]; then
+    if [[ "$dist_version" -lt 11 && "platform" != "rpi4" ]]; then
         iniSet "gpu_mem_256" 128
         iniSet "gpu_mem_512" 256
         iniSet "gpu_mem_1024" 256
     fi
     iniSet "overscan_scale" 1
 
+    # disable 64bit kernel
+    iniSet "arm_64bit" 0
+
     [[ -z "$__chroot_branch" ]] && __chroot_branch="master"
     cat > "$chroot/home/pi/install.sh" <<_EOF_
 #!/bin/bash
 cd
+if systemctl is-enabled userconfig &>/dev/null; then
+    echo "pi:raspberry" | sudo chpasswd
+    sudo systemctl disable userconfig
+    sudo systemctl --quiet enable getty@tty1
+fi
 sudo apt-get update
 sudo apt-get -y install git dialog xmlstarlet joystick
 git clone -b "$__chroot_branch" https://github.com/RetroPie/RetroPie-Setup.git
@@ -243,8 +253,7 @@ function create_image() {
     parted -s "$image" -- \
         mklabel msdos \
         unit mib \
-        mkpart primary fat16 4 260 \
-        set 1 boot on \
+        mkpart primary fat32 4 260 \
         mkpart primary 260 -1s
 
     # format
@@ -260,8 +269,10 @@ function create_image() {
     local part_boot="${partitions[0]}"
     local part_root="${partitions[1]}"
 
-    mkfs.vfat -F 16 -n boot "$part_boot"
-    mkfs.ext4 -O ^metadata_csum,^huge_file -L retropie "$part_root"
+    mkfs.vfat -F 32 -n bootfs "$part_boot"
+    # use the mke2fs config from the chroot so we create the filesystem with supported features
+    # disable huge_file & 64bit as with the Raspberry Pi OS images
+    MKE2FS_CONFIG="$chroot/etc/mke2fs.conf" mkfs.ext4 -O ^huge_file,^64bit -L retropie "$part_root"
 
     parted "$image_name" print
 
@@ -285,13 +296,6 @@ function create_image() {
     sed -i "s/$old_id/$new_id/" "$tmp/boot/cmdline.txt"
     sed -i "s/$old_id/$new_id/g" "$tmp/etc/fstab"
 
-    # pre-set the default username and password on RaspiOS 11
-    # otherwise the 1st time boot will prompt a username/pass change
-    if [[ "$image" == *bullseye* ]]; then
-        local default_pwd="$(echo 'raspberry' | openssl passwd -6 -stdin)"
-        echo "pi:$default_pwd" > "$tmp/boot/userconf.txt"
-    fi
-
     # unmount
     umount -l "$tmp/boot" "$tmp"
     rm -rf "$tmp"
@@ -319,11 +323,12 @@ function create_bb_image() {
 }
 
 function all_image() {
-    local platform
-    local image
     local dist="$1"
     local make_bb="$2"
-    for platform in rpi1 rpi2 rpi4; do
+    local platforms="$(_get_info_image "$dist" "platforms")"
+    local platform
+    printMsgs "heading" "Building $platforms images based on $dist ..."
+    for platform in $platforms; do
         platform_image "$platform" "$dist" "$make_bb"
     done
     combine_json_image
@@ -335,41 +340,22 @@ function platform_image() {
     local make_bb="$3"
     [[ -z "$platform" ]] && return 1
 
-    if [[ "$dist" == "stretch" && "$platform" == "rpi4" ]]; then
-        printMsgs "console" "Platform $platform on $dist is unsupported."
-        return 1
-    fi
-
     local dest="$__tmpdir/images"
     mkdir -p "$dest"
 
-    local image_base="retropie-${dist}-${__version}-"
-    case "$platform" in
-        rpi1)
-            image_base+="rpi1_zero"
-            image_platform="RPI 1/Zero"
-            ;;
-        rpi2)
-            image_base+="rpi2_3_zero2w"
-            image_platform="RPI 2/3/Zero 2 W"
-            ;;
-        rpi3)
-            image_base+="rpi3"
-            image_platform="RPI 3"
-            ;;
-        rpi4)
-            image_base+="rpi4_400"
-            image_platform="RPI 4/400"
-            ;;
-        *)
-            fatalError "Unknown platform $platform for image building"
-            ;;
-    esac
+    printMsgs "heading" "Building $platform image based on $dist ..."
+
+    rp_callModule image create_chroot "$dist"
+    rp_callModule image install_rp "$platform" "$dist" "$md_build/chroot"
+
+    local dist_name="$(_get_info_image "$dist" "name")"
+    local file_add="$(_get_info_image "$dist" "file_${platform}")"
+    local image_title="$(_get_info_image "$dist" "title_${platform}")"
+
+    local image_base="retropie-${dist_name}-${__version}-${file_add}"
     local image_name="${image_base}.img"
     local image_file="$dest/$image_name"
 
-    rp_callModule image create_chroot "$dist"
-    rp_callModule image install_rp "$platform"
     rp_callModule image create "$image_file"
     [[ "$make_bb" -eq 1 ]] && rp_callModule image create_bb "$dest/${image_base}-berryboot.img256"
 
@@ -384,7 +370,7 @@ function platform_image() {
     template="${template/IMG_SHA256/$(sha256sum $image_file | cut -d" " -f1)}"
     template="${template/IMG_DOWNLOAD_SIZE/$(stat -c %s ${image_file}.gz)}"
     template="${template/IMG_VERSION/$__version}"
-    template="${template/IMG_PLATFORM/$image_platform}"
+    template="${template/IMG_PLATFORM/$image_title}"
     template="${template/IMG_DATE/$(date '+%Y-%m-%d')}"
     echo "$template" >"${image_file}.json"
 

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

@@ -0,0 +1,14 @@
+name="bullseye"
+version="11"
+url="https://downloads.raspberrypi.org/raspios_lite_armhf_latest"
+format="xz"
+platforms="rpi1 rpi2 rpi3 rpi4"
+file_rpi1="rpi1_zero"
+title_rpi1="RPI 1/Zero"
+file_rpi2="rpi2"
+title_rpi2="RPI 2"
+file_rpi3="rpi3_zero2w"
+title_rpi3="RPI 3/Zero 2 W"
+file_rpi4="rpi4_400"
+title_rpi4="RPI 4/400"
+

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

@@ -0,0 +1,12 @@
+name="buster"
+version="10"
+url="https://downloads.raspberrypi.org/raspios_oldstable_lite_armhf_latest"
+format="xz"
+platforms="rpi1 rpi2 rpi4"
+file_rpi1="rpi1_zero"
+title_rpi1="RPI 1/Zero"
+file_rpi2="rpi2_3_zero2w"
+title_rpi2="RPI 2/3/Zero 2 W"
+file_rpi4="rpi4_400"
+title_rpi4="RPI 4/400"
+

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

@@ -0,0 +1,10 @@
+name="jessie"
+version="8"
+url="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2017-07-05/2017-07-05-raspbian-jessie-lite.zip"
+format="zip"
+platforms="rpi1 rpi2"
+file_rpi1="rpi1_zero"
+title_rpi1="RPI 1/Zero"
+file_rpi2="rpi2_3"
+title_rpi2="RPI 2/3"
+

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

@@ -0,0 +1,10 @@
+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"
+platforms="rpi1 rpi2"
+file_rpi1="rpi1_zero"
+title_rpi1="RPI 1/Zero"
+file_rpi2="rpi2_3"
+title_rpi2="RPI 2/3"
+