From 90cc62a4cb0fa2a0ea9e0e53e79529e5e5d1659c Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 16 May 2025 14:24:26 +0200 Subject: [PATCH] Force host pre-preaprepare when running via action --- action.yml | 6 +++++- lib/functions/host/docker.sh | 2 +- lib/functions/host/prepare-host.sh | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 688c8a74e..4f27dcb5a 100644 --- a/action.yml +++ b/action.yml @@ -25,7 +25,7 @@ inputs: armbian_branch: description: "Choose framework branch" required: false - default: "main" + default: "prepre" armbian_kernel_branch: description: "Choose kernel branch" @@ -173,6 +173,10 @@ runs: cd build # execute build command + + sudo ./compile.sh requirements + sudo chown -R $USER:$USER . + ./compile.sh "${{ inputs.armbian_target }}" \ REVISION="${{ env.ARMBIAN_VERSION }}" \ BOARD="${{ inputs.armbian_board }}" \ diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh index 736acbe2a..08fda2cdd 100644 --- a/lib/functions/host/docker.sh +++ b/lib/functions/host/docker.sh @@ -242,7 +242,7 @@ function docker_cli_prepare_dockerfile() { # Prepare some dependencies; these will be used on the Dockerfile # @TODO: this might be unified with prepare_basic_deps - declare -g -a BASIC_DEPS=("bash" "git" "psmisc" "uuid-runtime") + declare -g -a BASIC_DEPS=("bash" "git" "psmisc" "uuid-runtime" "qemu-user-static") # initialize the extension manager; enable all extensions; only once.. if [[ "${docker_prepare_cli_skip_exts:-no}" != "yes" ]]; then diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index 8affa5407..277982b51 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -196,7 +196,8 @@ function adaptative_prepare_host_dependencies() { ncurses-base ncurses-term # for `make menuconfig` ntpsec-ntpdate #this is a more secure ntpdate patchutils pkg-config pv - "qemu-user-static" "arch-test" + qemu-user-static + arch-test rsync swig # swig is needed for some u-boot's. example: "bananapi.conf" u-boot-tools