Skip to content

Makefile: Add .install.esc and make it part of install.tools#540

Merged
vbatts merged 2 commits into
opencontainers:masterfrom
wking:install-esc
Mar 9, 2017
Merged

Makefile: Add .install.esc and make it part of install.tools#540
vbatts merged 2 commits into
opencontainers:masterfrom
wking:install-esc

Conversation

@wking

@wking wking commented Jan 28, 2017

Copy link
Copy Markdown
Contributor

So we can make schema/fs.go in Travis.

This pulls a commit out of #530, but we'll want this whether we take the #530 approach or @vbatts approach from #533. Missing this commit doesn't cause an error in the #533 tests at the moment, because the current tip is not actually rebuilting fs.go.

@stevvooe

stevvooe commented Mar 7, 2017

Copy link
Copy Markdown
Contributor

@vbatts Does this look right?

@vbatts

vbatts commented Mar 8, 2017

Copy link
Copy Markdown
Member

lgtm, but rebase

Approved with PullApprove

@wking

wking commented Mar 8, 2017 via email

Copy link
Copy Markdown
Contributor Author

@stevvooe

stevvooe commented Mar 8, 2017

Copy link
Copy Markdown
Contributor

Need to rebase after fixing master build.

@wking wking closed this Mar 8, 2017
@wking wking reopened this Mar 8, 2017
@wking

wking commented Mar 8, 2017

Copy link
Copy Markdown
Contributor Author

Rebased again with b74e7b33d1e872.

@jonboulle

jonboulle commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

👍

Approved with PullApprove

@vbatts

vbatts commented Mar 9, 2017

Copy link
Copy Markdown
Member

damn. another rebase needed

@jonboulle

Copy link
Copy Markdown
Contributor

🎶 keep on rebasin' 🎶

wking added 2 commits March 9, 2017 09:53
So we can 'make schema-fs' in Travis.

Signed-off-by: W. Trevor King <wking@tremily.us>
Also consolidate the install.tools entry in the .PHONY block at the
end of the Makefile.  The $(var:pattern=replacement) syntax is
documented in [1].

[1]: https://www.gnu.org/software/make/manual/html_node/Text-Functions.html#index-patsubst-1

Signed-off-by: W. Trevor King <wking@tremily.us>
@wking

wking commented Mar 9, 2017 via email

Copy link
Copy Markdown
Contributor Author

@jonboulle

jonboulle commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

👍

Approved with PullApprove

@vbatts

vbatts commented Mar 9, 2017

Copy link
Copy Markdown
Member

LGTM

Approved with PullApprove

@vbatts vbatts merged commit 4903ba5 into opencontainers:master Mar 9, 2017
@wking wking deleted the install-esc branch March 17, 2017 22:12
@vbatts vbatts mentioned this pull request May 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants