Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Mar 9, 2017
Merged

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

merged 2 commits into from
Mar 9, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented Jan 28, 2017

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
Copy link
Contributor

stevvooe commented Mar 7, 2017

@vbatts Does this look right?

@vbatts
Copy link
Member

vbatts commented Mar 8, 2017 •
edited by caniszczyk
Loading

lgtm, but rebase

Approved with PullApprove

@wking
Copy link
Contributor Author

wking commented Mar 8, 2017 via email

@stevvooe
Copy link
Contributor

stevvooe commented Mar 8, 2017

Need to rebase after fixing master build.

@wking wking closed this Mar 8, 2017
@wking wking reopened this Mar 8, 2017
@wking
Copy link
Contributor Author

wking commented Mar 8, 2017

Rebased again with b74e7b3 → 3d1e872.

@jonboulle
Copy link
Contributor

jonboulle commented Mar 9, 2017 •
edited by caniszczyk
Loading

👍

Approved with PullApprove

@vbatts
Copy link
Member

vbatts commented Mar 9, 2017

damn. another rebase needed

@jonboulle
Copy link
Contributor

🎶 keep on rebasin' 🎶

@wking
Makefile: Add .install.esc and make it part of install.tools
8d7de86 
So we can 'make schema-fs' in Travis.

Signed-off-by: W. Trevor King <wking@tremily.us>
@wking
Makefile: Add .install.* to .PHONY
92f6ce6 
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
Copy link
Contributor Author

wking commented Mar 9, 2017 via email

@jonboulle
Copy link
Contributor

jonboulle commented Mar 9, 2017 •
edited by caniszczyk
Loading

👍

Approved with PullApprove

@vbatts
Copy link
Member

vbatts commented Mar 9, 2017 •
edited by caniszczyk
Loading

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
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wking @stevvooe @vbatts @jonboulle