Merge branch 'fix_u-root_build' of https://github.com/vejmarie/heads

This commit is contained in:
Trammell hudson 2018-04-30 15:51:37 -04:00
commit cbbcbcdf1b
Failed to extract signature

View File

@ -11,11 +11,10 @@ UROOT_CMDS ?=
export GOPATH=$(build)/go
u-root_src_cmds := $(foreach cmd,$(UROOT_CMDS),github.com/u-root/u-root/cmds/$(cmd))
$(GOPATH):
$(call do,GO GET,$(u-root_url),\
go get $(u-root_url) \
)
u-root_build := $(GOPATH)/bin/u-root
$(GOPATH)/bin/u-root:
go get github.com/u-root/u-root/...
#
# If the board directory has its own go commands, copy them
# into the u-root tree so that they will be bundled into the go initrd
@ -24,11 +23,11 @@ $(GOPATH):
#
ifeq "y" "$(shell [ -r 'boards/$(BOARD)/uinit.go' ] && echo y)"
u-root_uinit := $(GOPATH)/src/github.com/u-root/u-root/cmds/uinit/uinit.go
$(u-root_uinit): boards/$(BOARD)/uinit.go
$(call install,$<,$@)
$(u-root_uinit): $(u-root_build) boards/$(BOARD)/uinit.go
$(call install,boards/$(BOARD)/uinit.go,$@)
endif
$(u-root_output): $(GOPATH) $(u-root_uinit)
$(u-root_output): $(u-root_build) $(u-root_uinit)
$(call do,U-ROOT,$@,\
$(GOPATH)/bin/u-root \
-build=bb \