From 0550b968480cb4806397a7cf758fc414cf7714a4 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 26 Oct 2021 20:10:36 +0200 Subject: [PATCH] WIP boostrap_sdk: introduce a 'stage0' step and use as seed for gentoo stage build process --- bootstrap_sdk | 17 +++++++++++++---- build_library/catalyst.sh | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bootstrap_sdk b/bootstrap_sdk index 36c8ddc0d2..c4a76ecb84 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -190,9 +190,13 @@ build_stage1() { # If we are to use a git ref for either ebuild repo we want to update the stage1 seed SDK if [ -n "${FLAGS_stage1_portage_ref}" -o -n "${FLAGS_stage1_overlay_ref}" ] ; then - sed -i 's/^update_seed: no/update_seed: yes/' "$TEMPDIR/stage1.spec" + sed -i '/update_seed_command/d' "$TEMPDIR/stage1.spec" + sed -i 's/^update_seed:.*/update_seed: yes/' "$TEMPDIR/stage1.spec" echo "update_seed_command: --update --deep --newuse --complete-graph --rebuild-if-new-ver --rebuild-exclude cross-*-cros-linux-gnu/* sys-devel/gcc " \ >>"$TEMPDIR/stage1.spec" + else + sed -i '/update_seed_command/d' "$TEMPDIR/stage1.spec" + sed -i 's/^update_seed:.*/update_seed: no/' "$TEMPDIR/stage1.spec" fi # Finally, build stage 1 @@ -200,9 +204,14 @@ build_stage1() { } if [[ "$STAGES" =~ stage1 ]]; then - build_stage1 - STAGES="${STAGES/stage1/}" - SEED="${TYPE}/stage1-${ARCH}-latest" + STAGE0_TYPE="flatcar-sdk-stage0" + ( + STAGES="stage1" + TYPE="${STAGE0_TYPE}" + catalyst_init stage1 + build_stage1 + ) + SEED="${STAGE0_TYPE}/stage1-${ARCH}-latest" fi catalyst_build diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 5bb6003420..b7a7d46723 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -120,7 +120,8 @@ cat <