Skip to content

Commit 11d894b

Browse files
authored
Merge pull request #6 from johnnylinwiwynn/uroot-source
Update u-root build support with 'uroot-source'
2 parents 49b85ed + 9cac683 commit 11d894b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ $(INITRAMFS_OUT): $(INITRAMFS_DEPS_FLAG) $(INITRAMFS_PATCH_FLAG)
250250
GOCACHE=$(INITRAMFS_BUILD_DIR)/go/.cache \
251251
GOPATH=$(INITRAMFS_BUILD_DIR)/gopath:$(UROOT_ADDITIONAL_GOPATH) \
252252
$(INITRAMFS_BUILD_DIR)/go/bin/go run github.com/u-root/u-root \
253-
-build=bb -o $@ -uinitcmd=$(UINIT_CMD) \
253+
-build=bb -uroot-source $(INITRAMFS_BUILD_DIR)/gopath/src/github.com/u-root/u-root -o $@ -uinitcmd=$(UINIT_CMD) \
254254
$(addprefix -files=,$(BASE_FILES) $(UROOT_ADDITIONAL_FILES)) \
255255
$(UROOT_ADDITIONAL_CMDS) \
256256
$(UROOT_BASE_CMDS) \

examples/qemu/configs/config-qemu-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"untar": [
44
{
55
"label": "go",
6-
"url": "https://golang.org/dl/go1.16.6.linux-amd64.tar.gz",
7-
"hash": "sha256:be333ef18b3016e9d7cb7b1ff1fdb0cac800ca0be4cf2290fe613b3d069dfe0d"
6+
"url": "https://golang.org/dl/go1.17.6.linux-amd64.tar.gz",
7+
"hash": "sha256:231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2"
88
}
99
],
1010
"goget": [
1111
{
1212
"label": "uroot",
1313
"pkg": "https://github.com/u-root/u-root",
1414
"branch": "master",
15-
"hash": "ba3c4503673291183f54568dc0c0d0d7411302cd"
15+
"hash": "8278674a41e9ca22d9f3fff33d7eb8439acb4bf9"
1616
}
1717
]
1818
},

0 commit comments

Comments
 (0)