Patchwork [meta-networking] Revert "ntp: Clean up recipes"

login
register
mail settings
Submitter Koen Kooi
Date Nov. 21, 2012, 1:17 p.m.
Message ID <1353503878-26344-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/39399/
State Accepted
Commit 9637cb304f1e9116b037d0afd69014836a2fa512
Headers show

Comments

Koen Kooi - Nov. 21, 2012, 1:17 p.m.
This breaks the upgrade path since 'ntpdate' has been renamed to 'ntp-date'. I don't know why this patch was applied when it was shot down on review.

This reverts commit d102fc3fe64844f5c85ff350874728139a63fe78.
---
 .../recipes-support/ntp/ntp-ssl_4.2.6p5.bb         |   11 +++--
 meta-networking/recipes-support/ntp/ntp.inc        |   49 ++------------------
 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |   43 ++++++++++++++++-
 3 files changed, 53 insertions(+), 50 deletions(-)
Paul Eggleton - Nov. 21, 2012, 1:26 p.m.
On Wednesday 21 November 2012 14:17:58 Koen Kooi wrote:
> This breaks the upgrade path since 'ntpdate' has been renamed to 'ntp-date'.
> I don't know why this patch was applied when it was shot down on review.

I'm working on a patch to fix various issues with this recipe including this 
one, so if this is your only concern I'd rather we either wait until I submit 
that (soon) or just change the name back alone rather than reverting the 
entire patch.

Cheers,
Paul
Joe MacDonald - Nov. 21, 2012, 1:31 p.m.
[[oe] [meta-networking][PATCH] Revert "ntp: Clean up recipes"] On 12.11.21 (Wed 14:17) Koen Kooi wrote:

> This breaks the upgrade path since 'ntpdate' has been renamed to 'ntp-date'. I don't know why this patch was applied when it was shot down on review.

It was an ordering problem, I believe.  The patch passed review, then on
a subsequent update we discovered the problems with it.  I was hoping
we'd have it sorted out with the submitter in short order, but it's
taking longer than I expected.  So, merged this.

Thanks.

-J.

> 
> This reverts commit d102fc3fe64844f5c85ff350874728139a63fe78.
> ---
>  .../recipes-support/ntp/ntp-ssl_4.2.6p5.bb         |   11 +++--
>  meta-networking/recipes-support/ntp/ntp.inc        |   49 ++------------------
>  meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |   43 ++++++++++++++++-
>  3 files changed, 53 insertions(+), 50 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 e5851ae..a158990 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,10 +1,11 @@
> -require ntp.inc
> +require ntp_${PV}.bb
>  DEPENDS = "openssl"
>  
>  S = "${WORKDIR}/ntp-${PV}"
>  
> -EXTRA_OECONF += "--with-openssl-libdir=${STAGING_LIBDIR} \
> -		 --with-openssl-incdir=${STAGING_INCDIR}/openssl \
> -		 --with-crypto"
> +EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
> +	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
>  
> -FILES_${PN} += "${bindir}/sntp ${bindir}/ntp-keygen"
> +
> +SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95"
> +SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a"
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
> index e2dbdad..1d740f0 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -8,19 +8,14 @@ LICENSE = "ntp"
>  LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
>  RSUGGESTS_${PN} = "iana-etc"
>  
> -INC_PR = "r1"
> -
> -SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
> -	file://tickadj.c.patch \
> -	file://ntp-4.2.4_p6-nano.patch \
> +SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
> +	file://ipv6only-workaround.patch \
>  	file://ntpd \
>  	file://ntp.conf \
>  	file://ntpdate \
> +	file://ntpd.service \
>  "
>  
> -SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
> -SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
> -
>  inherit autotools update-rc.d
>  
>  INITSCRIPT_NAME = "ntpd"
> @@ -29,46 +24,12 @@ INITSCRIPT_PARAMS = "defaults"
>  
>  # The ac_cv_header_readline_history is to stop ntpdc depending on either
>  # readline or curses
> -EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd ac_cv_header_readline_history_h=no"
> +EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
>  CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
>  
> -do_configure(){
> -	oe_runconf
> -}
> -
> -do_install_append() {
> -	install -d ${D}/${sysconfdir}/init.d
> -	install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
> -	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
> -	install -d ${D}/${sysconfdir}/network/if-up.d
> -	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
> -}
> -
> -FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
> -FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}"
> -FILES_${PN}-tickadj = "${bindir}/tickadj"
> -FILES_${PN}-utils = "${bindir}/*"
> -FILES_${PN}-date += "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
> -
> -# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
> -# with wonky clocks (e.g. OpenSlug)
> -RDEPENDS_${PN} = "${PN}-tickadj"
> -
> -PACKAGES += "${PN}-date ${PN}-bin ${PN}-tickadj ${PN}-utils"
> +PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils"
>  # NOTE: you don't need ntpdate, use "ntpd -q -g -x"
>  # or the ntpdate systemd service
>  
>  # This should use rc.update
>  FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
> -
> -pkg_postinst_ntpdate() {
> -if test "x$D" != "x"; then
> -        exit 1
> -else
> -        if ! grep -q -s ntpdate /var/spool/cron/root; then
> -                echo "adding crontab"
> -                test -d /var/spool/cron || mkdir -p /var/spool/cron
> -                echo "30 * * * *    /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
> -        fi
> -fi
> -}
> 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 175a1b0..f7c5b68 100644
> --- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
> +++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
> @@ -1,4 +1,45 @@
>  require ntp.inc
>  
> -EXTRA_OECONF += "--without-openssl --without-crypto"
> +SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
> +        file://tickadj.c.patch \
> +        file://ntp-4.2.4_p6-nano.patch \
> +        file://ntpd \
> +        file://ntp.conf \
> +        file://ntpdate \
> +"
> +
> +SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2"
> +SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e"
> +
> +EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd" 
> +
> +do_install_append() {
> +	install -d ${D}/${sysconfdir}/init.d
> +	install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
> +	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
> +	install -d ${D}/${sysconfdir}/network/if-up.d
> +	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
> +}
> +
> +FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
> +FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
> +FILES_${PN}-tickadj = "${bindir}/tickadj"
> +FILES_ntp-utils = "${bindir}/*"
> +FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
> +
> +# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
> +# with wonky clocks (e.g. OpenSlug)
> +RDEPENDS_${PN} = "${PN}-tickadj"
> +
> +pkg_postinst_ntpdate() {
> +if test "x$D" != "x"; then
> +        exit 1
> +else
> +        if ! grep -q -s ntpdate /var/spool/cron/root; then
> +                echo "adding crontab"
> +                test -d /var/spool/cron || mkdir -p /var/spool/cron
> +                echo "30 * * * *    /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
> +        fi
> +fi
> +}
>

