mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

ntp: fix file locations

Browse Source 
After the upgrade to 4.2.8, ntp's configure process now uses a custom
script which looks at the host to determine what install locations it
should use. This resulted in the recipe working on some people's
machines and failing during do_install on others. Force it to use the
"redhat" configuration as this seems closest to what we used to be
using prior to the upgrade (this means that binaries are now back in
sbindir as they used to be).

Thanks to Philip Balister for reporting this.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Paul Eggleton
2015-01-05 10:51:26 +00:00
committed by Joe MacDonald
parent 07d5d4d5d9
commit 25d6aa5e86
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/ntp/ntp_4.2.8.bb
+10 -11
View File
@@ -35,6 +35,7 @@ EXTRA_OECONF += "--with-net-snmp-config=no \
--without-ntpsnmpd \ --without-ntpsnmpd \
ac_cv_header_readline_history_h=no \ ac_cv_header_readline_history_h=no \
--with-yielding_select=yes \ --with-yielding_select=yes \
--with-locfile=redhat \
" "
CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
@@ -71,10 +72,10 @@ do_install_append() {
sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync
sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${bindir}/ntptrace sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace
sed -i '/use/i use warnings;' ${D}${bindir}/ntptrace sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace
sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${bindir}/ntp-wait sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait
sed -i '/use/i use warnings;' ${D}${bindir}/ntp-wait sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait
install -d ${D}/${sysconfdir}/default install -d ${D}/${sysconfdir}/default
install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
@@ -90,8 +91,6 @@ do_install_append() {
install -d ${D}${systemd_unitdir}/ntp-units.d install -d ${D}${systemd_unitdir}/ntp-units.d
install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
rmdir ${D}${sbindir}
} }
PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"
@@ -120,19 +119,19 @@ RCONFLICTS_ntpdate += "ntpdate-systemd"
RSUGGESTS_${PN} = "iana-etc" RSUGGESTS_${PN} = "iana-etc"
FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \
${NTP_USER_HOME} \ ${NTP_USER_HOME} \
${systemd_unitdir}/ntp-units.d/60-ntpd.list \ ${systemd_unitdir}/ntp-units.d/60-ntpd.list \
" "
FILES_${PN}-tickadj = "${bindir}/tickadj" FILES_${PN}-tickadj = "${sbindir}/tickadj"
FILES_${PN}-utils = "${bindir} ${datadir}/ntp/lib" FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib"
FILES_ntpdate = "${bindir}/ntpdate \ FILES_ntpdate = "${sbindir}/ntpdate \
${sysconfdir}/network/if-up.d/ntpdate-sync \ ${sysconfdir}/network/if-up.d/ntpdate-sync \
${bindir}/ntpdate-sync \ ${bindir}/ntpdate-sync \
${sysconfdir}/default/ntpdate \ ${sysconfdir}/default/ntpdate \
${systemd_unitdir}/system/ntpdate.service \ ${systemd_unitdir}/system/ntpdate.service \
" "
FILES_sntp = "${bindir}/sntp \ FILES_sntp = "${sbindir}/sntp \
${sysconfdir}/default/sntp \ ${sysconfdir}/default/sntp \
${systemd_unitdir}/system/sntp.service \ ${systemd_unitdir}/system/sntp.service \
" "