diff options
author | Xufeng Zhang <xufeng.zhang@windriver.com> | 2014-03-11 13:54:10 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2014-03-14 08:51:45 -0400 |
commit | ed0a2852ecc75d5dd87ab556f698ea2816b18bd5 (patch) | |
tree | bc51b5bcf07133253d5d31905a9fe15d1fd6e225 /meta-networking/recipes-support/ntp/ntp.inc | |
parent | 7601d0a551fba612d2497e4ecae00e1af46d9c13 (diff) | |
download | meta-openembedded-ed0a2852ecc75d5dd87ab556f698ea2816b18bd5.tar.gz |
ntp: Moving relevant files from /usr/bin to /usr/sbin
"--with-binsubdir" controls whether we use bin_PROGRAMS or
sbin_PROGRAMS while installing executable files in ntp
Makefile, in order to install all the relevant files in
/usr/sbin instead of /usr/bin, we can pass "--with-binsubdir=sbin"
in ntp configure cmdline.
Accordingly, updating the path for the files which are
contained in rpm packages.
Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'meta-networking/recipes-support/ntp/ntp.inc')
-rw-r--r-- | meta-networking/recipes-support/ntp/ntp.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc index 7876c0b79..9c3e0d16c 100644 --- a/meta-networking/recipes-support/ntp/ntp.inc +++ b/meta-networking/recipes-support/ntp/ntp.inc | |||
@@ -29,7 +29,7 @@ inherit autotools update-rc.d useradd systemd | |||
29 | 29 | ||
30 | # The ac_cv_header_readline_history is to stop ntpdc depending on either | 30 | # The ac_cv_header_readline_history is to stop ntpdc depending on either |
31 | # readline or curses | 31 | # readline or curses |
32 | EXTRA_OECONF += "--with-net-snmp-config=no --without-ntpsnmpd ac_cv_header_readline_history_h=no" | 32 | EXTRA_OECONF += "--with-net-snmp-config=no --without-ntpsnmpd ac_cv_header_readline_history_h=no --with-binsubdir=sbin" |
33 | CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" | 33 | CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" |
34 | 34 | ||
35 | USERADD_PACKAGES = "${PN}" | 35 | USERADD_PACKAGES = "${PN}" |
@@ -101,18 +101,18 @@ RCONFLICTS_ntpdate += "ntpdate-systemd" | |||
101 | 101 | ||
102 | RSUGGESTS_${PN} = "iana-etc" | 102 | RSUGGESTS_${PN} = "iana-etc" |
103 | 103 | ||
104 | FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir} \ | 104 | FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ |
105 | ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ | 105 | ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ |
106 | " | 106 | " |
107 | FILES_${PN}-tickadj = "${bindir}/tickadj" | 107 | FILES_${PN}-tickadj = "${sbindir}/tickadj" |
108 | FILES_${PN}-utils = "${bindir}" | 108 | FILES_${PN}-utils = "${sbindir}" |
109 | FILES_ntpdate = "${bindir}/ntpdate \ | 109 | FILES_ntpdate = "${sbindir}/ntpdate \ |
110 | ${sysconfdir}/network/if-up.d/ntpdate-sync \ | 110 | ${sysconfdir}/network/if-up.d/ntpdate-sync \ |
111 | ${bindir}/ntpdate-sync \ | 111 | ${bindir}/ntpdate-sync \ |
112 | ${sysconfdir}/default/ntpdate \ | 112 | ${sysconfdir}/default/ntpdate \ |
113 | ${systemd_unitdir}/system/ntpdate.service \ | 113 | ${systemd_unitdir}/system/ntpdate.service \ |
114 | " | 114 | " |
115 | FILES_sntp = "${bindir}/sntp \ | 115 | FILES_sntp = "${sbindir}/sntp \ |
116 | ${sysconfdir}/default/sntp \ | 116 | ${sysconfdir}/default/sntp \ |
117 | " | 117 | " |
118 | 118 | ||