Skip to content
This repository has been archived by the owner on Nov 3, 2022. It is now read-only.

utils/collectd: Update to the latest upstream state #40

Closed
wants to merge 2 commits into from

Conversation

SuperQ
Copy link

@SuperQ SuperQ commented Sep 26, 2017

@ja-pa ja-pa self-assigned this Oct 23, 2017
@miska
Copy link
Member

miska commented Oct 24, 2017

Hi,

thank you for your pull request, but unfortunately it doesn't unpack so it doesn't build as well:

Applying ./patches/003-remove-werror.patch using plaintext: 
patching file src/Makefile.am
Hunk #1 FAILED at 7.
1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.am.rej
patching file src/Makefile.in
Hunk #1 FAILED at 1833.
1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej
patching file src/libcollectdclient/Makefile.am
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file src/libcollectdclient/Makefile.am.rej
patching file src/libcollectdclient/Makefile.in
Hunk #1 FAILED at 327.
1 out of 1 hunk FAILED -- saving rejects to file src/libcollectdclient/Makefile.in.rej
can't find file to patch at input line 47
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/src/owniptc/Makefile.am
|+++ b/src/owniptc/Makefile.am
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 58
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/src/owniptc/Makefile.in
|+++ b/src/owniptc/Makefile.in
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
Patch failed!  Please fix ./patches/003-remove-werror.patch!

@SuperQ
Copy link
Author

SuperQ commented Oct 24, 2017

Strange, I'm not sure where this 003-remove-werror.patch error is coming from, but it seems unrelated to my patch. I will rebase this change.

If there are build instructions that I can follow to try to reproduce this error, that would be useful.

@SuperQ SuperQ force-pushed the superq/update_collectd branch 2 times, most recently from 5be2444 to 7a8393a Compare October 24, 2017 09:00
@SuperQ
Copy link
Author

SuperQ commented Oct 24, 2017

Ok, I figured out the problem, I had forgotten to remove the obsolete patches from the update. It should apply/build now.

@ja-pa
Copy link
Contributor

ja-pa commented Oct 24, 2017

It will probably require some additional changes. Right now compilation ends with error

CC libcollectdclient_la-client.lo
client.c: In function 'lcc_response_free':
client.c:248:3: error: 'for' loop initial declarations are only allowed in C99 mode
for (size_t i = 0; i < res->lines_num; i++)
^
client.c:248:3: note: use option -std=c99 or -std=gnu99 to compile your code
client.c: In function 'lcc_open_netsocket':
client.c:469:3: error: 'for' loop initial declarations are only allowed in C99 mode
for (struct addrinfo *ai_ptr = ai_res; ai_ptr != NULL;
^
client.c: In function 'lcc_putval':
client.c:734:3: error: 'for' loop initial declarations are only allowed in C99 mode
for (size_t i = 0; i < vl->values_len; i++) {
^
client.c: In function 'lcc_listval':
client.c:847:3: error: 'for' loop initial declarations are only allowed in C99 mode
for (size_t i = 0; i < res.lines_num; i++) {
^

@markusressel
Copy link

Any update on this? I would love to be able to use a collectd version that isn't years behind.

@SuperQ
Copy link
Author

SuperQ commented Mar 28, 2018

I've rebased and updated the collectd package to the latest upstream package. I still haven't been able to find any documentation on how to setup a Turris build environment, so I have no way to test this.

If someone could point me to documentation, I could build this myself and try and make sure it works before submitting it.

@Cynerd
Copy link
Contributor

Cynerd commented Mar 11, 2019

If someone could point me to documentation, I could build this myself and try and make sure it works before submitting it.

https://doc.turris.cz/doc/en/howto/turris_os_build

@Cynerd
Copy link
Contributor

Cynerd commented Nov 4, 2019

Upstream version of Collectd is used in TOS 4.0+. I am closing this as no longer relevant.

@Cynerd Cynerd closed this Nov 4, 2019
@SuperQ SuperQ deleted the superq/update_collectd branch November 4, 2019 07:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
5 participants