Patchwork [meta-networking] ntp: fix 60-ntpd.list path

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Nov. 8, 2013, 5:08 a.m.
Message ID <1383887325-8280-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/61315/
State Accepted, archived
Headers show

Comments

rongqing.li@windriver.com - Nov. 8, 2013, 5:08 a.m.
From: Roy Li <rongqing.li@windriver.com>

60-ntpd.list should be installed into the same path as ntp systemd service
file, like Fedora core; Orignal path refers
http://www.freedesktop.org/wiki/Software/systemd/timedated/, but where
systemd_unitdir is assumed as /usr/lib/systemd, not /lib/systemd

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 meta-networking/recipes-support/ntp/ntp.inc |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
Joe MacDonald - Nov. 26, 2013, 5:53 p.m.
Almost forgot about this one.  Also merged earlier today.  Thanks.

-J.

[[oe] [PATCH meta-networking] ntp: fix 60-ntpd.list path] On 13.11.08 (Fri 13:08) rongqing.li@windriver.com wrote:

> From: Roy Li <rongqing.li@windriver.com>
> 
> 60-ntpd.list should be installed into the same path as ntp systemd service
> file, like Fedora core; Orignal path refers
> http://www.freedesktop.org/wiki/Software/systemd/timedated/, but where
> systemd_unitdir is assumed as /usr/lib/systemd, not /lib/systemd
> 
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>  meta-networking/recipes-support/ntp/ntp.inc |    5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
> index 65d90de..9ea24e9 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -67,9 +67,8 @@ do_install_append() {
>      install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
>      install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/
>  
> -    # see http://www.freedesktop.org/wiki/Software/systemd/timedated/
> -    install -d ${D}${libdir}/systemd/ntp-units.d
> -    install -m 0644 ${WORKDIR}/ntpd.list ${D}${libdir}/systemd/ntp-units.d/60-ntpd.list
> +    install -d ${D}${systemd_unitdir}/ntp-units.d
> +    install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
>  }
>  
>  PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"

Patch

diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 65d90de..9ea24e9 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -67,9 +67,8 @@  do_install_append() {
     install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/
 
-    # see http://www.freedesktop.org/wiki/Software/systemd/timedated/
-    install -d ${D}${libdir}/systemd/ntp-units.d
-    install -m 0644 ${WORKDIR}/ntpd.list ${D}${libdir}/systemd/ntp-units.d/60-ntpd.list
+    install -d ${D}${systemd_unitdir}/ntp-units.d
+    install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"