replace uname -m with _RUNNING_ARCH

This commit is contained in:
Tobias Powalowski 2022-01-31 08:28:53 +01:00
parent e43e534200
commit 65fe8a5307

View file

@ -4,7 +4,7 @@
build ()
{
# https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot
_PYTHON_ARCH="$(uname -m)"
_RUNNING_ARCH="$(uname -m)"
apps="openssl python3 cert-to-efi-hash-list efi-readvar efi-updatevar efitool-mkusb flash-var \
hash-to-efi-sig-list sig-list-to-certs cert-to-efi-sig-list sign-efi-sig-list sbattach sbkeysync \
sbsiglist sbsign sbvarsign sbverify mokutil"
@ -29,28 +29,26 @@ build ()
for i in ${PYTHON_FILES}; do
add_file "/usr/lib/python3.10/$i.py"
done
PYTHON_DYN="select.cpython-310-${_PYTHON_ARCH}-linux-gnu math.cpython-310-${_PYTHON_ARCH}-linux-gnu \
_random.cpython-310-${_PYTHON_ARCH}-linux-gnu _sha512.cpython-310-${_PYTHON_ARCH}-linux-gnu \
_posixsubprocess.cpython-310-${_PYTHON_ARCH}-linux-gnu"
PYTHON_DYN="select.cpython-310-${_RUNNING_ARCH}-linux-gnu math.cpython-310-${_RUNNING_ARCH}-linux-gnu \
_random.cpython-310-${_RUNNING_ARCH}-linux-gnu _sha512.cpython-310-${_RUNNING_ARCH}-linux-gnu \
_posixsubprocess.cpython-310-${_RUNNING_ARCH}-linux-gnu"
for i in ${PYTHON_DYN}; do
add_file "/usr/lib/python3.10/lib-dynload/$i.so"
done
# add efitools files
if [[ "$(uname -m)" == "x86_64" ]]; then
add_file "/usr/share/efitools/efi/PreLoader.efi"
fi
[[ ""${_RUNNING_ARCH}"" == "x86_64" ]] && add_file "/usr/share/efitools/efi/PreLoader.efi"
add_file "/usr/share/efitools/efi/HashTool.efi"
add_file "/usr/share/efitools/efi/KeyTool.efi"
# add shim signed files from fedora
_SHIM_URL="https://pkgbuild.com/~tpowa/archboot-helper/fedora-shim"
_SHIM=$(mktemp -d /var/tmp/shim.XXXX)
if [[ "$(uname -m)" == "x86_64" ]]; then
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
for i in shimx64.efi mmx64.efi mmia32.efi shimia32.efi; do
curl -s --create-dirs -L -O --output-dir "${_SHIM}" "${_SHIM_URL}"/"${i}"
add_file "${_SHIM}/${i}" "/usr/share/archboot/fedora-shim/${i}"
done
fi
if [[ "$(uname -m)" == "aarch64" ]]; then
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
for i in mmaa64.efi shimaa64.efi; do
curl -s --create-dirs -L -O --output-dir "${_SHIM}" "${_SHIM_URL}"/"${i}"
add_file "${_SHIM}/${i}" "/usr/share/archboot/fedora-shim/${i}"