From 7b22ffd00afef3a38bdf29f1248cf8bd43d6ae40 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 10 Apr 2024 16:37:02 +0200 Subject: [PATCH] update to new download layout --- usr/lib/archboot/release.sh | 41 +++++++++++++++++++++++----- usr/share/archboot/doc/archboot.html | 14 +++++----- 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh index 784c7d3b0..6b717f06f 100644 --- a/usr/lib/archboot/release.sh +++ b/usr/lib/archboot/release.sh @@ -139,13 +139,13 @@ _create_iso() { _SPLASH="/usr/share/archboot/uki/archboot-background.bmp" _OSREL="/usr/share/archboot/base/etc/os-release" # add AMD ucode license - mkdir -p boot/licenses/amd-ucode - cp /usr/share/licenses/amd-ucode/* boot/licenses/amd-ucode/ + mkdir -p licenses/amd-ucode + cp /usr/share/licenses/amd-ucode/* licenses/amd-ucode/ _CMDLINE="boot/cmdline.txt" if [[ "${_ARCH}" == "x86_64" ]]; then # add INTEL ucode license - mkdir -p boot/licenses/intel-ucode - cp /usr/share/licenses/intel-ucode/* boot/licenses/intel-ucode/ + mkdir -p licenses/intel-ucode + cp /usr/share/licenses/intel-ucode/* licenses/intel-ucode/ _EFISTUB="/usr/lib/systemd/boot/efi/linuxx64.efi.stub" echo "console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=auto" > ${_CMDLINE} fi @@ -176,7 +176,6 @@ _create_iso() { chmod 644 boot/*.efi fi touch boot/* - # create Release.txt with included main archlinux packages echo "Generating Release.txt..." ${_NSPAWN} "${_W_DIR}" pacman -Sy "${_W_DIR}" &>"${_NO_LOG}" (echo "ARCHBOOT - ARCH LINUX INSTALLATION / RESCUE SYSTEM" @@ -198,10 +197,20 @@ _create_iso() { echo "---Complete Package List---" ${_NSPAWN} "${_W_DIR}" pacman -Q | sed -e "s/\r//g" -e "s/\x1b\[[0-9;]*m//g" \ -e "s/\x1b\[.*[0-9][h;l]//g") >>Release.txt - # removing container echo "Removing container ${_W_DIR}..." rm -r "${_W_DIR}" - # create b2sums + if ! [[ "${_ARCH}" == "riscv64" ]]; then + echo "Creating iso/ directory..." + mkdir iso + mv *.iso iso/ + echo "Creating uki/ directory..." + mkdir uki + mv boot/*.efi uki/ + else + echo "Creating img/ directory..." + mkdir img + mv *.img img/ + fi echo "Generating b2sum..." for i in *; do if [[ -f "${i}" ]]; then @@ -213,5 +222,23 @@ _create_iso() { cksum -a blake2b "${i}" >> b2sum.txt fi done + if ! [[ "${_ARCH}" == "riscv64" ]]; then + for i in iso/*; do + if [[ -f "${i}" ]]; then + cksum -a blake2b "${i}" >> b2sum.txt + fi + done + for i in uki/*; do + if [[ -f "${i}" ]]; then + cksum -a blake2b "${i}" >> b2sum.txt + fi + done + else + for i in img/*; do + if [[ -f "${i}" ]]; then + cksum -a blake2b "${i}" >> b2sum.txt + fi + done + fi } # vim: set ft=sh ts=4 sw=4 et: diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html index 8078fccc4..0de07f595 100644 --- a/usr/share/archboot/doc/archboot.html +++ b/usr/share/archboot/doc/archboot.html @@ -16,7 +16,7 @@

Logo

Archboot Home | Gallery | Donate

2024 Fundraise: 0% 0% 100%

-

© 2006 - 2024 | Tobias Powalowski | Arch Linux Developer tpowa
Last update: 09.04.2024 09:58

+

© 2006 - 2024 | Tobias Powalowski | Arch Linux Developer tpowa
Last update: 10.04.2024 16.36