summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorMorgan Little <morgan.little@windriver.com>2012-10-23 16:20:20 +0000
committerJoe MacDonald <joe.macdonald@windriver.com>2012-10-25 12:16:20 -0400
commitd102fc3fe64844f5c85ff350874728139a63fe78 (patch)
treebd422d1d662fd832b148a7ae0fe067b78a7df574 /meta-networking
parente15543f05bb2c321cd649b90de50d1a3d8cd1199 (diff)
downloadmeta-openembedded-d102fc3fe64844f5c85ff350874728139a63fe78.tar.gz
ntp: Clean up recipes
Clean up recipes to make them easier to read and to allow ntp-ssl to build * Move common portions to ntp.inc * Update ntp-ssl to require ntp.inc oppose to ntp_${PV}.bb * Change ntp-ssl EXTRA_OECONF to append so it won't try to configure snmp as it will use local paths can cause a error while configuring Signed-off-by: Morgan Little <morgan.little@windriver.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb11
-rw-r--r--meta-networking/recipes-support/ntp/ntp.inc49
-rw-r--r--meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb43
3 files changed, 50 insertions, 53 deletions
diff --git a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
index a15899079..e5851ae9a 100644
--- a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
+++ b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
@@ -1,11 +1,10 @@
1require ntp_${PV}.bb 1require ntp.inc
2DEPENDS = "openssl" 2DEPENDS = "openssl"
3 3
4S = "${WORKDIR}/ntp-${PV}" 4S = "${WORKDIR}/ntp-${PV}"
5 5
6EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \ 6EXTRA_OECONF += "--with-openssl-libdir=${STAGING_LIBDIR} \
7 --with-openssl-incdir=${STAGING_INCDIR}/openssl" 7 --with-openssl-incdir=${STAGING_INCDIR}/openssl \
8 --with-crypto"
8 9
9 10FILES_${PN} += "${bindir}/sntp ${bindir}/ntp-keygen"
10SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95"
11SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a"
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 1d740f00f..e2dbdad39 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -8,14 +8,19 @@ LICENSE = "ntp"
8LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670" 8LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
9RSUGGESTS_${PN} = "iana-etc" 9RSUGGESTS_${PN} = "iana-etc"
10 10
11SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ 11INC_PR = "r1"
12 file://ipv6only-workaround.patch \ 12
13SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
14 file://tickadj.c.patch \
15 file://ntp-4.2.4_p6-nano.patch \
13 file://ntpd \ 16 file://ntpd \
14 file://ntp.conf \ 17 file://ntp.conf \
15 file://ntpdate \ 18 file://ntpdate \
16 file://ntpd.service \
17" 19"
18 20
21SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
22SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
23
19inherit autotools update-rc.d 24inherit autotools update-rc.d
20 25
21INITSCRIPT_NAME = "ntpd" 26INITSCRIPT_NAME = "ntpd"
@@ -24,12 +29,46 @@ INITSCRIPT_PARAMS = "defaults"
24 29
25# 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
26# readline or curses 31# readline or curses
27EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no" 32EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd ac_cv_header_readline_history_h=no"
28CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" 33CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
29 34
30PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils" 35do_configure(){
36 oe_runconf
37}
38
39do_install_append() {
40 install -d ${D}/${sysconfdir}/init.d
41 install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
42 install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
43 install -d ${D}/${sysconfdir}/network/if-up.d
44 install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
45}
46
47FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
48FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}"
49FILES_${PN}-tickadj = "${bindir}/tickadj"
50FILES_${PN}-utils = "${bindir}/*"
51FILES_${PN}-date += "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
52
53# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
54# with wonky clocks (e.g. OpenSlug)
55RDEPENDS_${PN} = "${PN}-tickadj"
56
57PACKAGES += "${PN}-date ${PN}-bin ${PN}-tickadj ${PN}-utils"
31# NOTE: you don't need ntpdate, use "ntpd -q -g -x" 58# NOTE: you don't need ntpdate, use "ntpd -q -g -x"
32# or the ntpdate systemd service 59# or the ntpdate systemd service
33 60
34# This should use rc.update 61# This should use rc.update
35FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate" 62FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
63
64pkg_postinst_ntpdate() {
65if test "x$D" != "x"; then
66 exit 1
67else
68 if ! grep -q -s ntpdate /var/spool/cron/root; then
69 echo "adding crontab"
70 test -d /var/spool/cron || mkdir -p /var/spool/cron
71 echo "30 * * * * /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
72 fi
73fi
74}
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
index f7c5b6885..175a1b07e 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
@@ -1,45 +1,4 @@
1require ntp.inc 1require ntp.inc
2 2
3SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ 3EXTRA_OECONF += "--without-openssl --without-crypto"
4 file://tickadj.c.patch \
5 file://ntp-4.2.4_p6-nano.patch \
6 file://ntpd \
7 file://ntp.conf \
8 file://ntpdate \
9"
10
11SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2"
12SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e"
13
14EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd"
15
16do_install_append() {
17 install -d ${D}/${sysconfdir}/init.d
18 install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
19 install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
20 install -d ${D}/${sysconfdir}/network/if-up.d
21 install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
22}
23
24FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
25FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
26FILES_${PN}-tickadj = "${bindir}/tickadj"
27FILES_ntp-utils = "${bindir}/*"
28FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
29
30# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
31# with wonky clocks (e.g. OpenSlug)
32RDEPENDS_${PN} = "${PN}-tickadj"
33
34pkg_postinst_ntpdate() {
35if test "x$D" != "x"; then
36 exit 1
37else
38 if ! grep -q -s ntpdate /var/spool/cron/root; then
39 echo "adding crontab"
40 test -d /var/spool/cron || mkdir -p /var/spool/cron
41 echo "30 * * * * /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
42 fi
43fi
44}
45 4