aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild_all.sh4
-rw-r--r--mageia4arm.conf.json14
2 files changed, 10 insertions, 8 deletions
diff --git a/build_all.sh b/build_all.sh
index c6e0a48..818b446 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -118,9 +118,9 @@ for SBC_config in ${SBCs}; do
else
unset NONFREE
fi
- SBC="$(echo ${SBC_config} | jq -r '.board')"
+ SIZE="$(echo ${SBC_config} | jq -r '.size')"
print_info "Start build for ${SBC}"
- $sudo_root "${PROG_DIR}/create_arm_image.sh --all --build-path ${workdir} --config ${SBC} ${DESKTOP} ${NONFREE} --compress --add-checksum 2>&1 | tee -a ${workdir}/$(date "+%Y-%m-%d_%H:%M")-${SBC}.log"
+ $sudo_root "${PROG_DIR}/create_arm_image.sh --all --build-path ${workdir} --config ${SBC} ${DESKTOP} ${NONFREE} --size ${SIZE} --compress --add-checksum 2>&1 | tee -a ${workdir}/$(date "+%Y-%m-%d_%H:%M")-${SBC}.log"
$sudo_bcd "mkdir -p ${destdir}/${SBC}"
$sudo_bcd "mv ${workdir}/* ${destdir}/${SBC}/"
# not enough space on rabbit's RAM disk for all four variants, so delete as we go
diff --git a/mageia4arm.conf.json b/mageia4arm.conf.json
index 422b0c1..534b5c0 100644
--- a/mageia4arm.conf.json
+++ b/mageia4arm.conf.json
@@ -1,7 +1,7 @@
{
"vendor":"Mageia.Org",
"distro":"Mageia",
- "release":"8-beta1",
+ "release":"8",
"region":"all",
"repository":"/home/bcd/build_bcd/pieces/cauldron",
"workdir":"/home/mageia4arm/var-data",
@@ -9,13 +9,15 @@
"Available_desktoplist":[ "cinnamon","cinnamon-minimal","enlightenment","enlightenment-minimal","fvwm2","gnome","gnome-minimal","lxde","lxde-minimal","lxqt","lxqt-minimal","mate","mate-minimal","plasma5","plasma5-minimal","sugar","windowmaker","xfce","xfce-minimal"],
"SBCs": [
- { "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true }
+ { "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true, "size":2 }
+ { "board":"rpi-aarch64", "desktop":"plasma5-minimal", "extra_packages":null, "nonfree":true, "size":6 }
],
"Available_SBCs": [
- { "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true },
- { "board":"generic_aarch64", "desktop":null, "extra_packages":null, "nonfree":false },
- { "board":"rpi2", "desktop":null, "extra_packages":null, "nonfree":false },
- { "board":"rpi3+64", "desktop":"lxde", "extra_packages":null, "nonfree":false }
+ { "board":"bananaPro", "desktop":null, "extra_packages":null, "nonfree":true, "size":2 },
+ { "board":"rpi-aarch64", "desktop":"plasma5-minimal", "extra_packages":null, "nonfree":true, "size":6 }
+ { "board":"generic_aarch64", "desktop":null, "extra_packages":null, "nonfree":false, "size":2 },
+ { "board":"rpi2", "desktop":null, "extra_packages":null, "nonfree":false, "size":2 },
+ { "board":"rpi3+64", "desktop":"lxde", "extra_packages":null, "nonfree":false, "size":2 }
]
}