Patchwork [meta-networking] ptpd: migrate from meta-oe into meta-networking and uprev to ptpd 2.2.0

login
mail settings
Submitter jackie huang
Date Sept. 26, 2012, 3:54 a.m.
Message ID <1348631669-22341-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/37225/
State Superseded
Headers show

Comments

jackie huang - Sept. 26, 2012, 3:54 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../ptpd/ptpd-1.0.0/add-limit-h.patch              |   26 ++++++++
 .../ptpd/ptpd-2.2.0/adjust-daemon-name.patch       |   61 ++++++++++++++++++++
 .../ptpd/ptpd-2.2.0/ld-as-needed.patch             |   37 ++++++++++++
 meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |   20 +++++++
 meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb |   32 ++++++++++
 .../ptpd/ptpd-1.0.0/add-limit-h.patch              |   26 --------
 meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb    |   20 -------
 7 files changed, 176 insertions(+), 46 deletions(-)
 create mode 100644 meta-networking/recipes-daemons/ptpd/ptpd-1.0.0/add-limit-h.patch
 create mode 100644 meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/adjust-daemon-name.patch
 create mode 100644 meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch
 create mode 100644 meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb
 create mode 100644 meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
 delete mode 100644 meta-oe/recipes-connectivity/ptpd/ptpd-1.0.0/add-limit-h.patch
 delete mode 100644 meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
Koen Kooi - Sept. 26, 2012, 7:27 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-09-12 05:54, jackie.huang@windriver.com schreef:
> From: Jackie Huang <jackie.huang@windriver.com>
> 

> meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |   20 +++++++ 
> meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb |   32 ++++++++++

First: why do we need 2 versions?

> +SUMMARY = "The PTP daemon (PTPd)" +DESCRIPTION = "The PTP daemon (PTPd)
> implements the Precision Time protocol (PTP) as \ +defined by the
> relevant IEEE 1588 standard. PTP Version 1 implements IEEE-1588-2002, \ 
> +and PTP Version 2 implements IEEE-1588-2008. PTP was developed to
> provide very precise \ +time coordination of LAN connected computers." 
> +HOMEPAGE = "http://sourceforge.net/projects/ptpd" +SECTION = "network" 
> +LICENSE = "BSD" + +PR = "r0"

Remove that

> + +LIC_FILES_CHKSUM =
> "file://../COPYRIGHT;md5=3d8ac2c46c116bce2d2ad838b6cf3491"

That goes together with the LICENSE var

> + +SRC_URI =
> "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz
> \ +           file://adjust-daemon-name.patch;striplevel=2 \ +
> file://ld-as-needed.patch;striplevel=2 \ +" + +SRC_URI[md5sum] =
> "c63a3a149d30c710773ccb02df5782a3" +SRC_URI[sha256sum] =
> "f2266a22db84318d8b9ce266ea83772c03438c31f4993fa9643fa675a07c26b4" + +S =
> "${WORKDIR}/ptpd-${PV}/src" + +# EXTRA_OEMAKE is typically: -e
> MAKEFLAGS= +# the -e causes problems as CFLAGS is modified in the
> Makefile. +EXTRA_OEMAKE = ""

Modified how? Are the OE CFLAGS and LDFLAGS getting used or not ?

> + +do_install() { +        install -d ${D}${bindir} ${D}${mandir}/man8 +
> install -m 0755 ptpd ${D}${bindir} +        install -m 0644 ptpd2.8
> ${D}${mandir}/man8 +}

is 'make install' broken?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQYq5rMkyGM64RGpERAo2vAJ9GpL7QQJHYGSkxiYC+/ePERYqIrACfUL7Q
lekJzXFfoWZGp43GNgPTY4k=
=h/6e
-----END PGP SIGNATURE-----
jackie huang - Sept. 26, 2012, 9:19 a.m.
On 9/26/2012 3:27 PM, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 26-09-12 05:54, jackie.huang@windriver.com schreef:
>> From: Jackie Huang <jackie.huang@windriver.com>
>>
>
>> meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |   20 +++++++
>> meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb |   32 ++++++++++
>
> First: why do we need 2 versions?

I thought we need to keep the versions we ever had. I will remove the 
old one.

>
>> +SUMMARY = "The PTP daemon (PTPd)" +DESCRIPTION = "The PTP daemon (PTPd)
>> implements the Precision Time protocol (PTP) as \ +defined by the
>> relevant IEEE 1588 standard. PTP Version 1 implements IEEE-1588-2002, \
>> +and PTP Version 2 implements IEEE-1588-2008. PTP was developed to
>> provide very precise \ +time coordination of LAN connected computers."
>> +HOMEPAGE = "http://sourceforge.net/projects/ptpd" +SECTION = "network"
>> +LICENSE = "BSD" + +PR = "r0"
>
> Remove that

