[oe-commits] org.oe.dev ntp: unify. Add iana-etc to RRECOMMENDS.

[Laibsch commit]

ntp: unify.  Add iana-etc to RRECOMMENDS.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 76a73b54e1aca7e6533b51a040842d7330dda9ca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=76a73b54e1aca7e6533b51a040842d7330dda9ca
Files:
1
packages/ntp/ntp.inc
packages/ntp/ntp-ssl_4.1.2.bb
packages/ntp/ntp_4.1.2.bb
packages/ntp/ntp_4.2.0.bb
packages/ntp/ntp_4.2.2p3.bb
Diffs:

#
# mt diff -rc8ce8212bd3a804e6b4763ff805db3ac6cc9f62a -r76a73b54e1aca7e6533b51a040842d7330dda9ca
#
# 
# 
# add_file "packages/ntp/ntp.inc"
#  content [305d228d1528f9bd0d2517997eeb341a3503e999]
# 
# patch "packages/ntp/ntp-ssl_4.1.2.bb"
#  from [058ff3423c424196f3befd3c92b9fc1de8b8365a]
#    to [3e44ea294419efe5b7943dfa4a5294db090e5b93]
# 
# patch "packages/ntp/ntp_4.1.2.bb"
#  from [2676ce7943ee388680d9b1c10e4c48be2345e8bb]
#    to [88668bb1991af8f677895828878da82d1b9f2610]
# 
# patch "packages/ntp/ntp_4.2.0.bb"
#  from [3d4581f5dfe79d36bb49b49fb1689fd8786e3d61]
#    to [92a866253ceed4afa8560d58774a545c788fddfc]
# 
# patch "packages/ntp/ntp_4.2.2p3.bb"
#  from [957c3ea639734533de1a1dacbac71d3222001314]
#    to [0207f180391e9e005c35762c4a11c0b55ce3972a]
# 
============================================================
--- packages/ntp/ntp.inc	305d228d1528f9bd0d2517997eeb341a3503e999
+++ packages/ntp/ntp.inc	305d228d1528f9bd0d2517997eeb341a3503e999
@@ -0,0 +1,28 @@
+DESCRIPTION = "The Network Time Protocol (NTP) is used to \
+synchronize the time of a computer client or server to \
+another server or reference time source, such as a radio \
+or satellite receiver or modem."
+HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "ntp"
+RRECOMMENDS = "iana-etc"
+
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
+	file://ipv6only-workaround.patch;patch=1 \
+	file://ntpd \
+	file://ntp.conf \
+	file://ntpdate"
+
+inherit autotools update-rc.d
+
+# The ac_cv_header_readline_history is to stop ntpdc depending on either
+# readline or curses
+EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
+CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+
+PACKAGES += "ntpdate ntp-bin ntp-tickadj ntp-utils"
+# NOTE: you don't need ntpdate, use "ntpdc -q -g -x"
+
+# This should use rc.update
+FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
============================================================
--- packages/ntp/ntp-ssl_4.1.2.bb	058ff3423c424196f3befd3c92b9fc1de8b8365a
+++ packages/ntp/ntp-ssl_4.1.2.bb	3e44ea294419efe5b7943dfa4a5294db090e5b93
@@ -1,4 +1,4 @@
-require ntp_4.1.2.bb
+require ntp_${PV}.bb
 DEPENDS = "openssl"
 PR = "r2"
 
============================================================
--- packages/ntp/ntp_4.1.2.bb	2676ce7943ee388680d9b1c10e4c48be2345e8bb
+++ packages/ntp/ntp_4.1.2.bb	88668bb1991af8f677895828878da82d1b9f2610
@@ -1,11 +1,5 @@
-DESCRIPTION = "The Network Time Protocol (NTP) is used to \
-synchronize the time of a computer client or server to \
-another server or reference time source, such as a radio \
-or satellite receiver or modem."
-HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "ntp"
+require ntp.inc
+
 PR = "r4"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.1/ntp-${PV}.tar.gz \
@@ -14,15 +8,6 @@ SRC_URI = "http://www.eecis.udel.edu/~nt
 	   file://ntpdate \
 	   file://ntp"
 
-inherit autotools
-
-EXTRA_OECONF = "--without-openssl"
-CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-
-PACKAGES =+ "ntpdate"
-
-FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
-
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 755 ${WORKDIR}/ntpdate ${D}${sysconfdir}/init.d
============================================================
--- packages/ntp/ntp_4.2.0.bb	3d4581f5dfe79d36bb49b49fb1689fd8786e3d61
+++ packages/ntp/ntp_4.2.0.bb	92a866253ceed4afa8560d58774a545c788fddfc
@@ -1,11 +1,5 @@
-DESCRIPTION = "The Network Time Protocol (NTP) is used to \
-synchronize the time of a computer client or server to \
-another server or reference time source, such as a radio \
-or satellite receiver or modem."
-HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "ntp"
+require ntp.inc
+
 PR = "r8"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
@@ -21,19 +15,8 @@ INITSCRIPT_PARAMS = "defaults"
 # No dependencies, so just go in at the standard level (20)
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
-
-# The ac_cv_header_readline_history is to stop ntpdc depending on either
-# readline or curses
-EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
-CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-
-PACKAGES += "ntpdate ntp-bin ntp-tickadj"
-# NOTE: you don't need ntpdate, use "ntpdc -q -g -x"
 PROVIDES = "ntpdate-${PV} ntpdate-${PV}-${PR} ntpdate"
 
-# This should use rc.update
-FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
 #This is too painful - perl is only needed for ntp-wait and ntptrace, which are
 #perl scripts, and installing perl is an enormous overhead for a user who only
 #needs ntpq
============================================================
--- packages/ntp/ntp_4.2.2p3.bb	957c3ea639734533de1a1dacbac71d3222001314
+++ packages/ntp/ntp_4.2.2p3.bb	0207f180391e9e005c35762c4a11c0b55ce3972a
@@ -1,11 +1,4 @@
-DESCRIPTION = "The Network Time Protocol (NTP) is used to \
-synchronize the time of a computer client or server to \
-another server or reference time source, such as a radio \
-or satellite receiver or modem."
-HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "ntp"
+require ntp.inc
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
 	file://ipv6only-workaround.patch;patch=1 \
@@ -18,19 +11,6 @@ INITSCRIPT_PARAMS = "defaults"
 # No dependencies, so just go in at the standard level (20)
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
-
-# The ac_cv_header_readline_history is to stop ntpdc depending on either
-# readline or curses
-EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
-CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-
-PACKAGES += "ntpdate ntp-bin ntp-tickadj ntp-utils"
-# NOTE: you don't need ntpdate, use "ntpdc -q -g -x"
-
-# This should use rc.update
-FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.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"