mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-23 11:36:32 +01:00
fix(steps-guix): support explicit build dir for source-less seed packages
This commit is contained in:
parent
893a320f6f
commit
ea69ae93b8
5 changed files with 13 additions and 4 deletions
|
|
@ -181,7 +181,7 @@ build() {
|
|||
pkg=$1
|
||||
get_revision "${pkg}"
|
||||
script_name=${2:-pass$((revision+1)).sh}
|
||||
dirname=${3:-${pkg}}
|
||||
build_dir=${3:-${pkg}}
|
||||
|
||||
# shellcheck disable=SC2015
|
||||
bin_preseed && return || true # Normal build if preseed fails
|
||||
|
|
@ -206,6 +206,9 @@ build() {
|
|||
# shellcheck source=/dev/null
|
||||
. "${build_script}"
|
||||
fi
|
||||
if [ -n "${BUILD_DIRNAME+x}" ]; then
|
||||
build_dir="${BUILD_DIRNAME}"
|
||||
fi
|
||||
|
||||
echo "${pkg}: getting sources."
|
||||
build_stage=src_get
|
||||
|
|
@ -216,7 +219,7 @@ build() {
|
|||
call $build_stage
|
||||
unset EXTRA_DISTFILES
|
||||
|
||||
cd "${dirname}" || (echo "Cannot cd into build/${dirname}!"; kill $$)
|
||||
cd "${build_dir}" || (echo "Cannot cd into build/${build_dir}!"; kill $$)
|
||||
|
||||
echo "${pkg}: preparing source."
|
||||
build_stage=src_prepare
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue