root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add uboot image for aarch64 architecture, rename _prepare_uboot to _uboot

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-18 15:56:42 +02:00
parent 5c0070759e
commit d0262ceade
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-aarch64-iso.sh
View file

@ -18,7 +18,9 @@ _prepare_uefi_AA64 || exit 1
_prepare_background || exit 1
_reproducibility
_prepare_uefi_image || exit 1
_prepare_extlinux_conf || exit 1
_reproducibility
_uboot || exit 1
_grub_mkrescue || exit 1
_reproducibility_iso || exit 1
_create_cksum || exit 1

2
usr/bin/archboot-riscv64-iso.sh
View file

@ -13,7 +13,7 @@ _fix_mkinitcpio
_prepare_kernel_initramfs_files_RISCV64 || exit 1
_prepare_extlinux_conf || exit 1
_reproducibility
_prepare_uboot_image || exit 1
_uboot || exit 1
_create_cksum || exit 1
_cleanup_iso || exit 1
echo "Finished Image creation."

12
usr/lib/archboot/iso.sh
View file

@ -91,7 +91,6 @@ _prepare_kernel_initramfs_files_RISCV64() {
echo "Prepare RISCV64 u-boot ..."
#shellcheck disable=SC1090
source "${_PRESET}"
mkdir -p "${_ISODIR}"/boot/extlinux
install -m644 "${ALL_kver}" "${_ISODIR}/boot/vmlinuz_${_RUNNING_ARCH}"
mkinitcpio -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}.img" || exit 1
}
@ -191,9 +190,12 @@ _prepare_uefi_image() {
}
_prepare_extlinux_conf() {
echo "Prepare extlinux.conf ..."
mkdir -p "${_ISODIR}"/boot/extlinux
[[ ${_RUNNING_ARCH} == "aarch64" ]] && _TITLE="Arch Linux ARM"
[[ ${_RUNNING_ARCH} == "riscv64" ]] && _TITLE="Arch Linux RISC-V 64"
echo "Prepare extlinux.conf ..."
cat << EOF >> "${_ISODIR}/boot/extlinux/extlinux.conf"
menu title Welcome to Archboot - Arch Linux RISC-V 64
menu title Welcome to Archboot - ${_TITLE}
timeout 100
default linux
label linux
@ -210,8 +212,8 @@ EOF
# 512*2048=1048576 == 1M
# https://reproducible-builds.org/docs/system-images/
# mkfs.ext4 does not allow reproducibility
_prepare_uboot_image() {
echo "Prepare u-boot image ..."
_uboot() {
echo "Create U-Boot image ..."
## get size of boot files
BOOTSIZE=$(du -bc "${_ISODIR}"/boot | grep total | cut -f1)
IMGSZ=$(((BOOTSIZE*102)/100/1024)) # image size in sectors