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

fix repository creation

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-02 21:26:50 +02:00
parent c49ec5de09
commit bdb059f42d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-aarch64-create-repository.sh
View file

@ -22,7 +22,7 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_pacman_chroot "${_REPODIR}" "${_ARCHBOOT_AARCH64_CHROOT_PUBLIC}" "${_PACMAN_AARCH64_CHROOT}" || exit 1
_create_pacman_conf "${_REPODIR}" "use_container_config"
_pacman_parameters "${_REPODIR}" "use_binfmt"
_download_packages "${_REPODIR}" || exit 1
_download_packages "${_REPODIR}" "use_binfmt" || exit 1
fi
_move_packages "${_REPODIR}" "${1}" || exit 1
_cleanup_repodir "${_REPODIR}" || exit 1

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

@ -22,7 +22,7 @@ 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"
_pacman_parameters "${_REPODIR}" "use_binfmt"
_download_packages "${_REPODIR}" || exit 1
_download_packages "${_REPODIR}" "use_binfmt" || exit 1
fi
_move_packages "${_REPODIR}" "${1}" || exit 1
_cleanup_repodir "${_REPODIR}" || exit 1

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

@ -12,11 +12,11 @@ _usage () {
}
_download_packages() {
_PACMAN_OPTIONS="${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then
_copy_gpg_key
_riscv64_disable_graphics
_copy_gpg_key "${1}"
_riscv64_disable_graphics "${1}"
fi
_PACMAN_OPTIONS="${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DEFAULTS}"
_pacman_key
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1