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

move _ARCHBOOT and _KEYRING to common

Browse source
This commit is contained in:
Tobias Powalowski 2022-11-19 20:08:34 +01:00
parent 22facbf3c6
commit 6f8798d71b
12 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr/bin/archboot-aarch64-create-container.sh
View file

@ -2,7 +2,6 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ARCHBOOT="archboot-arm archlinuxarm-keyring"
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage
_parameters "$@" _parameters "$@"
_root_check _root_check

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

@ -3,7 +3,6 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
. /usr/lib/archboot/repository.sh . /usr/lib/archboot/repository.sh
_ARCHBOOT="archboot-arm archlinuxarm-keyring"
[[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}") [[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}")
_REPODIR="$(mktemp -d "${1}"/repository.XXX)" _REPODIR="$(mktemp -d "${1}"/repository.XXX)"
_CACHEDIR="${_REPODIR}/var/cache/pacman/pkg" _CACHEDIR="${_REPODIR}/var/cache/pacman/pkg"

1
usr/bin/archboot-aarch64-release.sh
View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
_ARCH="aarch64" _ARCH="aarch64"
_ARCHBOOT="archboot-arm archlinuxarm-keyring"
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/release.sh . /usr/lib/archboot/release.sh
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage

1
usr/bin/archboot-riscv64-create-container.sh
View file

@ -2,7 +2,6 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ARCHBOOT="archboot-riscv"
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage
_parameters "$@" _parameters "$@"
_root_check _root_check

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

@ -3,7 +3,6 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
. /usr/lib/archboot/repository.sh . /usr/lib/archboot/repository.sh
_ARCHBOOT="archboot-riscv"
[[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}") [[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}")
_REPODIR="$(mktemp -d "${1}"/repository.XXX)" _REPODIR="$(mktemp -d "${1}"/repository.XXX)"
_CACHEDIR="${_REPODIR}/var/cache/pacman/pkg" _CACHEDIR="${_REPODIR}/var/cache/pacman/pkg"

1
usr/bin/archboot-riscv64-release.sh
View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
_ARCH="riscv64" _ARCH="riscv64"
_ARCHBOOT="archboot-riscv"
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/release.sh . /usr/lib/archboot/release.sh
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage

1
usr/bin/archboot-x86_64-create-container.sh
View file

@ -2,7 +2,6 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ARCHBOOT="archboot"
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage
_parameters "$@" _parameters "$@"
_root_check _root_check

1
usr/bin/archboot-x86_64-create-repository.sh
View file

@ -3,7 +3,6 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
. /usr/lib/archboot/repository.sh . /usr/lib/archboot/repository.sh
_ARCHBOOT="archboot"
[[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}") [[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}")
_REPODIR="$(mktemp -d "${1}"/repository.XXX)" _REPODIR="$(mktemp -d "${1}"/repository.XXX)"
_CACHEDIR="${_REPODIR}/var/cache/pacman/pkg" _CACHEDIR="${_REPODIR}/var/cache/pacman/pkg"

1
usr/bin/archboot-x86_64-release.sh
View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
_ARCH="x86_64" _ARCH="x86_64"
_ARCHBOOT="archboot"
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/release.sh . /usr/lib/archboot/release.sh
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage

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

@ -4,6 +4,16 @@
LANG="C" LANG="C"
_BASENAME="$(basename "${0}")" _BASENAME="$(basename "${0}")"
_RUNNING_ARCH="$(uname -m)" _RUNNING_ARCH="$(uname -m)"
_KEYRING="archlinux-keyring"
if [[ "$(echo ${_BASENAME} | grep -qw aarch64)" ]]; then
_ARCHBOOT="archboot-arm"
_KEYRING="${_KEYRING} archlinuxarm-keyring"
elif [[ "$(echo ${_BASENAME} | grep -qw riscv64)" ]]; then
_ARCHBOOT="archboot-riscv64"
else
_ARCHBOOT="archboot"
fi
_PACMAN_MIRROR="/etc/pacman.d/mirrorlist" _PACMAN_MIRROR="/etc/pacman.d/mirrorlist"
_PACMAN_CONF="/etc/pacman.conf" _PACMAN_CONF="/etc/pacman.conf"
_FIX_PACKAGES="libunwind libelf libevent python talloc gdbm fuse3 gcc-libs perl glibc libtiff glib2 libcups harfbuzz avahi nss p11-kit libp11-kit fuse tpm2-tss libsecret smbclient libcap tevent libbsd libldap tdb ldb libmd jansson libsasl pcre2" _FIX_PACKAGES="libunwind libelf libevent python talloc gdbm fuse3 gcc-libs perl glibc libtiff glib2 libcups harfbuzz avahi nss p11-kit libp11-kit fuse tpm2-tss libsecret smbclient libcap tevent libbsd libldap tdb ldb libmd jansson libsasl pcre2"

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

@ -96,8 +96,6 @@ _prepare_pacman() {
echo "Remove archboot repository sync db ..." echo "Remove archboot repository sync db ..."
rm -f /var/lib/pacman/sync/archboot.db rm -f /var/lib/pacman/sync/archboot.db
echo "Update Arch Linux keyring ..." echo "Update Arch Linux keyring ..."
_KEYRING="archlinux-keyring"
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring"
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -Sy --config ${_PACMAN_CONF} --noconfirm --noprogressbar ${_KEYRING} >/dev/null 2>&1 pacman -Sy --config ${_PACMAN_CONF} --noconfirm --noprogressbar ${_KEYRING} >/dev/null 2>&1
} }

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

@ -16,7 +16,7 @@ _download_packages() {
if [[ "${2}" == "use_binfmt" ]]; then if [[ "${2}" == "use_binfmt" ]]; then
_pacman_key "${1}" _pacman_key "${1}"
fi fi
_PACKAGES="${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES}" _PACKAGES="${_PACKAGES} ${_ARCHBOOT} ${_KEYRING} ${_GRAPHICAL_PACKAGES}"
echo "Downloading ${_PACKAGES} to ${1} ..." echo "Downloading ${_PACKAGES} to ${1} ..."
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Syw ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1 ${_PACMAN} -Syw ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1