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

merge in of systemd-crontab-generator #13

Merged
merged 8 commits into from Sep 4, 2014
Merged

merge in of systemd-crontab-generator #13

merged 8 commits into from Sep 4, 2014

Conversation

a-detiste
Copy link
Contributor

Hi,

This is a proposal to merge systemd-crontab-generator (from @kstep ) into systemd-cron
to make it POSIX-compliant and close bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752376 .

The changes to debian/ folder follows in an separate pull request.
systemd-crontab-generator is licensed "CC-BY", this is referenced in debian/copyright

@@ -0,0 +1,32 @@
.TH CRONTAB 1 "2014-06-26" "" systemd-crontab-generator
Copy link
Member

Choose a reason for hiding this comment

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

This should use the same @package@ @version@ convention as systemd.cron.7.in.

@dbent
Copy link
Member

dbent commented Sep 2, 2014

Looks good to me at first glance, although I didn't look too closely at the python sources; I assume they're unchanged from systemd-crontab-generator? Couple of minor things:

  • Left some comments in the man files about the package and version variables
  • Can you update the README to specify the new Python dependency? (If someone complains in the future, the generator functionality may become an optional build flag, but I think Python is so ubiquitous now for that to be a non-issue)
  • Can you update systemd.cron.7 to reflect the new functionality, probably with references to the other man pages for more information? Specifically the LIMITATIONS section should be addressed.
  • I considered upping the version to 2.0.0 but since as an end user previous functionality would be unaffected I think 1.3.0 is the right call.

Also, I think @kstep agreed to relicense to MIT so that would keep the entire package under a single license (with multiple rights holders). @kstep can you assent to that here?

I'll also have to build and install it later to test it out.

@dbent
Copy link
Member

dbent commented Sep 2, 2014

Also, @kstep, I assume this merger means you would continue as maintainer of the generator functionality within systemd-cron and systemd-crontab-generator would be defunct. In that case I can create a neutral GitHub organization to host the repository and add you as an owner.

@a-detiste
Copy link
Contributor Author

Here is an update. I managed to build a debian package.
This will be published in the "debian" branch.

I got rid of the patch that remove cron.boot (I don't know how to update it)
Instead I do a sed on-liner in debian/rules:

override_dh_install:
rm debian/systemd-cron/lib/systemd/system/cron-boot.*
sed -i '/Requires=cron-boot.timer/d' debian/systemd-cron/lib/systemd/system/cron.target
dh_install

I also set up a test repository to do a complete test
deb http://ssh.detiste.be/repos/ jessie main (this is not GPG signed)

@dbent
Copy link
Member

dbent commented Sep 3, 2014

I don't use Debian myself so I'll trust that works, I'll be testing it on Arch which I have a package for.

Also, it shouldn't be necessary to patch/sed to get rid of cron.boot, you should be able to pass --enable-boot=no to the configure script to disable it.

@a-detiste
Copy link
Contributor Author

This Debian patch have been there since an long time (2013/08)
http://anonscm.debian.org/cgit/collab-maint/systemd-cron.git .
Indeed --enable-boot=no is the right way to do it

@kstep
Copy link
Member

kstep commented Sep 3, 2014

@dbent, yes, I have no problems with MIT license. Though I'm in process of rewriting the project in Rust, however I'm quite busy with my fulltime job, so I can't set any hard schedules to do it, neither I can set any schedules to support the project (actually it's the first time I opened github for the last two weeks).

@a-detiste
Copy link
Contributor Author

I've received a bug report for crontab about VISUAL. I updated it in both trees to not let them diverge.
(see other pull request systemd-cron/systemd-cron-next#12 )

@a-detiste
Copy link
Contributor Author

@kstep @dbent I can support i if you like, or continue ad interim sending indentical merge requests to both upstreams

@a-detiste
Copy link
Contributor Author

sending indentical merge requests to both upstreams

sorry, this is a bad idea and won't work...

Here is a example pending fix that would only be relevant in systemd-cron tree;
without this, systemd-crontab-generator won't run with systemd < 212.

/src/bin/systemd-crontab-generator
[Timer]
Unit=%s.service
-Persistent=true
+@Persistent@

@dbent
Copy link
Member

dbent commented Sep 4, 2014

@a-detiste Sounds good to me if you're willing to maintain the generator stuff.

As you can tell I've created a new organization, "systemd-cron", and migrated the repository to it. Thankfully GitHub is smart about these things and automatically redirects all the old URLs. I've also invited @a-detiste and @kstep as owners in the new organization.

@a-detiste is this ready to merge or is there stuff still left to do?

@a-detiste
Copy link
Contributor Author

It is ready to merge. Go 👍

dbent added a commit that referenced this pull request Sep 4, 2014
merge in of systemd-crontab-generator
@dbent dbent merged commit d53dff0 into systemd-cron:master Sep 4, 2014
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.

None yet

3 participants