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.

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

Standalone repo #3

Merged
merged 6 commits into from
Mar 28, 2018
Merged

Standalone repo #3

merged 6 commits into from
Mar 28, 2018

Conversation

jpeeler
Copy link

@jpeeler jpeeler commented Mar 27, 2018

This pulls in the origin tooling to allow building service-catalog (and svcat) RPMs within this repo, along with the service-catalog image too.

Specifically, in the openshift/release repo using tools/hack/golang/update <path to catalog git checkout> service-catalog

Only modifications made from the vanilla configuration was OS_GO_PACKAGE
and OS_CROSS_COMPILE_TARGETS in hack/lib/constants.sh.
TODO items removed/changed. Also call hack scripts directly instead of using
makefile targets.
@deads2k
Copy link

deads2k commented Mar 27, 2018

woohoo!

%if 0%{do_build}
%if 0%{make_redistributable}
# Create Binaries for all internally defined arches
%{os_git_vars} hack/build-cross.sh

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please always use make build-cross

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't pull in the Makefile from origin. Are you sure this isn't workable?

Copy link

@pmorie pmorie Mar 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smarterclayton @jpeeler

I don't think we should block on getting the build just-so in this PR, since, as I understand it, creation of the distgit repo is gated on having an RPM spec.

Is it cool if we whittle on the Makefile in a follow-up and just get the gears moving on the distgit repo for now?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The makefile is automatically injected by the sync tool. You used the sync tool right?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently it doesn't overwrite an already existing Makefile, so I didn't notice the tool generated one. But yes, I did use the tool.

@smarterclayton
Copy link

You shouldn’t have to build the source images, they can be pulled from the hub.

@jpeeler
Copy link
Author

jpeeler commented Mar 28, 2018

Merging so that internal repo creation can proceed.

@jpeeler jpeeler merged commit 717aa26 into openshift:master Mar 28, 2018
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