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

only add archinstall on x86_64

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-04 08:51:48 +01:00
parent 502a8eeaf7
commit beda2ddf7b
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
usr/bin/archboot-archinstall.sh
View file

@ -1,5 +1,6 @@
#!/bin/bash
_ARCHINSTALL=$(mktemp -d archinstall.XXX)
_AARCH64_W_DIR="archinstall-aarch64"
_USER="tobias"
_GROUP="users"
_GPG="--detach-sign --no-armor --batch --passphrase-file /etc/archboot/gpg.passphrase --pinentry-mode loopback -u 7EDF681F"
@ -18,20 +19,26 @@ fi
chown "${_USER}:${_GROUP}" "${_ARCHINSTALL}"
cd "${_ARCHINSTALL}" || exit 1
# download packages from fedora server
echo "Building archinstall C version..."
echo "Building archinstall C version X86_64..."
pacman -Sy nuitka gcc archinstall patchelf --noconfirm
nuitka3 --standalone /usr/bin/archinstall || exit 1
mv archinstall.dist/archinstall ./
mv archinstall.dist/archinstall ./archinstall.x86_64
#rm -r archinstall.{dist,build}
#archboot-aarch64-create-container.sh "${_AARCH64_W_DIR}"
#systemd-nspawn -q -D "${_AARCH64_W_DIR}" /bin/bash -c "pacman -Sy nuitka gcc archinstall patchelf --noconfirm"; cd /;nuitka3 --standalone /usr/bin/archinstall || exit 1
#mv "${_AARCH64_W_DIR}/archinstall.dist/archinstall" ./archinstall.aarch64
#rm -r "${_AARCH64_W_DIR}"
# sign files
echo "Sign file and upload ..."
chmod 755 archinstall
chown "${_USER}:${_GROUP}" archinstall
for i in archinstall; do
chmod 755 ./*
chown "${_USER}:${_GROUP}" ./*
for i in ./*; do
#shellcheck disable=SC2086
[[ -f "${i}" ]] && sudo -u "${_USER}" gpg ${_GPG} "${i}" || exit 1
[[ -f "${i}" ]] && cksum -a sha256 "${i}" >> sha256sum.txt
[[ -f "${i}.sig" ]] && cksum -a sha256 "${i}.sig" >> sha256sum.txt
done
sudo -u "${_USER}" scp archinstall "${_SERVER}:${_SHIM_ARCH_SERVERDIR}" || exit 1
sudo -u "${_USER}" scp ./* "${_SERVER}:${_SHIM_ARCH_SERVERDIR}" || exit 1
# cleanup
echo "Remove ${_ARCHINSTALL} directory."
cd ..

13
usr/lib/initcpio/install/archboot_installer
View file

@ -3,12 +3,13 @@
build ()
{
_ARCHINSTALL_URL="https://pkgbuild.com/~tpowa/archboot-helper/archinstall/archinstall"
_ARCHINSTALL=$(mktemp -d /var/tmp/archinstall.XXX)
curl -s --create-dirs -L -O --output-dir "${_ARCHINSTALL}" "${_ARCHINSTALL_URL}"
chmod 755 "${_ARCHINSTALL}/archinstall"
add_binary "${_ARCHINSTALL}/archinstall" "/usr/bin/archinstall"
add_file "${_SHIM}/${i}" "/usr/share/archboot/fedora-shim/${i}"
if [[ "$(uname -m)" == "x86_64" ]]; then
_ARCHINSTALL_URL="https://pkgbuild.com/~tpowa/archboot-helper/archinstall/archinstall.$(uname-m)"
_ARCHINSTALL=$(mktemp -d /var/tmp/archinstall.XXX)
curl -s --create-dirs -L -O --output-dir "${_ARCHINSTALL}" "${_ARCHINSTALL_URL}"
chmod 755 "${_ARCHINSTALL}/archinstall.$(uname-m)"
add_binary "${_ARCHINSTALL}/archinstall.$(uname-m)" "/usr/bin/archinstall"
fi
apps="genfstab arch-chroot pacstrap \
archboot-$(uname -m)-release.sh archboot-mktorrent.sh \
archboot-restore-usbstick.sh isoinfo mktorrent archboot-copy-mountpoint.sh \