Patch

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 e5851ae..a158990 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,10 +1,11 @@ 
-require ntp.inc
+require ntp_${PV}.bb
 DEPENDS = "openssl"
 
 S = "${WORKDIR}/ntp-${PV}"
 
-EXTRA_OECONF += "--with-openssl-libdir=${STAGING_LIBDIR} \
-		 --with-openssl-incdir=${STAGING_INCDIR}/openssl \
-		 --with-crypto"
+EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
+	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
 
-FILES_${PN} += "${bindir}/sntp ${bindir}/ntp-keygen"
+
+SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95"
+SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a"
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index e2dbdad..1d740f0 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -8,19 +8,14 @@  LICENSE = "ntp"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
 RSUGGESTS_${PN} = "iana-etc"
 
-INC_PR = "r1"
-
-SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
-	file://tickadj.c.patch \
-	file://ntp-4.2.4_p6-nano.patch \
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
+	file://ipv6only-workaround.patch \
 	file://ntpd \
 	file://ntp.conf \
 	file://ntpdate \
+	file://ntpd.service \
 "
 
-SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
-SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
-
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "ntpd"
@@ -29,46 +24,12 @@  INITSCRIPT_PARAMS = "defaults"
 
 # The ac_cv_header_readline_history is to stop ntpdc depending on either
 # readline or curses
-EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd ac_cv_header_readline_history_h=no"
+EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
 CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
-do_configure(){
-	oe_runconf
-}
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
-	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/network/if-up.d
-	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
-}
-
-FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
-FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}"
-FILES_${PN}-tickadj = "${bindir}/tickadj"
-FILES_${PN}-utils = "${bindir}/*"
-FILES_${PN}-date += "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
-
-# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
-# with wonky clocks (e.g. OpenSlug)
-RDEPENDS_${PN} = "${PN}-tickadj"
-
-PACKAGES += "${PN}-date ${PN}-bin ${PN}-tickadj ${PN}-utils"
+PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils"
 # NOTE: you don't need ntpdate, use "ntpd -q -g -x"
 # or the ntpdate systemd service
 
 # This should use rc.update
 FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
-
-pkg_postinst_ntpdate() {
-if test "x$D" != "x"; then
-        exit 1
-else
-        if ! grep -q -s ntpdate /var/spool/cron/root; then
-                echo "adding crontab"
-                test -d /var/spool/cron || mkdir -p /var/spool/cron
-                echo "30 * * * *    /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
-        fi
-fi
-}
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 175a1b0..f7c5b68 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
@@ -1,4 +1,45 @@ 
 require ntp.inc
 
-EXTRA_OECONF += "--without-openssl --without-crypto"
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
+        file://tickadj.c.patch \
+        file://ntp-4.2.4_p6-nano.patch \
+        file://ntpd \
+        file://ntp.conf \
+        file://ntpdate \
+"
+
+SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2"
+SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e"
+
+EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd" 
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
+	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
+	install -d ${D}/${sysconfdir}/network/if-up.d
+	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
+}
+
+FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
+FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
+FILES_${PN}-tickadj = "${bindir}/tickadj"
+FILES_ntp-utils = "${bindir}/*"
+FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
+
+# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
+# with wonky clocks (e.g. OpenSlug)
+RDEPENDS_${PN} = "${PN}-tickadj"
+
+pkg_postinst_ntpdate() {
+if test "x$D" != "x"; then
+        exit 1
+else
+        if ! grep -q -s ntpdate /var/spool/cron/root; then
+                echo "adding crontab"
+                test -d /var/spool/cron || mkdir -p /var/spool/cron
+                echo "30 * * * *    /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
+        fi
+fi
+}