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

code cleanup repository

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-02 10:30:15 +02:00
parent c974f48ad9
commit f5cb52f4ac
4 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/bin/archboot-riscv64-create-repository.sh
View file

@ -14,13 +14,15 @@ if [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
_cachedir_check
_create_pacman_conf "${_REPODIR}"
_prepare_pacman "${_REPODIR}" || exit 1
_pacman_parameters "${_REPODIR}"
_download_packages "${_REPODIR}" || exit 1
_umount_special "${_REPODIR}" || exit 1
fi
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_pacman_chroot "${_REPODIR}" "${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}" "${_PACMAN_RISCV64_CHROOT}" || exit 1
_create_pacman_conf "${_REPODIR}" "use_container_config"
_other_download_packages "${_REPODIR}" || exit 1
_pacman_parameters "${_REPODIR}" "use_binfmt"
_download_packages "${_REPODIR}" || exit 1
fi
_move_packages "${_REPODIR}" "${1}" || exit 1
_cleanup_repodir "${_REPODIR}" || exit 1

14
usr/lib/archboot/common.sh
View file

@ -126,3 +126,17 @@ _create_archboot_db() {
#shellcheck disable=SC2046
LANG=C repo-add -q "${1}"/archboot.db.tar.gz $(find "${1}"/ -type f ! -name '*.sig')
}
_pacman_parameters() {
# building for different architecture using binfmt
if [[ "${2}" == "use_binfmt" ]]; then
_PACMAN="${_NSPAWN} pacman"
_PACMAN_CACHEDIR=""
# building for running architecture
else
_PACMAN="pacman --root ${1}"
_PACMAN_CACHEDIR="--cachedir ${_CACHEDIR}"
fi
# defaults used on every pacman call
_PACMAN_DEFAULTS="--config ${_PACMAN_CONF} ${_PACMAN_CACHEDIR} --ignore systemd-resolvconf --noconfirm"
}

14
usr/lib/archboot/container.sh
View file

@ -142,20 +142,6 @@ _umount_special() {
umount -R "${1}/dev"
}
_pacman_parameters() {
# building for different architecture using binfmt
if [[ "${2}" == "use_binfmt" ]]; then
_PACMAN="${_NSPAWN} pacman"
_PACMAN_CACHEDIR=""
# building for running architecture
else
_PACMAN="pacman --root ${1}"
_PACMAN_CACHEDIR="--cachedir ${_CACHEDIR}"
fi
# defaults used on every pacman call
_PACMAN_DEFAULTS="--config ${_PACMAN_CONF} ${_PACMAN_CACHEDIR} --ignore systemd-resolvconf --noconfirm"
}
_install_base_packages() {
_PACMAN_OPTIONS="${_PACKAGES} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then

40
usr/lib/archboot/repository.sh
View file

@ -19,27 +19,27 @@ _cachedir_check() {
}
_download_packages() {
echo "Adding ${_GPG_KEY_ID} to trusted keys"
pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
_PACMAN_OPTIONS="${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then
_PACMAN_DB=""
mkdir "${1}"/blankdb
echo "Adding ${_GPG_KEY_ID} to trusted keys"
[[ -d "${1}"/usr/share/archboot/gpg ]] || mkdir -p "${1}"/usr/share/archboot/gpg
cp "${_GPG_KEY}" "${1}"/"${_GPG_KEY}"
${_NSPAWN} pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
${_NSPAWN} pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
# riscv64 does not support local image at the moment
_CONTAINER_ARCH="$(${_NSPAWN} uname -m)"
#shellcheck disable=SC2001
[[ "$(echo "${_CONTAINER_ARCH}" | sed -e 's#\r##g')" == "riscv64" ]] && _GRAPHICAL_PACKAGES=""
else
_PACMAN_DB="--dbpath ${1}/blankdb"
echo "Adding ${_GPG_KEY_ID} to trusted keys"
pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
fi
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
#shellcheck disable=SC2086
pacman --root "${1}" -Syw ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
}
_other_download_packages() {
mkdir "${1}"/blankdb
echo "Adding ${_GPG_KEY_ID} to trusted keys"
[[ -d "${1}"/usr/share/archboot/gpg ]] || mkdir -p "${1}"/usr/share/archboot/gpg
cp "${_GPG_KEY}" "${1}"/"${_GPG_KEY}"
${_NSPAWN} pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
${_NSPAWN} pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
# riscv64 does not support local image at the moment
_CONTAINER_ARCH="$(${_NSPAWN} uname -m)"
#shellcheck disable=SC2001
[[ "$(echo "${_CONTAINER_ARCH}" | sed -e 's#\r##g')" == "riscv64" ]] && _GRAPHICAL_PACKAGES=""
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
${_NSPAWN} pacman -Syw ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} --dbpath /blankdb --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1
}
_move_packages() {