From fb07a03316a64074a82efa55eb64961c46549798 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 8 Jul 2024 22:55:18 -0700 Subject: [PATCH] fix: submarine git pull (#1451) (#1458) * fix: submarine git pull * fix: create empty directory * oops, we only popd once (cherry picked from commit 6e2287f09893fa1242b8930171ec7aad36b08450) Co-authored-by: Cappy Ishihara --- anda/system/submarine/submarine.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/anda/system/submarine/submarine.spec b/anda/system/submarine/submarine.spec index 2fb9f6b561..f6efb37fee 100644 --- a/anda/system/submarine/submarine.spec +++ b/anda/system/submarine/submarine.spec @@ -24,17 +24,21 @@ Submarine provides a minimal Linux environmemt that lives in a small partition (or a different system if you're brave.) %prep -git clone --recurse-submodules --shallow-submodules -b v%version %url . +git clone --recurse-submodules --shallow-submodules -b v%version %url %{name}-build -pushd u-root +pushd %{name}-build/u-root go install popd + %build +pushd %{name}-build export PATH=$PATH:$HOME/go/bin %make_build %arch +popd %install +pushd %{name}-build mkdir -p %buildroot/boot %buildroot%_datadir/submarine install -Dm644 build/submarine-*.kpart %buildroot%_datadir/submarine/ # Symlink the installed kpart to just submarine.kpart @@ -44,6 +48,8 @@ popd install -Dm644 build/submarine-*.bin %buildroot%_datadir/submarine/ +popd + %files %_datadir/submarine/submarine-*.kpart %_datadir/submarine/submarine.kpart