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

specfile: Add support for EL8 #3346

Merged
merged 2 commits into from Mar 14, 2020
Merged

specfile: Add support for EL8 #3346

merged 2 commits into from Mar 14, 2020

Conversation

faxm0dem
Copy link
Contributor

@faxm0dem faxm0dem commented Nov 20, 2019 •
edited

List of changes:

  • ganglia-devel is not available in el8 yet
  • gpsd-devel is not available in el8 yet
  • libmodbus-devel is not available in el8 yet
  • liboping-devel is not available in el8 yet
  • mosquitto-devel is not available in el8 yet
  • fix python dep in el8
  • disable liblvm
  • dependency problem while configuring smart
  • add check_uptime
  • simplify python rhel version logic and force python3 for rhel8

Changelog: update specfile for EL8

Change-Id: I55323d7d8723a3030219a463314ec44c32d8df60

@faxm0dem faxm0dem force-pushed the f/specfile branch 2 times, most recently from 859abe3 to 4955a67 Compare November 21, 2019 08:03
@mkobyli
Copy link
Contributor

mkobyli commented Nov 22, 2019

Could you add ChangeLog line to your PR?

mrunge
mrunge requested changes Dec 9, 2019
View reviewed changes
Copy link
Member

@mrunge mrunge left a comment

Choose a reason for hiding this comment

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

python2 and python3 for centos/rhel8 needs fixing.
You'll probably also want to move to 5.10.0?

contrib/redhat/collectd.spec Outdated Show resolved Hide resolved
@faxm0dem
Copy link
Contributor Author

faxm0dem commented Jan 7, 2020

so python2 is available in centos8 appstream.
what should we do?

@mrunge
Copy link
Member

mrunge commented Feb 5, 2020

since python2 is dead (more or less), please try to move to python3.

@dago dago added this to the 5.11.0 milestone Feb 29, 2020
@dago
Copy link
Contributor

dago commented Feb 29, 2020

@faxm0dem Would you mind applying the discussed change? I would really like to include this PR in the upcoming 5.11 release.

@dago dago added the Waiting for response - 1st time Waiting for contributor to respond - 1st call label Feb 29, 2020
@dago dago modified the milestones: 5.11.0, 5.12.0 Mar 2, 2020
@faxm0dem
Copy link
Contributor Author

faxm0dem commented Mar 2, 2020

Sorry this takes so long. I'll do that tomorrow

@faxm0dem
Copy link
Contributor Author

faxm0dem commented Mar 4, 2020

Sorry I got caught up into $LIFE I'll have another try on Thursday

@dago
Copy link
Contributor

dago commented Mar 5, 2020

@mrunge Would you mind acknowledging the requested changes so I can merge them?

@faxm0dem faxm0dem force-pushed the f/specfile branch 2 times, most recently from 722cc75 to ac6045d Compare March 5, 2020 13:26
@faxm0dem faxm0dem changed the base branch from master to collectd-5.10 March 5, 2020 13:28
@faxm0dem
Copy link
Contributor Author

faxm0dem commented Mar 5, 2020

I rebased to 5.10.0 because 1c57925 isn't in master. Any reason for this ?

@dago
Copy link
Contributor

dago commented Mar 5, 2020

Not that I know of, would you mind cherrypicking this one into master?

@faxm0dem
Copy link
Contributor Author

faxm0dem commented Mar 5, 2020

thing is, I don't have write access

@dago
Copy link
Contributor

dago commented Mar 5, 2020

But you can create a PR from the commit to master which I can then merge 😄

@faxm0dem
Copy link
Contributor Author

anything blocking this?

mrunge
mrunge approved these changes Mar 12, 2020
View reviewed changes
Copy link
Member

@mrunge mrunge left a comment

Choose a reason for hiding this comment

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

Thank you, looks good to me

@mrunge
Copy link
Member

mrunge commented Mar 12, 2020 •
edited

Okay, three things are missing: a changelog line, @dago asked to apply this to master first, and travis CI is not reporting back.

