From eb2a4941108d4400d1787190fe814d4e30d44f12 Mon Sep 17 00:00:00 2001 From: lleyton Date: Mon, 5 Feb 2024 23:57:55 -0800 Subject: [PATCH] fix: move submarine kpart away from /boot (#911) * fix: move submarine kpart away from /boot * fix: updare submarine version --- anda/system/submarine/submarine.spec | 10 ++++++---- anda/system/submarine/update.rhai | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/anda/system/submarine/submarine.spec b/anda/system/submarine/submarine.spec index 757676250f..04dbe49b52 100644 --- a/anda/system/submarine/submarine.spec +++ b/anda/system/submarine/submarine.spec @@ -5,12 +5,12 @@ %endif Name: submarine -Version: 0.1.0 +Version: 0.2.0 Release: 1%?dist Summary: Experimental bootloader for ChomeOS's depthcharge License: GPL-3.0 URL: https://github.com/FyraLabs/submarine -BuildRequires: make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git golang-github-u-root +BuildRequires: make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools %description An experimental bootloader for ChomeOS's depthcharge. @@ -20,16 +20,18 @@ Submarine provides a minimal Linux environmemt that lives in a small partition (or a different system if you're brave.) %prep +go install github.com/u-root/u-root@v0.11.0 git clone --recurse-submodules --shallow-submodules -b v%version %url . %build +export PATH=$PATH:$HOME/go/bin %make_build %arch %install mkdir -p %buildroot/boot %buildroot%_datadir/submarine -install -Dm644 build/submarine-*.kpart %buildroot/boot/ +install -Dm644 build/submarine-*.kpart %buildroot%_datadir/submarine/ install -Dm644 build/submarine-*.bin %buildroot%_datadir/submarine/ %files -/boot/submarine-*.kpart +%_datadir/submarine/submarine-*.kpart %_datadir/submarine/submarine-*.bin diff --git a/anda/system/submarine/update.rhai b/anda/system/submarine/update.rhai index c2b5877a08..4af010c1b9 100644 --- a/anda/system/submarine/update.rhai +++ b/anda/system/submarine/update.rhai @@ -1 +1 @@ -rpm.version(gh("FyraLabs/submarine")); +rpm.version(gh_tag("FyraLabs/submarine"));