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

build katello-headpin and katello-headpin-all from the same src.rpm as katello #412

Merged
merged 1 commit into from
Aug 1, 2012

Conversation

xsuchy
Copy link
Contributor

@xsuchy xsuchy commented Aug 1, 2012

No description provided.

@ghost ghost assigned jsomara Aug 1, 2012
%{homedir}/lib/navigation
%{homedir}/lib/notifications
%{homedir}/lib/resources
%exclude %{homedir}/lib/resources/candlepin.rb
Copy link
Contributor

Choose a reason for hiding this comment

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

i think you do not want to exclude this file

Copy link
Contributor

Choose a reason for hiding this comment

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

nm, this is provided by another RPM.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just mimicked original spec, where was:

remove glue-specific files

rm -rf app/models/glue/*
rm lib/resources/candlepin.rb
rm lib/resources/pulp.rb
rm lib/resources/foreman.rb

@jsomara
Copy link
Contributor

jsomara commented Aug 1, 2012

i think this is the right approach. this will simplify our build system and we will be able to drop our headpin-build branch

@jsomara
Copy link
Contributor

jsomara commented Aug 1, 2012

ACK!

jsomara added a commit that referenced this pull request Aug 1, 2012
build katello-headpin and katello-headpin-all from the same src.rpm as katello
@jsomara jsomara merged commit edfd30f into Katello:master Aug 1, 2012
%exclude %{homedir}/lib/resources/pulp.rb
%exclude %{homedir}/lib/resources/foreman.rb
%{homedir}/lib/tasks
%{homedir}/lib/util
Copy link
Contributor

Choose a reason for hiding this comment

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

Mirek please make sure this directory (lib/util) is accessible from BOTH katello and headpin. Installer uses it! You want to have this one in the katello-common.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right, this directory is already in katello-common, which is required by katello-headpin. This would result in conflict. I will remove it from katello-headpin.

@lzap
Copy link
Contributor

lzap commented Aug 1, 2012

Nice work guys just make sure ^^^ @xsuchy

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.

3 participants