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

Fixes #6764 - removed extra/ directory #288

Merged
merged 2 commits into from Jan 21, 2015

Conversation

lzap
Copy link
Member

@lzap lzap commented Jul 24, 2014

@domcleal
Copy link
Contributor

domcleal commented Aug 7, 2014

Is there anything else from extra/ that's needed? I see some custom facts etc, should they be provided as docs instead?

You'll probably want to remove the %changelog entry, then use tito tag --keep-version to do it so it's not duplicated.

@GregSutcliffe
Copy link
Member

Disk_facts was something I wrote with the intention of one day including it in the base image, and should probably be ported to the ovirt image now. The discovery_init stuff is also specific to the now-deprecated TCL image, since the ovirt image uses packages & systemd to start the proxy.

In short, there's useful historical stuff in there that we probably want to recode, but I don't think it matters if it's removed from the package. It also means we can drop ftools and open4 from the gemspec (and I'm nearly done dropping deface too :P)

@lzap
Copy link
Member Author

lzap commented Aug 11, 2014

Done, pushed including zillions of other tags:

[lzap@lzapx rubygem-foreman_discovery]$ g push --tags
Counting objects: 130, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (92/92), done.
Writing objects: 100% (100/100), 16.74 KiB | 0 bytes/s, done.
Total 100 (delta 41), reused 10 (delta 3)
To git@github.com:lzap/foreman-packaging.git
 * [new tag]         rubygem-apipie-bindings-0.0.8-4 -> rubygem-apipie-bindings-0.0.8-4
 * [new tag]         rubygem-apipie-rails-0.2.2-1 -> rubygem-apipie-rails-0.2.2-1
 * [new tag]         rubygem-apipie-rails-0.2.3-1 -> rubygem-apipie-rails-0.2.3-1
 * [new tag]         rubygem-deep_cloneable-2.0.0-1 -> rubygem-deep_cloneable-2.0.0-1
 * [new tag]         rubygem-deep_cloneable-2.0.0-2 -> rubygem-deep_cloneable-2.0.0-2
 * [new tag]         rubygem-deep_cloneable-2.0.0-4 -> rubygem-deep_cloneable-2.0.0-4
 * [new tag]         rubygem-excon-0.38.0-1 -> rubygem-excon-0.38.0-1
 * [new tag]         rubygem-fog-1.23.0-1 -> rubygem-fog-1.23.0-1
 * [new tag]         rubygem-fog-core-1.23.0-1 -> rubygem-fog-core-1.23.0-1
 * [new tag]         rubygem-fog-softlayer-0.3.9-1 -> rubygem-fog-softlayer-0.3.9-1
 * [new tag]         rubygem-foreman_bootdisk-3.0.0-1 -> rubygem-foreman_bootdisk-3.0.0-1
 * [new tag]         rubygem-foreman_bootdisk-3.1.0-1 -> rubygem-foreman_bootdisk-3.1.0-1
 * [new tag]         rubygem-foreman_bootdisk-3.1.0-2 -> rubygem-foreman_bootdisk-3.1.0-2
 * [new tag]         rubygem-foreman_dhcp_browser-0.0.5-1 -> rubygem-foreman_dhcp_browser-0.0.5-1
 * [new tag]         rubygem-foreman_discovery-1.3.0-2 -> rubygem-foreman_discovery-1.3.0-2
 * [new tag]         rubygem-foreman_xen-0.0.2-1 -> rubygem-foreman_xen-0.0.2-1
 * [new tag]         rubygem-foreman_xen-0.0.3-1 -> rubygem-foreman_xen-0.0.3-1
 * [new tag]         rubygem-gridster-rails-0.1.5-4 -> rubygem-gridster-rails-0.1.5-4
 * [new tag]         rubygem-ipaddress-0.8.0-6 -> rubygem-ipaddress-0.8.0-6
 * [new tag]         rubygem-ldap_fluff-0.3.0-1 -> rubygem-ldap_fluff-0.3.0-1
 * [new tag]         rubygem-ovirt_provision_plugin-0.0.1-1 -> rubygem-ovirt_provision_plugin-0.0.1-1
 * [new tag]         rubygem-puppetdb_foreman-0.0.6-1 -> rubygem-puppetdb_foreman-0.0.6-1
 * [new tag]         rubygem-puppetdb_foreman-0.0.7-1 -> rubygem-puppetdb_foreman-0.0.7-1
 * [new tag]         rubygem-rbovirt-0.0.27-1 -> rubygem-rbovirt-0.0.27-1
 * [new tag]         rubygem-rbovirt-0.0.28-1 -> rubygem-rbovirt-0.0.28-1
 * [new tag]         rubygem-rbovirt-0.0.29-1 -> rubygem-rbovirt-0.0.29-1
 * [new tag]         rubygem-safemode-1.2.1-1 -> rubygem-safemode-1.2.1-1
 * [new tag]         rubygem-smart_proxy_pulp-1.0.0-1 -> rubygem-smart_proxy_pulp-1.0.0-1
 * [new tag]         rubygem-smart_proxy_pulp-1.0.0-2 -> rubygem-smart_proxy_pulp-1.0.0-2
 * [new tag]         rubygem-smart_proxy_pulp-1.0.1-1 -> rubygem-smart_proxy_pulp-1.0.1-1
 * [new tag]         rubygem-staypuft-0.1.20-1 -> rubygem-staypuft-0.1.20-1
 * [new tag]         rubygem-validates_lengths_from_database-0.2.0-1 -> rubygem-validates_lengths_from_database-0.2.0-1