mrunge
mrunge requested changes Mar 12, 2020
View reviewed changes
Copy link
Member

@mrunge mrunge left a comment

Choose a reason for hiding this comment

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

could you please add a changelog entry?

mrunge
mrunge reviewed Mar 12, 2020
View reviewed changes
Copy link
Member

@mrunge mrunge left a comment •
edited

Choose a reason for hiding this comment

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

Since this is proposed for master branch, I was suspecting you'd update the spec file to 5.10.0 (latest released version)? Then a changelog entry would be good.

contrib/redhat/collectd.spec Outdated Show resolved Hide resolved
contrib/redhat/collectd.spec Show resolved Hide resolved
@faxm0dem faxm0dem force-pushed the f/specfile branch 10 times, most recently from 891d571 to 16169b5 Compare March 13, 2020 11:15
@dago dago removed the Waiting for response - 1st time Waiting for contributor to respond - 1st call label Mar 13, 2020
@mrunge
Copy link
Member

mrunge commented Mar 13, 2020

Could you please stop force-pushing changes? That makes it really hard to follow the changes.

You have dpdk_telemetry here, which is a 5.11 feature. At the same time, I requested to update at least top 5.10...

I still consider this as WIP, since there are still todos in the spec file, such as adding subpackages for buddyinfo etc.

@faxm0dem faxm0dem force-pushed the f/specfile branch 3 times, most recently from 7143631 to 0d0dad6 Compare March 13, 2020 12:35
@faxm0dem
Copy link
Contributor Author

sorry, but I'm requested to change things back and forth here (change target branch to 5.10 and back to master) etc. so I'm a bit lost.

I'm now working to make this ok on master, so that's where I'll merge it.
I can make another PR against 5.10 if you like

@faxm0dem faxm0dem changed the title specfile: Add support for EL8 WIP: specfile: Add support for EL8 Mar 13, 2020
@faxm0dem
Copy link
Contributor Author

also, there is no 5.10.0 tag so it's hard to know what actually is in 5.10.0

@faxm0dem
Copy link
Contributor Author

so this now builds correctly on el6,7 and 8

specfile: Add support for EL8
a948533 
List of changes:

* ganglia-devel is not available in el8 yet
* gpsd-devel is not available in el8 yet
* libmodbus-devel is not available in el8 yet
* liboping-devel is not available in el8 yet
* mosquitto-devel is not available in el8 yet
* fix python dep in el8
* disable liblvm
* dependency problem while configuring smart
* add check_uptime
* simplify python rhel version logic and force python3 for rhel8
* remove support for EL<6
* disable redfish
* disable slurm
* disable intel dcpmm
* disable capabilities
* disable dpdk_telemetry
* disable ipstats
* disable varnish for el6
* disable smart for el6 and el8

TODO:

* buddyinfo
* logparser
* ubi
* write_influxdb_udp.so

Change-Id: I0bc5a723e3682e4f60e6c09670f286d20df507d5
Changelog: update specfile for EL8

Change-Id: Ic8ee01c69128f7bc4ec90a1d16a67b016a342b11

Change-Id: I80865415f1b056042f5b0d0c0c661c2e500a115d
@faxm0dem faxm0dem changed the title WIP: specfile: Add support for EL8 specfile: Add support for EL8 Mar 13, 2020
@rubenk
Copy link
Contributor

rubenk commented Mar 13, 2020

@mrunge this seems good to merge?

mrunge
mrunge approved these changes Mar 14, 2020
View reviewed changes
Copy link
Member

@mrunge mrunge left a comment

Choose a reason for hiding this comment

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

alright, let's merge this. There is still the list of plugins in todo lines 2579ff, but that can go in next step

@mrunge mrunge merged commit ca868dd into collectd:master Mar 14, 2020
@faxm0dem
Copy link
Contributor Author

thanks, and sorry for the noise

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rubenk rubenk rubenk left review comments

@mrunge mrunge mrunge approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.12
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@faxm0dem @mkobyli @mrunge @dago @rubenk