Skip to content

doxygen2man: Add option to read copyright line from the header file#415

Merged
chrissie-c merged 2 commits intoClusterLabs:masterfrom
chrissie-c:reproducible-copyright
Sep 9, 2020
Merged

doxygen2man: Add option to read copyright line from the header file#415
chrissie-c merged 2 commits intoClusterLabs:masterfrom
chrissie-c:reproducible-copyright

Conversation

@chrissie-c
Copy link
Copy Markdown
Contributor

This should help make builds reproducible.

I tried various methods of getting the date, using 'git' is no use as
it could be run from a tarball, using the file date doesn't work either
so this seems a reasonable compromise.

@bmwiedemann
Copy link
Copy Markdown

This change fixed the copyright and then I noticed another embedded date issue:

@@ -1,5 +1,5 @@
 .\"  Automatically generated man page, do not edit
-.TH QBUTIL.H 3 2020-09-07 "LIBQB" "libqb Programmer's Manual"
+.TH QBUTIL.H 3 2035-10-11 "LIBQB" "libqb Programmer's Manual"
 .SH NAME

@fabbione
Copy link
Copy Markdown
Member

fabbione commented Sep 8, 2020

I like the approach, but then please use update-copyright.sh to update all files in the git tree.

@fabbione
Copy link
Copy Markdown
Member

fabbione commented Sep 8, 2020

Also, I assume that we will need to change knet to use this new feature as well?

This should help make builds reproducible.

I tried various methods of getting the date, using 'git' is no use as
it could be run from a tarball, using the file date doesn't work either
so this seems a reasonable compromise.
@chrissie-c chrissie-c force-pushed the reproducible-copyright branch from 1b8aed9 to 46336fb Compare September 9, 2020 07:14
@chrissie-c
Copy link
Copy Markdown
Contributor Author

@bmwiedemann good point. I'll look into that today. Thanks.

@bmwiedemann
Copy link
Copy Markdown

One option is to use $SOURCE_DATE_EPOCH - there are code snippets available, too.

@chrissie-c
Copy link
Copy Markdown
Contributor Author

@bmwiedemann OK this addition patch seems to work for me, any chance you could test it on your system please?

If it works for you, do you need a new release or are the patches enough for the moment?

@bmwiedemann
Copy link
Copy Markdown

commit 4ea13bb made it reproducible in our openSUSE environment where we have $SOURCE_DATE_EPOCH set, but the git codepath looked a bit wrong to me with %at instead of %ct and with the extra $Format: in there.

@bmwiedemann
Copy link
Copy Markdown

do you need a new release or are the patches enough for the moment

patches are enough as reproducible-builds is a long-term project and I expect there will be a new release in the next months.

@chrissie-c
Copy link
Copy Markdown
Contributor Author

chrissie-c commented Sep 9, 2020

I just copied the code from knet ;-)
But %ct makes sense

Also add build-aux/update-copyright.sh to keep header file
copyright lines up-to-date.

All code taken from knet
@chrissie-c chrissie-c force-pushed the reproducible-copyright branch from 4ea13bb to e5db66f Compare September 9, 2020 12:14
@chrissie-c chrissie-c merged commit 6d35611 into ClusterLabs:master Sep 9, 2020
@chrissie-c chrissie-c deleted the reproducible-copyright branch September 9, 2020 14:07
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