| Message ID | 45c13946ede42cd9ece7a1080ca2c4b2697bdc59.1396522190.git.christian.braunersorensen@prevas.dk |
|---|---|
| State | Accepted |
| Delegated to: | Esben Haabendal |
| Headers | show |
<christian.braunersorensen@prevas.dk> writes: > From: Christian Sørensen <christian.braunersorensen@prevas.dk> > > Is enabled on default. > > Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk> > --- > recipes/ntp/ntp.inc | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/recipes/ntp/ntp.inc b/recipes/ntp/ntp.inc > index 7ba629f..85d81ab 100644 > --- a/recipes/ntp/ntp.inc > +++ b/recipes/ntp/ntp.inc > @@ -40,12 +40,20 @@ do_install[postfuncs] =+ "do_install_extra_files" > do_install_extra_files() { > install -d ${D}/${sysconfdir} > install -m 644 ${SRCDIR}/ntp.conf ${D}/${sysconfdir} > - install -d ${D}/${sysconfdir}/network/if-up.d > - install -m 755 ${SRCDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d > install -d ${D}/${sysconfdir}/init.d > install -m 755 ${SRCDIR}/ntpd ${D}/${sysconfdir}/init.d/ntpd > } > > +RECIPE_FLAGS += "install_ntpdate" > +DEFAULT_USE_install_ntpdate = "1" I renamed the USE flag to "ntpdate_ifup", to follow the pseudo convention of prefixing with recipe/package name. > +DO_INSTALL_NTPDATE = "" > +DO_INSTALL_NTPDATE:USE_install_ntpdate = "do_install_ntpdate" > +do_install[postfuncs] += "${DO_INSTALL_NTPDATE}" > +do_install_ntpdate () { > + install -d ${D}/${sysconfdir}/network/if-up.d > + install -m 755 ${SRCDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d > +} > + > inherit sysvinit > RECIPE_FLAGS += "ntpd_sysvinit_start ntpd_sysvinit_stop" > SYSVINIT_SCRIPT_ntpd = "ntpd" Merged to master, thanks. /Esben
diff --git a/recipes/ntp/ntp.inc b/recipes/ntp/ntp.inc index 7ba629f..85d81ab 100644 --- a/recipes/ntp/ntp.inc +++ b/recipes/ntp/ntp.inc @@ -40,12 +40,20 @@ do_install[postfuncs] =+ "do_install_extra_files" do_install_extra_files() { install -d ${D}/${sysconfdir} install -m 644 ${SRCDIR}/ntp.conf ${D}/${sysconfdir} - install -d ${D}/${sysconfdir}/network/if-up.d - install -m 755 ${SRCDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d install -d ${D}/${sysconfdir}/init.d install -m 755 ${SRCDIR}/ntpd ${D}/${sysconfdir}/init.d/ntpd } +RECIPE_FLAGS += "install_ntpdate" +DEFAULT_USE_install_ntpdate = "1" +DO_INSTALL_NTPDATE = "" +DO_INSTALL_NTPDATE:USE_install_ntpdate = "do_install_ntpdate" +do_install[postfuncs] += "${DO_INSTALL_NTPDATE}" +do_install_ntpdate () { + install -d ${D}/${sysconfdir}/network/if-up.d + install -m 755 ${SRCDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d +} + inherit sysvinit RECIPE_FLAGS += "ntpd_sysvinit_start ntpd_sysvinit_stop" SYSVINIT_SCRIPT_ntpd = "ntpd"