update to new download layout

This commit is contained in:
Tobias Powalowski 2024-04-10 16:37:02 +02:00
parent 11818ac0fd
commit 7b22ffd00a
2 changed files with 41 additions and 14 deletions

View file

@ -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:

View file

@ -16,7 +16,7 @@
<p><span><img src="logo.png" alt="Logo"></span></p>
<h1>Archboot Home | <a href="https://archboot.com/gallery.html">Gallery</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=Z7GXKW4MKHK7C"><img src="donate.png" alt="Donate"></a></h1>
<h2>2024 Fundraise: 0% <progress max="100" value="1">0%</progress> 100%</h2>
<p><strong>&copy; 2006 - 2024 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong> | Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a></strong><br><strong>Last update: 09.04.2024 09:58</strong></p>
<p><strong>&copy; 2006 - 2024 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong> | Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a></strong><br><strong>Last update: 10.04.2024 16.36</strong></p>
<nav id="TOC" role="doc-toc">
<ul>
<li><a href="#introduction" id="toc-introduction"><strong><span class="toc-section-number">1.</span> Introduction</strong></a></li>
@ -133,26 +133,26 @@
<tbody>
<tr class="even">
<td>
<a href="https://release.archboot.com/aarch64/latest/boot/archboot-aarch64.efi" download><strong>archboot-aarch64.efi</strong></a> | <a href="https://release.archboot.com/aarch64/latest/boot/archboot-aarch64.efi.sig" download><strong>.sig</strong></a>
<a href="https://release.archboot.com/aarch64/latest/uki/archboot-aarch64.efi" download><strong>archboot-aarch64.efi</strong></a> | <a href="https://release.archboot.com/aarch64/latest/uki/archboot-aarch64.efi.sig" download><strong>.sig</strong></a>
</td>
<td>
<a href="https://release.archboot.com/x86_64/latest/boot/archboot-x86_64.efi" download><strong>archboot-x86_64.efi</strong></a> | <a href="https://release.archboot.com/x86_64/latest/boot/archboot-x86_64.efi.sig" download><strong>.sig</strong></a>
<a href="https://release.archboot.com/x86_64/latest/uki/archboot-x86_64.efi" download><strong>archboot-x86_64.efi</strong></a> | <a href="https://release.archboot.com/x86_64/latest/uki/archboot-x86_64.efi.sig" download><strong>.sig</strong></a>
</td>
</tr>
<tr class="odd">
<td>
<a href="https://release.archboot.com/aarch64/latest/boot/archboot-latest-aarch64.efi" download><strong>archboot-latest-aarch64.efi</strong></a> | <a href="https://release.archboot.com/aarch64/latest/boot/archboot-latest-aarch64.efi.sig" download><strong>.sig</strong></a>
<a href="https://release.archboot.com/aarch64/latest/uki/archboot-latest-aarch64.efi" download><strong>archboot-latest-aarch64.efi</strong></a> | <a href="https://release.archboot.com/aarch64/latest/uki/archboot-latest-aarch64.efi.sig" download><strong>.sig</strong></a>
</td>
<td>
<a href="https://release.archboot.com/x86_64/latest/boot/archboot-latest-x86_64.efi" download><strong>archboot-latest-x86_64.efi</strong></a> | <a href="https://release.archboot.com/x86_64/latest/boot/archboot-latest-x86_64.efi.sig" download><strong>.sig</strong></a>
<a href="https://release.archboot.com/x86_64/latest/uki/archboot-latest-x86_64.efi" download><strong>archboot-latest-x86_64.efi</strong></a> | <a href="https://release.archboot.com/x86_64/latest/uki/archboot-latest-x86_64.efi.sig" download><strong>.sig</strong></a>
</td>
</tr>
<tr class="even">
<td>
<a href="https://release.archboot.com/aarch64/latest/boot/archboot-local-aarch64.efi" download><strong>archboot-local-aarch64.efi</strong></a> | <a href="https://release.archboot.com/aarch64/latest/boot/archboot-local-aarch64.efi.sig" download><strong>.sig</strong></a>
<a href="https://release.archboot.com/aarch64/latest/uki/archboot-local-aarch64.efi" download><strong>archboot-local-aarch64.efi</strong></a> | <a href="https://release.archboot.com/aarch64/uki/boot/archboot-local-aarch64.efi.sig" download><strong>.sig</strong></a>
</td>
<td>
<a href="https://release.archboot.com/x86_64/latest/boot/archboot-local-x86_64.efi" download><strong>archboot-local-x86_64.efi</strong></a> | <a href="https://release.archboot.com/x86_64/latest/boot/archboot-local-x86_64.efi.sig" download><strong>.sig</strong></a>
<a href="https://release.archboot.com/x86_64/latest/uki/archboot-local-x86_64.efi" download><strong>archboot-local-x86_64.efi</strong></a> | <a href="https://release.archboot.com/x86_64/uki/boot/archboot-local-x86_64.efi.sig" download><strong>.sig</strong></a>
</td>
</tr>
</tbody>