Got it, I will remove it.

>
>> + +LIC_FILES_CHKSUM =
>> "file://../COPYRIGHT;md5=3d8ac2c46c116bce2d2ad838b6cf3491"
>
> That goes together with the LICENSE var
>
>> + +SRC_URI =
>> "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz
>> \ +           file://adjust-daemon-name.patch;striplevel=2 \ +
>> file://ld-as-needed.patch;striplevel=2 \ +" + +SRC_URI[md5sum] =
>> "c63a3a149d30c710773ccb02df5782a3" +SRC_URI[sha256sum] =
>> "f2266a22db84318d8b9ce266ea83772c03438c31f4993fa9643fa675a07c26b4" + +S =
>> "${WORKDIR}/ptpd-${PV}/src" + +# EXTRA_OEMAKE is typically: -e
>> MAKEFLAGS= +# the -e causes problems as CFLAGS is modified in the
>> Makefile. +EXTRA_OEMAKE = ""
>
> Modified how? Are the OE CFLAGS and LDFLAGS getting used or not ?

Some default CFLAGS is added in the Makefile which will be overrode with 
-e, and I checked taht the OE CFLAGS and LDFLAGS are still getting used 
without the -e option, so I did like this, but sounds like it is not 
recommended, right?

>
>> + +do_install() { +        install -d ${D}${bindir} ${D}${mandir}/man8 +
>> install -m 0755 ptpd ${D}${bindir} +        install -m 0644 ptpd2.8
>> ${D}${mandir}/man8 +}
>
> is 'make install' broken?

There is no 'make install' at all.

Thanks,
Jackie

> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFQYq5rMkyGM64RGpERAo2vAJ9GpL7QQJHYGSkxiYC+/ePERYqIrACfUL7Q
> lekJzXFfoWZGp43GNgPTY4k=
> =h/6e
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
Koen Kooi - Sept. 26, 2012, 9:20 a.m.
Op 26 sep. 2012, om 11:19 heeft jhuang0 <jackie.huang@windriver.com> het volgende geschreven:

> 
> 
> On 9/26/2012 3:27 PM, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>> 
>> Op 26-09-12 05:54, jackie.huang@windriver.com schreef:
>>> From: Jackie Huang <jackie.huang@windriver.com>
>>> 
>> 
>>> meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |   20 +++++++
>>> meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb |   32 ++++++++++
>> 
>> First: why do we need 2 versions?
> 
> I thought we need to keep the versions we ever had. I will remove the old one.

That would be 2 patches: 1 move, 1 update
jackie huang - Sept. 26, 2012, 9:25 a.m.
On 9/26/2012 5:20 PM, Koen Kooi wrote:
>
> Op 26 sep. 2012, om 11:19 heeft jhuang0 <jackie.huang@windriver.com> het volgende geschreven:
>
>>
>>
>> On 9/26/2012 3:27 PM, Koen Kooi wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> Op 26-09-12 05:54, jackie.huang@windriver.com schreef:
>>>> From: Jackie Huang <jackie.huang@windriver.com>
>>>>
>>>
>>>> meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |   20 +++++++
>>>> meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb |   32 ++++++++++
>>>
>>> First: why do we need 2 versions?
>>
>> I thought we need to keep the versions we ever had. I will remove the old one.
>
> That would be 2 patches: 1 move, 1 update

ok, so I will still keep the old one, but just make 2 patches.

Thanks,
Jackie

>

Patch

