kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(steps-guix): support explicit build dir for source-less seed packages

Browse source
This commit is contained in:
vxtls 2026-03-04 16:25:28 -05:00
parent 893a320f6f
commit ea69ae93b8
5 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
steps-guix/helpers.sh
View file

@ -181,7 +181,7 @@ build() {
pkg=$1 pkg=$1
get_revision "${pkg}" get_revision "${pkg}"
script_name=${2:-pass$((revision+1)).sh} script_name=${2:-pass$((revision+1)).sh}
dirname=${3:-${pkg}} build_dir=${3:-${pkg}}
# shellcheck disable=SC2015 # shellcheck disable=SC2015
bin_preseed && return || true # Normal build if preseed fails bin_preseed && return || true # Normal build if preseed fails
@ -206,6 +206,9 @@ build() {
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "${build_script}" . "${build_script}"
fi fi
if [ -n "${BUILD_DIRNAME+x}" ]; then
build_dir="${BUILD_DIRNAME}"
fi
echo "${pkg}: getting sources." echo "${pkg}: getting sources."
build_stage=src_get build_stage=src_get
@ -216,7 +219,7 @@ build() {
call $build_stage call $build_stage
unset EXTRA_DISTFILES 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." echo "${pkg}: preparing source."
build_stage=src_prepare build_stage=src_prepare

1
steps-guix/mes-minimal-stripped-0.19-i686-linux/pass1.sh
View file

@ -4,6 +4,7 @@ src_get() { :; }
src_unpack() { :; } src_unpack() { :; }
src_prepare() { :; } src_prepare() { :; }
src_configure() { :; } src_configure() { :; }
BUILD_DIRNAME=.
src_compile() { src_compile() {
local stage local stage

1
steps-guix/mescc-tools-static-stripped-0.5.2-i686-linux/pass1.sh
View file

@ -4,6 +4,7 @@ src_get() { :; }
src_unpack() { :; } src_unpack() { :; }
src_prepare() { :; } src_prepare() { :; }
src_configure() { :; } src_configure() { :; }
BUILD_DIRNAME=.
src_compile() { src_compile() {
local stage copied local stage copied

1
steps-guix/static-binaries-0-i686-linux/pass1.sh
View file

@ -4,6 +4,7 @@ src_get() { :; }
src_unpack() { :; } src_unpack() { :; }
src_prepare() { :; } src_prepare() { :; }
src_configure() { :; } src_configure() { :; }
BUILD_DIRNAME=.
src_compile() { src_compile() {
local stage dist local stage dist

7
steps/helpers.sh
View file

@ -181,7 +181,7 @@ build() {
pkg=$1 pkg=$1
get_revision "${pkg}" get_revision "${pkg}"
script_name=${2:-pass$((revision+1)).sh} script_name=${2:-pass$((revision+1)).sh}
dirname=${3:-${pkg}} build_dir=${3:-${pkg}}
# shellcheck disable=SC2015 # shellcheck disable=SC2015
bin_preseed && return || true # Normal build if preseed fails bin_preseed && return || true # Normal build if preseed fails
@ -206,6 +206,9 @@ build() {
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "${build_script}" . "${build_script}"
fi fi
if [ -n "${BUILD_DIRNAME+x}" ]; then
build_dir="${BUILD_DIRNAME}"
fi
echo "${pkg}: getting sources." echo "${pkg}: getting sources."
build_stage=src_get build_stage=src_get
@ -216,7 +219,7 @@ build() {
call $build_stage call $build_stage
unset EXTRA_DISTFILES 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." echo "${pkg}: preparing source."
build_stage=src_prepare build_stage=src_prepare