@@ -101,82 +101,94 @@ case $HW_MODEL in
101101 2) iname=' RPi2' HW_ARCH=2 boot_size=128 root_size=895;;
102102 4) iname=' RPi234' HW_ARCH=3 boot_size=128 root_size=1000;;
103103 5) iname=' RPi5' HW_ARCH=3 boot_size=128 root_size=1000;;
104- 10) iname=' OdroidC1' HW_ARCH=2 partition_start=4 boot_size=128 root_size=900 boot_fstype=' fat16' ;;
105- 11) iname=' OdroidXU4' HW_ARCH=2 partition_start=4 root_size=900 ;;
106- 12) iname=' OdroidC2' HW_ARCH=3 partition_start=4 root_size=1200 ;;
107- 15) iname=' OdroidN2' HW_ARCH=3 partition_start=4 root_size=1200 ;;
108- 16) iname=' OdroidC4' HW_ARCH=3 partition_start=4 root_size=1200 ;;
109- 17) iname=' OdroidHC4' HW_ARCH=3 partition_start=4 root_size=1200 ;;
104+ 10) iname=' OdroidC1' HW_ARCH=2 partition_start=4 boot_size=128 root_size=' meson ' boot_fstype=' fat16' ;;
105+ 11) iname=' OdroidXU4' HW_ARCH=2 partition_start=4 root_size=' meson ' ;;
106+ 12) iname=' OdroidC2' HW_ARCH=3 partition_start=4 root_size=' meson64 ' ;;
107+ 15) iname=' OdroidN2' HW_ARCH=3 partition_start=4 root_size=' meson64 ' ;;
108+ 16) iname=' OdroidC4' HW_ARCH=3 partition_start=4 root_size=' meson64 ' ;;
109+ 17) iname=' OdroidHC4' HW_ARCH=3 partition_start=4 root_size=' meson64 ' ;;
110110 20) iname=' VM' HW_ARCH=${HW_ARCH:- 10} root_size=1200;;
111- 21) iname=' NativePC' HW_ARCH=10 root_size=1663 ;;
112- 40) iname=' PINEA64' HW_ARCH=3 partition_start=4 root_size=1100 ;;
113- 42) iname=' ROCKPro64' HW_ARCH=3 partition_start=16 root_size=1300 ;;
114- 43) iname=' ROCK64' HW_ARCH=3 partition_start=16 root_size=1300 ;;
115- 44) iname=' Pinebook' HW_ARCH=3 partition_start=4 root_size=1100 ;;
116- 45) iname=' PINEH64' HW_ARCH=3 partition_start=4 root_size=1100 ;;
117- 46) iname=' PinebookPro' HW_ARCH=3 partition_start=16 root_size=1300 ;;
118- 47) iname=' NanoPiR4S' HW_ARCH=3 partition_start=16 root_size=1300 ;;
119- 48) iname=' NanoPiR1' HW_ARCH=2 partition_start=4 root_size=1000 ;;
120- ' 49.1' ) iname=' Quartz64A' HW_ARCH=3 partition_start=16 root_size=1000 ;;
121- ' 49.2' ) iname=' Quartz64B' HW_ARCH=3 partition_start=16 root_size=1000 ;;
122- ' 49.3' ) iname=' SOQuartz' HW_ARCH=3 partition_start=16 root_size=1000 ;;
123- 52) iname=' ASUSTB' HW_ARCH=2 partition_start=4 root_size=900 ;;
124- 54) iname=' NanoPiK2' HW_ARCH=3 partition_start=4 root_size=1200 ;;
125- 55) iname=' NanoPiR2S' HW_ARCH=3 partition_start=16 root_size=1300 ;;
126- 56) iname=' NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=1300 ;;
127- 57) iname=' NanoPiNEOPlus2' HW_ARCH=3 partition_start=4 root_size=1100 ;;
128- 58) iname=' NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=1300 ;;
129- 59) iname=' ZeroPi' HW_ARCH=2 partition_start=4 root_size=1000 ;;
130- 60) iname=' NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=1000 ;;
131- 63) iname=' NanoPiM1' HW_ARCH=2 partition_start=4 root_size=1000 ;;
132- 64) iname=' NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=1000 ;;
133- ' 65.1' ) iname=' NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=1100 ;;
134- ' 65.2' ) iname=' NanoPiNEO2Black' HW_ARCH=3 partition_start=4 root_size=1100 ;;
135- 66) iname=' NanoPiM1Plus' HW_ARCH=2 partition_start=4 root_size=1000 ;;
136- 67) iname=' NanoPiK1Plus' HW_ARCH=3 partition_start=4 root_size=1100 ;;
137- ' 68.1' ) iname=' NanoPiM4' HW_ARCH=3 partition_start=16 root_size=1300 ;;
138- ' 68.2' ) iname=' NanoPCT4' HW_ARCH=3 partition_start=16 root_size=1300 ;;
139- ' 68.3' ) iname=' NanoPiNEO4' HW_ARCH=3 partition_start=16 root_size=1300 ;;
140- ' 72.1' ) iname=' ROCKPi4' HW_ARCH=3 partition_start=16 root_size=1300 ;;
141- ' 72.2' ) iname=' ROCK4SE' HW_ARCH=3 partition_start=16 root_size=1300 ;;
142- ' 72.3' ) iname=' ROCK4CPlus' HW_ARCH=3 partition_start=16 root_size=1300 ;;
143- 73) iname=' ROCKPiS' HW_ARCH=3 partition_start=16 root_size=1300 ;;
144- 74) iname=' RadxaZero' HW_ARCH=3 partition_start=4 root_size=1200 ;;
111+ 21) iname=' NativePC' HW_ARCH=10 root_size=1600 ;;
112+ 40) iname=' PINEA64' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
113+ 42) iname=' ROCKPro64' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
114+ 43) iname=' ROCK64' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
115+ 44) iname=' Pinebook' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
116+ 45) iname=' PINEH64' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
117+ 46) iname=' PinebookPro' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
118+ 47) iname=' NanoPiR4S' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
119+ 48) iname=' NanoPiR1' HW_ARCH=2 partition_start=4 root_size=' sunxi ' ;;
120+ ' 49.1' ) iname=' Quartz64A' HW_ARCH=3 partition_start=16 root_size=' quartz64 ' ;;
121+ ' 49.2' ) iname=' Quartz64B' HW_ARCH=3 partition_start=16 root_size=' quartz64 ' ;;
122+ ' 49.3' ) iname=' SOQuartz' HW_ARCH=3 partition_start=16 root_size=' quartz64 ' ;;
123+ 52) iname=' ASUSTB' HW_ARCH=2 partition_start=4 root_size=' rockchip ' ;;
124+ 54) iname=' NanoPiK2' HW_ARCH=3 partition_start=4 root_size=' meson64 ' ;;
125+ 55) iname=' NanoPiR2S' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
126+ 56) iname=' NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
127+ 57) iname=' NanoPiNEOPlus2' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
128+ 58) iname=' NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
129+ 59) iname=' ZeroPi' HW_ARCH=2 partition_start=4 root_size=' sunxi ' ;;
130+ 60) iname=' NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=' sunxi ' ;;
131+ 63) iname=' NanoPiM1' HW_ARCH=2 partition_start=4 root_size=' sunxi ' ;;
132+ 64) iname=' NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=' sunxi ' ;;
133+ ' 65.1' ) iname=' NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
134+ ' 65.2' ) iname=' NanoPiNEO2Black' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
135+ 66) iname=' NanoPiM1Plus' HW_ARCH=2 partition_start=4 root_size=' sunxi ' ;;
136+ 67) iname=' NanoPiK1Plus' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
137+ ' 68.1' ) iname=' NanoPiM4' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
138+ ' 68.2' ) iname=' NanoPCT4' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
139+ ' 68.3' ) iname=' NanoPiNEO4' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
140+ ' 72.1' ) iname=' ROCKPi4' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
141+ ' 72.2' ) iname=' ROCK4SE' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
142+ ' 72.3' ) iname=' ROCK4CPlus' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
143+ 73) iname=' ROCKPiS' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
144+ 74) iname=' RadxaZero' HW_ARCH=3 partition_start=4 root_size=' meson64 ' ;;
145145 75) iname=' Container' HW_ARCH=${HW_ARCH:- 10} root_size=700;;
146- ' 76.1' ) iname=' NanoPiR5S' HW_ARCH=3 partition_start=16 root_size=1300 ;;
147- ' 76.2' ) iname=' NanoPiR5C' HW_ARCH=3 partition_start=16 root_size=1300 ;;
148- 77) iname=' ROCK3A' HW_ARCH=3 partition_start=16 root_size=1300 ;;
149- 78) iname=' ROCK5B' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
150- ' 79.1' ) iname=' NanoPiR6S' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
151- ' 79.2' ) iname=' NanoPiR6C' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
152- ' 79.3' ) iname=' NanoPCT6' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
153- 80) iname=' OrangePi5' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
154- 81) iname=' VisionFive2' HW_ARCH=11 root_size=800 ;;
155- 82) iname=' OrangePi5Plus' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
156- 83) iname=' OrangePiZero3' HW_ARCH=3 partition_start=4 root_size=1100 ;;
157- 84) iname=' Star64' HW_ARCH=11 root_size=800 ;;
158- 85) iname=' ROCK5A' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
159- 86) iname=' ASUSTB2' HW_ARCH=3 partition_start=16 root_size=1300 ;;
160- 87) iname=' OrangePi3B' HW_ARCH=3 partition_start=16 root_size=1300 ;;
161- 88) iname=' OrangePiZero2W' HW_ARCH=3 partition_start=4 root_size=1100 ;;
162- 89) iname=' OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size=1100 ;;
163- 90) iname=' RadxaZERO3' HW_ARCH=3 partition_start=16 root_size=1300 ;;
164- 91) iname=' OrangePi5Max' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
165- 92) iname=' NanoPiM6' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
166- 93) iname=' OrangePi5Pro' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
167- 94) iname=' OrangePi5Ultra' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
168- 95) iname=' OrangePiCM5' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
146+ ' 76.1' ) iname=' NanoPiR5S' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
147+ ' 76.2' ) iname=' NanoPiR5C' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
148+ 77) iname=' ROCK3A' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
149+ 78) iname=' ROCK5B' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
150+ ' 79.1' ) iname=' NanoPiR6S' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
151+ ' 79.2' ) iname=' NanoPiR6C' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
152+ ' 79.3' ) iname=' NanoPCT6' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
153+ 80) iname=' OrangePi5' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
154+ 81) iname=' VisionFive2' HW_ARCH=11 root_size=' riscv ' ;;
155+ 82) iname=' OrangePi5Plus' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
156+ 83) iname=' OrangePiZero3' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
157+ 84) iname=' Star64' HW_ARCH=11 root_size=' riscv ' ;;
158+ 85) iname=' ROCK5A' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
159+ 86) iname=' ASUSTB2' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
160+ 87) iname=' OrangePi3B' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
161+ 88) iname=' OrangePiZero2W' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
162+ 89) iname=' OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
163+ 90) iname=' RadxaZERO3' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
164+ 91) iname=' OrangePi5Max' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
165+ 92) iname=' NanoPiM6' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
166+ 93) iname=' OrangePi5Pro' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
167+ 94) iname=' OrangePi5Ultra' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
168+ 95) iname=' OrangePiCM5' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
169169 96) iname=' OrangePi4A' HW_ARCH=3 partition_start=4 root_size=1000;;
170170 97) iname=' OrangePiRV' HW_ARCH=11 partition_start=4 root_size=1000;;
171171 98) iname=' OrangePiRV2' HW_ARCH=11 partition_start=4 root_size=1000;;
172- 99) iname=' OrangePi3' HW_ARCH=3 partition_start=4 root_size=1100 ;;
173- 100) iname=' NanoPiR3S' HW_ARCH=3 partition_start=16 root_size=1300 ;;
174- 101) iname=' NanoPiR3SLTS' HW_ARCH=3 partition_start=16 root_size=1300 ;;
175- 102) iname=' NanoPiR76S' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
176- 103) iname=' NanoPiM5' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
177- 104) iname=' NanoPiZero2' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=1300 ;;
172+ 99) iname=' OrangePi3' HW_ARCH=3 partition_start=4 root_size=' sunxi64 ' ;;
173+ 100) iname=' NanoPiR3S' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
174+ 101) iname=' NanoPiR3SLTS' HW_ARCH=3 partition_start=16 root_size=' rockchip64 ' ;;
175+ 102) iname=' NanoPiR76S' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
176+ 103) iname=' NanoPiM5' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
177+ 104) iname=' NanoPiZero2' HW_ARCH=3 PTTYPE=' gpt' partition_start=16 root_size=' rk35xx ' ;;
178178 * ) Error_Exit " Invalid hardware model \" $HW_MODEL \" passed" ;;
179179esac
180+ case $root_size in
181+ ' riscv' ) root_size=650; (( $DISTRO > 8 )) && (( root_size+= 50 )) ;; # final
182+ ' meson' ) root_size=650; (( $DISTRO > 7 && ! $boot_size )) && (( root_size+= 50 )) ;; # final
183+ ' rockchip' ) root_size=700;; # final
184+ ' quartz64' ) root_size=700; (( $DISTRO > 8 )) && (( root_size+= 50 )) ;; # final
185+ ' sunxi' ) root_size=700; (( $DISTRO > 7 )) && (( root_size+= 50 )) ;; # final
186+ ' sunxi64' ) root_size=800;; # final
187+ ' meson64' ) root_size=850;; # final
188+ ' rockchip64' ) root_size=900;; # final
189+ ' rk35xx' ) root_size=950;; # raised
190+ * ) (( $root_size )) || Error_Exit " Invalid root_size=$root_size " ;;
191+ esac
180192
181193[[ $VARIANT =~ ^(| iso| vbox| vmx| esxi| hyperv| utm| proxmox| all)$ ]] || Error_Exit " Invalid variant \" $VARIANT \" passed"
182194
524536 # Raspberry Pi Imager info
525537 [[ $HW_MODEL == [1-5] && $DISTRO == 8 && $OUTPUT_IMG_NAME == * ' -Trixie' ]] && IMAGER_ARGS+=(' --raw-hash-size' )
526538 G_DIETPI-NOTIFY 2 " Running DietPi-Imager from $G_GITOWNER /$G_GITBRANCH to generate $OUTPUT_IMG_NAME .$ext "
527- bash -c " $( curl -sSf " https://raw.githubusercontent.com/$G_GITOWNER /DietPi/$G_GITBRANCH /.build/images/dietpi-imager" ) " ' DietPi-Imager' " ${IMAGER_ARGS[@]} " || { journalctl -n 25; exit 1; }
539+ # bash -c "$(curl -sSf "https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.build/images/dietpi-imager")" 'DietPi-Imager' "${IMAGER_ARGS[@]}" || { journalctl -n 25; exit 1; }
540+ ls -l " $OUTPUT_IMG_NAME .img"
528541 # Raspberry Pi Imager info: add for standard image only
529542 [[ ${IMAGER_ARGS[-1]} == ' --raw-hash-size' ]] && unset ' IMAGER_ARGS[-1]'
530543fi
@@ -1275,8 +1288,5 @@ then
12751288 [[ -x ' upload.sh' ]] && G_EXEC_OUTPUT=1 G_EXEC ./upload.sh " $image_name .qcow2.xz" {,.sha256} " ${signature[@]} " && G_EXEC rm " $image_name .qcow2.xz" {,.sha256} " ${signature[@]} "
12761289fi
12771290
1278- # Cleanup
1279- G_EXEC rm " $OUTPUT_IMG_NAME .img"
1280-
12811291exit 0
12821292}
0 commit comments