diff --git a/meta-networking/recipes-daemons/ptpd/ptpd-1.0.0/add-limit-h.patch b/meta-networking/recipes-daemons/ptpd/ptpd-1.0.0/add-limit-h.patch
new file mode 100644
index 0000000..8ed3f2f
--- /dev/null
+++ b/meta-networking/recipes-daemons/ptpd/ptpd-1.0.0/add-limit-h.patch
@@ -0,0 +1,26 @@ 
+ptpd: fix ftbfs by including limits.h so MAX_INT defined
+
+The current recipe for ptpd fails to build with:
+
+| arith.c: In function 'fromInternalTime':
+| arith.c:46: error: 'INT_MAX' undeclared (first use in this function)
+| arith.c:46: error: (Each undeclared identifier is reported only once
+| arith.c:46: error: for each function it appears in.)
+| arith.c: In function 'toInternalTime':
+| arith.c:64: error: 'INT_MAX' undeclared (first use in this function)
+| make: *** [arith.o] Error 1
+| make: *** Waiting for unfinished jobs....
+| FATAL: oe_runmake failed
+
+diff --git a/src/arith.c b/src/arith.c
+--- a/src/arith.c
++++ b/src/arith.c
+@@ -1,6 +1,7 @@
+ /* arith.c */
+ 
+ #include "ptpd.h"
++#include <limits.h>
+ 
+ /* from annex C of the spec */
+ UInteger32 crc_algorithm(Octet *buf, Integer16 length)
+
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/adjust-daemon-name.patch b/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/adjust-daemon-name.patch
new file mode 100644
index 0000000..f6934b6
--- /dev/null
+++ b/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/adjust-daemon-name.patch
@@ -0,0 +1,61 @@ 
+Patch from http://patch-tracker.debian.org/package/ptpd
+
+Description: Executable name ptpd
+ This patch adjusts the binary executable to be called ptpd instead of ptpd2.
+ Similarly, the man page name is adjusted.
+Author: Roland Stigge <stigge@antcom.de>
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ src/Makefile |    4 ++--
+ src/ptpd2.8  |    8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index dbbe525..a672625 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,4 +1,4 @@
+-# Makefile for ptpd2
++# Makefile for ptpd
+ 
+ #
+ # Compile time defines:
+@@ -42,7 +42,7 @@ CFLAGS += -DPTP_EXPERIMENTAL
+ 
+ LDFLAGS+= -lm -lrt
+ 
+-PROG = ptpd2
++PROG = ptpd
+ SRCS = ptpd.c arith.c bmc.c protocol.c display.c\
+ 	dep/msg.c dep/net.c dep/servo.c dep/startup.c dep/sys.c dep/timer.c
+ 
+diff --git a/src/ptpd2.8 b/src/ptpd2.8
+index c6100f4..21f1906 100644
+--- a/src/ptpd2.8
++++ b/src/ptpd2.8
+@@ -1,9 +1,9 @@
+ .\" -*- nroff -*"
+-.TH ptpd2 8 "January, 2012" "version 2.2.0" "Precision Time Protocol daemon"
++.TH ptpd 8 "January, 2012" "version 2.2.0" "Precision Time Protocol daemon"
+ .SH NAME
+-ptpd2 \- Precision Time Protocol daemon (1588-2008)
++ptpd \- Precision Time Protocol daemon (1588-2008)
+ .SH SYNOPSIS
+-.B ptpd2
++.B ptpd
+ [?]
+ [-B]
+ [-c]
+@@ -182,7 +182,7 @@ run as master without NTP
+ set an initial delay request value
+ .TP
+ .B \-L
+-enable running multiple ptpd2 daemons
++enable running multiple ptpd daemons
+ .TP
+ .B \-j
+ turn off IGMP refresh messages
+-- 
+1.7.4
+
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch b/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch
new file mode 100644
index 0000000..7d5251b
--- /dev/null
+++ b/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch
@@ -0,0 +1,37 @@ 
+Patch from http://patch-tracker.debian.org/package/ptpd
+
+Description: Fix ld --as-needed
+ This patch fixes the order of gcc arguments to fix ld --as-needed
+Author: Roland Stigge <stigge@antcom.de>
+Bug-Debian: http://bugs.debian.org/607583
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ src/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index a672625..88a2fc8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -40,7 +40,7 @@ CFLAGS += -DDBG_SIGUSR2_CHANGE_DEBUG
+ 
+ CFLAGS += -DPTP_EXPERIMENTAL
+ 
+-LDFLAGS+= -lm -lrt
++LIBS += -lm -lrt
+ 
+ PROG = ptpd
+ SRCS = ptpd.c arith.c bmc.c protocol.c display.c\
+@@ -63,7 +63,7 @@ TAGFILES = GPATH GRTAGS GSYMS GTAGS cscope.in.out cscope.out cscope.po.out
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) -o $@ $(OBJS) $(LDFLAGS)
++	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
+ 
+ $(OBJS): $(HDRS)
+ 
+-- 
+1.7.4
+
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb b/meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb
new file mode 100644
index 0000000..08e1b6b
--- /dev/null
+++ b/meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb
@@ -0,0 +1,20 @@ 
+DESCRIPTION = "Precision Time Protocol (PTP) as defined by the IEEE 1588 standard"
+HOMEPAGE = "http://sourceforge.net/projects/ptpd"
+SECTION = "network"
+LICENSE = "BSD"
+
+LIC_FILES_CHKSUM = "file://../COPYRIGHT;md5=888bd1b2c9c013b93394b8bfb453c417"
+
+SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz \
+           file://add-limit-h.patch;striplevel=2"
+
+SRC_URI[md5sum] = "b112b2bedc7f6e6e11a838608b9e0357"
+SRC_URI[sha256sum] = "8ac1fdcad1e246b0395097dd9af29966c6823533d7e6989aae91506048fb51bc"
+
+S = "${WORKDIR}/ptpd-${PV}/src"
+
+do_install() {
+        install -d ${D}${bindir} ${D}${mandir}/man8
+        install -m 4555 ptpd ${D}${bindir}
+        install -m 644 ptpd.8 ${D}${mandir}/man8
+}
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
new file mode 100644
index 0000000..a393a25
--- /dev/null
+++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
@@ -0,0 +1,32 @@ 
+SUMMARY = "The PTP daemon (PTPd)"
+DESCRIPTION = "The PTP daemon (PTPd) implements the Precision Time protocol (PTP) as \
+defined by the relevant IEEE 1588 standard. PTP Version 1 implements IEEE-1588-2002, \
+and PTP Version 2 implements IEEE-1588-2008. PTP was developed to provide very precise \
+time coordination of LAN connected computers."
+HOMEPAGE = "http://sourceforge.net/projects/ptpd"
+SECTION = "network"
+LICENSE = "BSD"
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://../COPYRIGHT;md5=3d8ac2c46c116bce2d2ad838b6cf3491"
+
+SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz \
+           file://adjust-daemon-name.patch;striplevel=2 \
+           file://ld-as-needed.patch;striplevel=2 \
+"
+
+SRC_URI[md5sum] = "c63a3a149d30c710773ccb02df5782a3"
+SRC_URI[sha256sum] = "f2266a22db84318d8b9ce266ea83772c03438c31f4993fa9643fa675a07c26b4"
+
+S = "${WORKDIR}/ptpd-${PV}/src"
+
+# EXTRA_OEMAKE is typically: -e MAKEFLAGS=
+# the -e causes problems as CFLAGS is modified in the Makefile.
+EXTRA_OEMAKE = ""
+
+do_install() {
+        install -d ${D}${bindir} ${D}${mandir}/man8
+        install -m 0755 ptpd ${D}${bindir}
+        install -m 0644 ptpd2.8 ${D}${mandir}/man8
+}
diff --git a/meta-oe/recipes-connectivity/ptpd/ptpd-1.0.0/add-limit-h.patch b/meta-oe/recipes-connectivity/ptpd/ptpd-1.0.0/add-limit-h.patch
deleted file mode 100644
index 8ed3f2f..0000000
--- a/meta-oe/recipes-connectivity/ptpd/ptpd-1.0.0/add-limit-h.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-ptpd: fix ftbfs by including limits.h so MAX_INT defined
-
-The current recipe for ptpd fails to build with:
-
-| arith.c: In function 'fromInternalTime':
-| arith.c:46: error: 'INT_MAX' undeclared (first use in this function)
-| arith.c:46: error: (Each undeclared identifier is reported only once
-| arith.c:46: error: for each function it appears in.)
-| arith.c: In function 'toInternalTime':
-| arith.c:64: error: 'INT_MAX' undeclared (first use in this function)
-| make: *** [arith.o] Error 1
-| make: *** Waiting for unfinished jobs....
-| FATAL: oe_runmake failed
-
-diff --git a/src/arith.c b/src/arith.c
---- a/src/arith.c
-+++ b/src/arith.c
-@@ -1,6 +1,7 @@
- /* arith.c */
- 
- #include "ptpd.h"
-+#include <limits.h>
- 
- /* from annex C of the spec */
- UInteger32 crc_algorithm(Octet *buf, Integer16 length)
-
diff --git a/meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb b/meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
deleted file mode 100644
index 08e1b6b..0000000
--- a/meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@ 
-DESCRIPTION = "Precision Time Protocol (PTP) as defined by the IEEE 1588 standard"
-HOMEPAGE = "http://sourceforge.net/projects/ptpd"
-SECTION = "network"
-LICENSE = "BSD"
-
-LIC_FILES_CHKSUM = "file://../COPYRIGHT;md5=888bd1b2c9c013b93394b8bfb453c417"
-
-SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz \
-           file://add-limit-h.patch;striplevel=2"
-
-SRC_URI[md5sum] = "b112b2bedc7f6e6e11a838608b9e0357"
-SRC_URI[sha256sum] = "8ac1fdcad1e246b0395097dd9af29966c6823533d7e6989aae91506048fb51bc"
-
-S = "${WORKDIR}/ptpd-${PV}/src"
-
-do_install() {
-        install -d ${D}${bindir} ${D}${mandir}/man8
-        install -m 4555 ptpd ${D}${bindir}
-        install -m 644 ptpd.8 ${D}${mandir}/man8
-}