From 335e6171a0d74c43fd737c63ac84ad44638606fb Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 15 Sep 2022 08:12:11 +0200 Subject: [PATCH] add server and release riscv64 --- usr/bin/archboot-riscv64-release.sh | 13 +++++++++ usr/bin/archboot-riscv64-server-release.sh | 8 ++++++ usr/lib/archboot/server.sh | 31 ++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100755 usr/bin/archboot-riscv64-release.sh create mode 100755 usr/bin/archboot-riscv64-server-release.sh diff --git a/usr/bin/archboot-riscv64-release.sh b/usr/bin/archboot-riscv64-release.sh new file mode 100755 index 000000000..c282f21f5 --- /dev/null +++ b/usr/bin/archboot-riscv64-release.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +# created by Tobias Powalowski +_ARCH="riscv64" +_ARCHBOOT="archboot-riscv" +. /usr/lib/archboot/common.sh +. /usr/lib/archboot/release.sh +[[ -z "${1}" ]] && _usage +_root_check +echo "Start release creation in $1 ..." +_create_iso "$@" || exit 1 +_create_boot || exit 1 +_create_cksum || exit 1 +echo "Finished release creation in ${1} ." diff --git a/usr/bin/archboot-riscv64-server-release.sh b/usr/bin/archboot-riscv64-server-release.sh new file mode 100755 index 000000000..fccd5e014 --- /dev/null +++ b/usr/bin/archboot-riscv64-server-release.sh @@ -0,0 +1,8 @@ +#! /bin/bash +_ARCH="riscv64" +. /usr/lib/archboot/common.sh +. /usr/lib/archboot/server.sh +_root_check +_update_riscv64_pacman_chroot || exit 1 +_update_source +_server_release || exit 1 diff --git a/usr/lib/archboot/server.sh b/usr/lib/archboot/server.sh index 51b1b2219..a7de223d2 100644 --- a/usr/lib/archboot/server.sh +++ b/usr/lib/archboot/server.sh @@ -35,6 +35,37 @@ _update_aarch64_pacman_chroot() { sudo -u "${_USER}" scp -q ${_PACMAN_AARCH64_CHROOT}{,.sig} ${_SERVER}:${_SERVER_PACMAN_AARCH64} || exit 1 } +_update_riscv64_pacman_chroot() { + # update riscv64 pacman chroot + cd "${_ISO_HOME}" || exit 1 + [[ -d "${_PACMAN_RISCV64}" ]] || mkdir "${_PACMAN_RISCV64}" + echo "Downloading archlinuxarm pacman RISCV64 chroot..." + [[ -f pacman-riscv64-chroot-latest.tar.zst ]] && rm pacman-riscv64-chroot-latest.tar.zst{,.sig} 2>/dev/null + wget ${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}/${_PACMAN_RISCV64_CHROOT}{,.sig} >/dev/null 2>&1 + # verify download + sudo -u "${_USER}" gpg --verify "${_PACMAN_RISCV64_CHROOT}.sig" >/dev/null 2>&1 || exit 1 + bsdtar -C "${_PACMAN_RISCV64}" -xf "${_PACMAN_RISCV64_CHROOT}" >/dev/null 2>&1 + echo "Removing installation tarball ..." + rm ${_PACMAN_RISCV64_CHROOT}{,.sig} >/dev/null 2>&1 + # update container to latest packages + echo "Update container to latest packages..." + systemd-nspawn -D "${_PACMAN_RISCV64}" pacman -Syu --noconfirm >/dev/null 2>&1 || exit 1 + _fix_network "${_PACMAN_RISCV64}" + _CLEANUP_CONTAINER="1" _clean_container "${_PACMAN_RISCV64}" >/dev/null 2>&1 + _CLEANUP_CACHE="1" _clean_cache "${_PACMAN_RISCV64}" >/dev/null 2>&1 + echo "Generating tarball ..." + tar -acf "${_PACMAN_RISCV64_CHROOT}" -C "${_PACMAN_RISCV64}" . + echo "Removing ${_PACMAN_RISCV64} ..." + rm -r "${_PACMAN_RISCV64}" + echo "Finished container tarball." + echo "Sign tarball ..." + #shellcheck disable=SC2086 + sudo -u "${_USER}" gpg ${_GPG} "${_PACMAN_RISCV64_CHROOT}" || exit 1 + chown "${_USER}:${_GROUP}" ${_PACMAN_RISCV64_CHROOT}{,.sig} || exit 1 + echo "Uploading files to ${_SERVER}:${_SERVER_PACMAN_RISCV64} ..." + sudo -u "${_USER}" scp -q ${_PACMAN_RISCV64_CHROOT}{,.sig} ${_SERVER}:${_SERVER_PACMAN_RISCV64} || exit 1 +} + _server_upload() { # copy files to server echo "Uploading files to ${_SERVER}:${_SERVER_HOME}/${_ARCH} ..."