From c97146146b7114f507a25ac6a0c882cc857c94a2 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 23 Oct 2013 14:22:05 -0700 Subject: [PATCH] fix(net-misc/tlsdate): use service file from ebuild --- ...-init-0.0.1-r28.ebuild => coreos-init-0.0.1-r29.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-0.0.1.ebuild | 4 ++-- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- .../coreos-overlay/net-misc/tlsdate/files/tlsdate.service | 7 +++++++ .../{tlsdate-0.0.5-r23.ebuild => tlsdate-0.0.5-r24.ebuild} | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r28.ebuild => coreos-init-0.0.1-r29.ebuild} (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/files/tlsdate.service rename sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/{tlsdate-0.0.5-r23.ebuild => tlsdate-0.0.5-r24.ebuild} (91%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r28.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r29.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r28.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r29.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index b845136fe8..6f344bcb5e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -3,9 +3,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="260ee57ebd52eb4b57eeb9d41fd6f712ff6f5e1f" +CROS_WORKON_COMMIT="2a539af7e77135948ce587a7805f5285818c4015" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" +EGIT_REPO_URI="https://github.com/coreos/init" inherit cros-workon systemd @@ -50,5 +51,4 @@ src_install() { systemd_enable_service default.target sshd.socket systemd_enable_service default.target ssh-key-proc-cmdline.service systemd_enable_service default.target docker.service - systemd_enable_service default.target tlsdate.service } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index f667af431a..e625a35a3f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -3,6 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" +EGIT_REPO_URI="https://github.com/coreos/init" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" @@ -48,5 +49,4 @@ src_install() { systemd_enable_service default.target sshd.socket systemd_enable_service default.target ssh-key-proc-cmdline.service systemd_enable_service default.target docker.service - systemd_enable_service default.target tlsdate.service } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/files/tlsdate.service b/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/files/tlsdate.service new file mode 100644 index 0000000000..cfdec2c21a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/files/tlsdate.service @@ -0,0 +1,7 @@ +[Unit] +Description=Update local time over HTTPS + +[Service] +# TODO: use api.core-os.net. Unfortunatly, tlsdate doesn't like it for some reason. +ExecStart=/usr/bin/tlsdated -v +WantedBy=default.target diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r23.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r24.ebuild similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r23.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r24.ebuild index 1cacf542d7..3a657ed396 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r23.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r24.ebuild @@ -45,4 +45,7 @@ src_install() { doins "${FILESDIR}/tlsdated.conf" insinto /etc/dbus-1/system.d doins "${FILESDIR}/org.torproject.tlsdate.conf" + + systemd_dounit "${FILESDIR}/tlsdate.service" + systemd_enable_service default.target tlsdate.service }