summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2018-05-18 20:57:16 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2018-07-02 10:53:53 -0400
commit2e83781aa76c34170cadfad9cf65029a1cc7f571 (patch)
tree381b5ea0caf33a54b9e2e7dc1dbd96510b4db26b
parent00f5498f887916e2ed6e25a63227fe610ef1abc8 (diff)
write package list and checksums artifacts beside ISO
-rwxr-xr-xconfigs/profile/build.sh4
-rwxr-xr-xparabolaiso/mkparabolaiso12
2 files changed, 10 insertions, 6 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index b87d86c..326af1e 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -335,8 +335,8 @@ make_prepare() {
# Build ISO
make_iso() {
- mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} checksum
- mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -L ${iso_label} -o ${out_dir} iso ${iso_filename}
+ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} checksum
+ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -L ${iso_label} -o ${out_dir} iso ${iso_filename}
}
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index bd2db9f..1843594 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -494,7 +494,7 @@ command_iso () {
_show_config iso
if _is_directory_changed "${work_dir}/iso" "${out_dir}/${img_name}"; then
- mkdir -p ${out_dir}
+ mkdir -p "${out_dir}"
_msg_info "Creating ISO image..."
local _qflag=""
if [[ ${quiet} == "y" ]]; then
@@ -514,7 +514,13 @@ command_iso () {
${_iso_efi_boot_args} \
-output "${out_dir}/${img_name}" \
"${work_dir}/iso/"
- _msg_info "Done! | $(ls -sh ${out_dir}/${img_name})"
+ _msg_info "Done! | $(ls -sh "${out_dir}/${img_name}")"
+
+ cp "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" ${out_dir}/
+ pushd ${out_dir} > /dev/null
+ sha512sum "${img_name}" >> SHA512SUMS 2> /dev/null || true
+ rhash --whirlpool "${img_name}" >> WHIRLPOOLSUMS 2> /dev/null || true
+ popd > /dev/null
fi
}
@@ -682,5 +688,3 @@ case "${command_name}" in
_usage 1
;;
esac
-
-# vim:ts=4:sw=4:et: