Patchwork [meta-networking,v2,1/2] ptpd: migrate from meta-oe into meta-networking

login
register
mail settings
Submitter jackie huang
Date Sept. 28, 2012, 3:21 a.m.
Message ID <1348802495-13651-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/37407/
State Superseded
Headers show

Comments

jackie huang - Sept. 28, 2012, 3:21 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 ++++++++++++++++++++
 meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |   20 +++++++++++++++
 .../ptpd/ptpd-1.0.0/add-limit-h.patch              |   26 --------------------
 meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb    |   20 ---------------
 4 files changed, 46 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_1.0.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. 28, 2012, 9 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 28-09-12 05:21, jackie.huang@windriver.com schreef:
> 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
> ++++++++++++++++++++ meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |
> 20 +++++++++++++++ .../ptpd/ptpd-1.0.0/add-limit-h.patch              |
> 26 -------------------- meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
> |   20 ---------------

Can you resend that with -m?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQZg/jMkyGM64RGpERAmQGAJ9FvNdtkcgp25H/NSAQn0jUH3adAgCeIdTv
OYcMi5OfStUutSiA4pTuEG8=
=TXyy
-----END PGP SIGNATURE-----
jackie huang - Sept. 29, 2012, 2:01 a.m.
On 9/29/2012 5:00 AM, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 28-09-12 05:21, jackie.huang@windriver.com schreef:
>> 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
>> ++++++++++++++++++++ meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |
>> 20 +++++++++++++++ .../ptpd/ptpd-1.0.0/add-limit-h.patch              |
>> 26 -------------------- meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
>> |   20 ---------------
>
> Can you resend that with -m?

Resent, thanks!

Thanks,
Jackie

>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFQZg/jMkyGM64RGpERAmQGAJ9FvNdtkcgp25H/NSAQn0jUH3adAgCeIdTv
> OYcMi5OfStUutSiA4pTuEG8=
> =TXyy
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Martin Jansa - Sept. 29, 2012, 7:27 a.m.
On Sat, Sep 29, 2012 at 10:01:49AM +0800, jhuang0 wrote:
> 
> 
> On 9/29/2012 5:00 AM, Koen Kooi wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Op 28-09-12 05:21, jackie.huang@windriver.com schreef:
> >> 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
> >> ++++++++++++++++++++ meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |
> >> 20 +++++++++++++++ .../ptpd/ptpd-1.0.0/add-limit-h.patch              |
> >> 26 -------------------- meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
> >> |   20 ---------------
> >
> > Can you resend that with -m?
> 
> Resent, thanks!

And was it really with -M? Looks the same to me..

Cheers,

> 
> Thanks,
> Jackie
> 
> >
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v1.4.5 (Darwin)
> > Comment: GPGTools - http://gpgtools.org
> >
> > iD8DBQFQZg/jMkyGM64RGpERAmQGAJ9FvNdtkcgp25H/NSAQn0jUH3adAgCeIdTv
> > OYcMi5OfStUutSiA4pTuEG8=
> > =TXyy
> > -----END PGP SIGNATURE-----
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> >
> 
> -- 
> Jackie Huang
> WIND RIVER | China Development Center
> MSN:jackielily@hotmail.com
> Tel: +86 8477 8594
> Mobile: +86 138 1027 4745
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
jackie huang - Sept. 29, 2012, 7:53 a.m.
On 9/29/2012 3:27 PM, Martin Jansa wrote:
> On Sat, Sep 29, 2012 at 10:01:49AM +0800, jhuang0 wrote:
>>
>>
>> On 9/29/2012 5:00 AM, Koen Kooi wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> Op 28-09-12 05:21, jackie.huang@windriver.com schreef:
>>>> 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
>>>> ++++++++++++++++++++ meta-networking/recipes-daemons/ptpd/ptpd_1.0.0.bb |
>>>> 20 +++++++++++++++ .../ptpd/ptpd-1.0.0/add-limit-h.patch              |
>>>> 26 -------------------- meta-oe/recipes-connectivity/ptpd/ptpd_1.0.0.bb
>>>> |   20 ---------------
>>>
>>> Can you resend that with -m?
>>
>> Resent, thanks!
>
> And was it really with -M? Looks the same to me..

Sorry, I misunderstood with -m option, resent again with -M.

Thanks,
Jackie

>
> Cheers,
>
>>
>> Thanks,
>> Jackie
>>
>>>
>>> -----BEGIN PGP SIGNATURE-----
>>> Version: GnuPG v1.4.5 (Darwin)
>>> Comment: GPGTools - http://gpgtools.org
>>>
>>> iD8DBQFQZg/jMkyGM64RGpERAmQGAJ9FvNdtkcgp25H/NSAQn0jUH3adAgCeIdTv
>>> OYcMi5OfStUutSiA4pTuEG8=
>>> =TXyy
>>> -----END PGP SIGNATURE-----
>>>
>>>
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>>
>>
>> --
>> Jackie Huang
>> WIND RIVER | China Development Center
>> MSN:jackielily@hotmail.com
>> Tel: +86 8477 8594
>> Mobile: +86 138 1027 4745
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

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_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-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
-}