Merge pull request #9 from FyraLabs/fix-u-root-v0.14.0

Fix building on u-root v0.14.0
FyraLabs · May 10, 2024 · 04e2047 · 04e2047
2 parents e9c1dd6 + 66e4244
commit 04e2047
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ $(INITFSZ_X64): $(INITFS_X64)
 
 $(INITFS_X64):
 	mkdir -p build
-	GBB_PATH=u-root u-root -o $(WORKDIR)/$(INITFS_X64) -uinitcmd="elvish -c 'sleep 3; boot'" core ./cmds/boot/boot
+	pushd u-root && GBB_PATH=u-root GOOS=linux GOARCH=amd64 u-root -o ../$(WORKDIR)/$(INITFS_X64) -uinitcmd="elvish -c 'sleep 3; boot'" core cmds/boot/boot; popd
 
 
 # Use 'make arm64' to build ARM64 (cross-compiling is supported).
@@ -94,7 +94,7 @@ $(INITFSZ_A64): $(INITFS_A64)
 
 $(INITFS_A64):
 	mkdir -p build images
-	GBB_PATH=u-root GOOS=linux GOARCH=arm64 u-root -o $(WORKDIR)/$(INITFS_A64) -uinitcmd="elvish -c 'sleep 3; boot'" core ./cmds/boot/boot
+	pushd u-root && GBB_PATH=u-root GOOS=linux GOARCH=arm64 u-root -o ../$(WORKDIR)/$(INITFS_A64) -uinitcmd="elvish -c 'sleep 3; boot'" core cmds/boot/boot; popd
 
 clean:
 	rm -rf $(WORKDIR)
diff --git a/u-root b/u-root