mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 11:30:37 +02:00
same name scheme for UKI images lime ISO names
This commit is contained in:
parent
0c6e6c6448
commit
1f9bab0af0
2 changed files with 8 additions and 7 deletions
|
@ -3,6 +3,7 @@ On the road to 2024.09:
|
||||||
- added custom autorun script support
|
- added custom autorun script support
|
||||||
- added archboot-x86_64-uki.sh script
|
- added archboot-x86_64-uki.sh script
|
||||||
- added archboot-aarch64-uki.sh script
|
- added archboot-aarch64-uki.sh script
|
||||||
|
- switched name scheme for UKI images
|
||||||
setup:
|
setup:
|
||||||
- switched to new limine 8.0 config layout (issue #4)
|
- switched to new limine 8.0 config layout (issue #4)
|
||||||
- switched to mkinitcpio uki generation (issue #3)
|
- switched to mkinitcpio uki generation (issue #3)
|
||||||
|
|
|
@ -39,7 +39,7 @@ _create_iso() {
|
||||||
. "${_W_DIR}/etc/archboot/${_ARCH}.conf"
|
. "${_W_DIR}/etc/archboot/${_ARCH}.conf"
|
||||||
#shellcheck disable=SC2116,SC2046,2086
|
#shellcheck disable=SC2116,SC2046,2086
|
||||||
_KVER="$(_kver $(echo ${_W_DIR}${_KERNEL}))"
|
_KVER="$(_kver $(echo ${_W_DIR}${_KERNEL}))"
|
||||||
_ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-${_KVER}"
|
_NAME="archboot-$(date +%Y.%m.%d-%H.%M)-${_KVER}"
|
||||||
if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then
|
if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then
|
||||||
### to speedup build for riscv64 and aarch64 on x86_64, run compressor on host system
|
### to speedup build for riscv64 and aarch64 on x86_64, run compressor on host system
|
||||||
echo "Generating initramdisks..."
|
echo "Generating initramdisks..."
|
||||||
|
@ -68,16 +68,16 @@ _create_iso() {
|
||||||
echo "Generating local ISO..."
|
echo "Generating local ISO..."
|
||||||
# generate local iso in container
|
# generate local iso in container
|
||||||
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -s \
|
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -s \
|
||||||
-c=${_CONFIG_LOCAL} -i=${_ISONAME}-local-${_ARCH}" || exit 1
|
-c=${_CONFIG_LOCAL} -i=${_NAME}-local-${_ARCH}" || exit 1
|
||||||
echo "Generating latest ISO..."
|
echo "Generating latest ISO..."
|
||||||
# generate latest iso in container
|
# generate latest iso in container
|
||||||
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g \
|
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g \
|
||||||
-c=${_CONFIG_LATEST} -i=${_ISONAME}-latest-${_ARCH}" || exit 1
|
-c=${_CONFIG_LATEST} -i=${_NAME}-latest-${_ARCH}" || exit 1
|
||||||
fi
|
fi
|
||||||
echo "Generating normal ISO..."
|
echo "Generating normal ISO..."
|
||||||
# generate iso in container
|
# generate iso in container
|
||||||
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;archboot-${_ARCH}-iso.sh -g -s \
|
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;archboot-${_ARCH}-iso.sh -g -s \
|
||||||
-i=${_ISONAME}-${_ARCH}" || exit 1
|
-i=${_NAME}-${_ARCH}" || exit 1
|
||||||
# move iso out of container
|
# move iso out of container
|
||||||
mv "${_W_DIR}"/*.iso ./ &>"${_NO_LOG}"
|
mv "${_W_DIR}"/*.iso ./ &>"${_NO_LOG}"
|
||||||
mv "${_W_DIR}"/*.img ./ &>"${_NO_LOG}"
|
mv "${_W_DIR}"/*.img ./ &>"${_NO_LOG}"
|
||||||
|
@ -140,9 +140,9 @@ _create_iso() {
|
||||||
rm -r "${_W_DIR:?}"/boot
|
rm -r "${_W_DIR:?}"/boot
|
||||||
mv boot "${_W_DIR}"
|
mv boot "${_W_DIR}"
|
||||||
for initrd in ${_INITRD} ${_INITRD_LATEST} ${_INITRD_LOCAL}; do
|
for initrd in ${_INITRD} ${_INITRD_LATEST} ${_INITRD_LOCAL}; do
|
||||||
[[ "${initrd}" == "${_INITRD}" ]] && _UKI="boot/archboot-${_ARCH}.efi"
|
[[ "${initrd}" == "${_INITRD}" ]] && _UKI="boot/${_NAME}-${_ARCH}.efi"
|
||||||
[[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="boot/archboot-latest-${_ARCH}.efi"
|
[[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="boot/${_NAME}-latest-${_ARCH}.efi"
|
||||||
[[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="boot/archboot-local-${_ARCH}.efi"
|
[[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="boot/${_NAME}-local-${_ARCH}.efi"
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux=${_KERNEL_ARCHBOOT} \
|
${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux=${_KERNEL_ARCHBOOT} \
|
||||||
${_INTEL_UCODE} ${_AMD_UCODE} --initrd=${initrd} --cmdline=@${_CMDLINE} \
|
${_INTEL_UCODE} ${_AMD_UCODE} --initrd=${initrd} --cmdline=@${_CMDLINE} \
|
||||||
|
|
Loading…
Reference in a new issue