I will go ahead and remove the two guys from composes.

@lzap
Copy link
Member Author

lzap commented Aug 11, 2014

Pushed the removal.

@domcleal
Copy link
Contributor

In that case, also remove the packages from this repo please.

@domcleal
Copy link
Contributor

Actually, no... you can't remove these dependencies until foreman_discovery's gem no longer depends on them, otherwise it'll fail to start up.

@GregSutcliffe
Copy link
Member

Yeah, we need to remove the requires, add_dependencys and update the rake task to not have the build task.

@GregSutcliffe
Copy link
Member

Ok, the other PRs are merged, but needs a rebase. @lzap, care to do so? :)

Also, dropping this from the deb side would be a nice PR too, although I can do it if you're super busy.

@domcleal
Copy link
Contributor

domcleal commented Jan 6, 2015

open4/ftools are still dependencies of foreman_discovery 1.4.1, see #288 (comment), so it'll probably cause runtime errors.

@lzap
Copy link
Member Author

lzap commented Jan 7, 2015

Right, we removed it from develop branch only. Let's merge this after we release our first RC next week. Thanks. https://rubygems.org/gems/foreman_discovery

@lzap
Copy link
Member Author

lzap commented Jan 20, 2015

I have added a commit with 2.0.0.rc1 update.

Requires: squashfs-tools
Requires: sudo
Requires: foreman >= 1.7.0
Requires: %{?scl_prefix}rubygem(deface)
Copy link
Contributor

Choose a reason for hiding this comment

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

< 1.0

@lzap
Copy link
Member Author

lzap commented Jan 21, 2015

Thanks for the quick review, updated.

@domcleal
Copy link
Contributor

Is this to be released into nightly repos only, or 1.7 too?

@domcleal
Copy link
Contributor

Oh, and lastly, could you delete ftools/open4 directories and from rel-eng/tito.props?

@lzap
Copy link
Member Author

lzap commented Jan 21, 2015

Delete ftools as well? Yes both 1.7 and nightly.

@domcleal
Copy link
Contributor

I can't see any other use of the gems - if you're removing from comps, we should remove the source dirs.

@lzap
Copy link
Member Author

lzap commented Jan 21, 2015

Removed ftools as well. Pushed.

@domcleal
Copy link
Contributor

The directories are still there?

Requires: advancecomp
Requires: squashfs-tools
Requires: sudo
Requires: foreman >= 1.7.0
Copy link
Contributor

Choose a reason for hiding this comment

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

1.6.0, according to engine.rb

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a bug, we require 1.7+. Filed a PR for RC2: theforeman/foreman_discovery#128

@lzap
Copy link
Member Author

lzap commented Jan 21, 2015

Squashed the removal of the dirs into the first commit.

domcleal added a commit that referenced this pull request Jan 21, 2015
Fixes #6764 - removed extra/ directory
@domcleal domcleal merged commit 456dd85 into theforeman:rpm/develop Jan 21, 2015
@domcleal
Copy link
Contributor

Thanks @lzap, building for nightly and 1.7.

@lzap lzap deleted the remove-tcl-6764 branch January 21, 2015 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants