do the proot nonsense in woodpecker
Some checks failed
ci/woodpecker/manual/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/manual/woodpecker Pipeline failed
This commit is contained in:
parent
02c9cb8247
commit
b4efcdbaa6
2 changed files with 1 additions and 8 deletions
|
@ -7,6 +7,7 @@ steps:
|
|||
image: docker.io/archlinux:base-devel
|
||||
commands:
|
||||
- pacman -Sy
|
||||
- curl -L https://proot.gitlab.io/proot/bin/proot /usr/local/bin/chroot && chmod +x /usr/local/bin/chroot
|
||||
- ./build-iso
|
||||
- eval $(grep iso_ archiso/profiledef.sh)
|
||||
- ISO_FILE="archiso/out/$iso_name-$iso_version-x86_64.iso"
|
||||
|
|
|
@ -26,13 +26,6 @@ function install_archiso {
|
|||
fi
|
||||
}
|
||||
|
||||
function install_proot {
|
||||
if ! type proot >/dev/null 2>&1; then
|
||||
curl -L https://proot.gitlab.io/proot/bin/proot -O /usr/local/bin/proot
|
||||
chmod +x /usr/local/bin/proot
|
||||
fi
|
||||
}
|
||||
|
||||
function prepare {
|
||||
install_archiso
|
||||
[ -d "$build_dir" ] && as_root rm -rf "$build_dir"
|
||||
|
@ -86,7 +79,6 @@ function pubkey_config {
|
|||
|
||||
function build_iso {
|
||||
temp_dir=$(as_root mktemp -d)
|
||||
alias chroot=proot
|
||||
as_root chmod 755 "$temp_dir"
|
||||
as_root mkarchiso -v -w "$temp_dir/archiso" -o "$build_dir"/out "$build_dir" && echo "ISO build complete"
|
||||
as_root rm -rf "$temp_dir"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue