mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix server build script
This commit is contained in:
parent
cd0bf4a457
commit
a5aaf37b58
4 changed files with 11 additions and 11 deletions
|
@ -4,9 +4,9 @@ source /usr/lib/archboot/functions
|
||||||
_DIR=""
|
_DIR=""
|
||||||
_LATEST_ARM64="http://os.archlinuxarm.org/os/ArchLinuxARM-aarch64-latest.tar.gz"
|
_LATEST_ARM64="http://os.archlinuxarm.org/os/ArchLinuxARM-aarch64-latest.tar.gz"
|
||||||
_PACMAN_CHROOT="pacman-aarch64-chroot"
|
_PACMAN_CHROOT="pacman-aarch64-chroot"
|
||||||
export _KEYRING="archlinuxarm"
|
_KEYRING="archlinuxarm"
|
||||||
|
|
||||||
usage () {
|
_usage () {
|
||||||
echo "CREATE AARCH64 PACMAN CHROOT"
|
echo "CREATE AARCH64 PACMAN CHROOT"
|
||||||
echo "-----------------------------"
|
echo "-----------------------------"
|
||||||
echo "This will create an aarch64 pacman chroot tarball on x86_64"
|
echo "This will create an aarch64 pacman chroot tarball on x86_64"
|
||||||
|
@ -14,7 +14,7 @@ usage () {
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "${1}" ]] && usage
|
[[ -z "${1}" ]] && _usage
|
||||||
|
|
||||||
_DIR="$1"
|
_DIR="$1"
|
||||||
|
|
||||||
|
@ -67,4 +67,4 @@ tar -acf ${_PACMAN_CHROOT}-latest.tar.zst -C "${_DIR}"/"${_PACMAN_CHROOT}" .
|
||||||
echo " Removing ${_DIR} ..."
|
echo " Removing ${_DIR} ..."
|
||||||
rm -r "${_DIR}"
|
rm -r "${_DIR}"
|
||||||
echo "Finished container tarball."
|
echo "Finished container tarball."
|
||||||
unset _KEYRING
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
_ARCH="aarch64"
|
||||||
source /usr/lib/archboot/functions
|
source /usr/lib/archboot/functions
|
||||||
source /usr/lib/archboot/server_functions
|
source /usr/lib/archboot/server_functions
|
||||||
_ARCH="aarch64"
|
|
||||||
_root_check
|
_root_check
|
||||||
_buildserver_check
|
_buildserver_check
|
||||||
_update_aarch64_pacman_chroot
|
_update_aarch64_pacman_chroot
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
_ARCH="x86_64"
|
||||||
source /usr/lib/archboot/functions
|
source /usr/lib/archboot/functions
|
||||||
source /usr/lib/archboot/server_functions
|
source /usr/lib/archboot/server_functions
|
||||||
_ARCH="x86_64"
|
|
||||||
_root_check
|
_root_check
|
||||||
_buildserver_check
|
_buildserver_check
|
||||||
_pacman_x86_64_use_default
|
_x86_64_pacman_use_default
|
||||||
_server_release
|
_server_release
|
||||||
_pacman_x86_64_restore
|
_x86_64_pacman_restore
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
_DIRECTORY="$(date +%Y.%m)"
|
_DIRECTORY="$(date +%Y.%m)"
|
||||||
_ISOHOME="/home/tobias/Arch/iso/${_ARCH}"
|
_ISOHOME="/home/tobias/Arch/iso/${_ARCH}"
|
||||||
_BUILDDIR="$(mktemp -d "${_ISOHOME}"/server-release.XXX)"
|
_BUILDDIR="$(mktemp -d ${_ISOHOME}/server-release.XXX)"
|
||||||
_SERVER="pkgbuild.com"
|
_SERVER="pkgbuild.com"
|
||||||
_SERVER_HOME="/home/tpowa/"
|
_SERVER_HOME="/home/tpowa/"
|
||||||
_SERVER_DIR="/home/tpowa/public_html/archboot-images"
|
_SERVER_DIR="/home/tpowa/public_html/archboot-images"
|
||||||
|
@ -96,7 +96,7 @@ ln -s "${_DIRECTORY}" latest
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
_pacman_x86_64_use_default() {
|
_x86_64_pacman_use_default() {
|
||||||
# use pacman.conf with disabled [testing] repository
|
# use pacman.conf with disabled [testing] repository
|
||||||
cp "${_PACMAN_CONF}" "${_PACMAN_CONF}".old
|
cp "${_PACMAN_CONF}" "${_PACMAN_CONF}".old
|
||||||
cp "${_PACMAN_CONF}".archboot "${_PACMAN_CONF}"
|
cp "${_PACMAN_CONF}".archboot "${_PACMAN_CONF}"
|
||||||
|
@ -105,7 +105,7 @@ _pacman_x86_64_use_default() {
|
||||||
cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
|
cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
|
||||||
}
|
}
|
||||||
|
|
||||||
_pacman_x86_64_restore() {
|
_x86_64_pacman_restore() {
|
||||||
# restore pacman.conf and mirrorlist
|
# restore pacman.conf and mirrorlist
|
||||||
cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}"
|
cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}"
|
||||||
cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"
|
cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"
|
||||||
|
|
Loading…
Reference in a new issue