diff options
| author | salmonik <salmonik@tuta.io> | 2026-08-01 21:42:30 +0200 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-08-01 21:42:30 +0200 |
| commit | 3d3b8720f748467a5028d0369f9c33cb03f5fd64 (patch) | |
| tree | 945d56565e4cec95d38496557f32ffe2196edb07 | |
| parent | rsnix v0.5.1: force the GUI canvas to 800x600 via GOP SetMode (diff) | |
| download | rs-dos-3d3b8720f748467a5028d0369f9c33cb03f5fd64.tar.gz rs-dos-3d3b8720f748467a5028d0369f9c33cb03f5fd64.zip | |
rsboot: track latest upstream HEAD (92367a8) instead of pinned ee1c85b
build-bootloader.sh now uses 'git submodule update --init --remote' so
builds fetch and check out the newest rsboot main rather than reverting
to the superproject's gitlink commit. Bump the gitlink to 92367a8
(fix(rsboot): naming).
| m--------- | rsboot | 0 | ||||
| -rwxr-xr-x | scripts/build-bootloader.sh | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rsboot b/rsboot | |||
| Subproject ee1c85bfcba17a120bbc95fb2399485295affb7 | Subproject 92367a8c255632208f06e50633cbbe786fc1011 | ||
diff --git a/scripts/build-bootloader.sh b/scripts/build-bootloader.sh index 9a96cfe..f0f0ce7 100755 --- a/scripts/build-bootloader.sh +++ b/scripts/build-bootloader.sh | |||
| @@ -20,8 +20,11 @@ BOOTLOADER_DIR="$BUILD_DIR/bootloader" | |||
| 20 | 20 | ||
| 21 | echo "=== Building rsboot (UEFI bootloader) ===" | 21 | echo "=== Building rsboot (UEFI bootloader) ===" |
| 22 | 22 | ||
| 23 | # Ensure submodule is checked out | 23 | # Ensure submodule is checked out, tracking the latest upstream HEAD |
| 24 | git submodule update --init "$PROJECT_DIR/rsboot" | 24 | # (--remote fetches and checks out the newest main instead of reverting |
| 25 | # to the commit recorded in the superproject's gitlink). | ||
| 26 | cd "$PROJECT_DIR" | ||
| 27 | git submodule update --init --remote rsboot | ||
| 25 | 28 | ||
| 26 | cd "$PROJECT_DIR/rsboot" | 29 | cd "$PROJECT_DIR/rsboot" |
| 27 | make clean 2>/dev/null || true | 30 | make clean 2>/dev/null || true |