Patchwork [meta-oe] linuxptp: fix and simplify recipe, drop dependency on kernel

login
register
mail settings
Submitter Denys Dmytriyenko
Date April 1, 2014, 4:47 a.m.
Message ID <1396327671-22282-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/69791/
State Accepted, archived
Headers show

Comments

Denys Dmytriyenko - April 1, 2014, 4:47 a.m.
From: Denys Dmytriyenko <denys@ti.com>

* Build script tries to locate the correct /usr/include/linux/net_tstamp.h just
to see if it contains definition for HWTSTAMP_TX_ONESTEP_SYNC. But that header
file hasn't changed in at least 5 years. The result of the check is to pass
additional defines to the build, which can be passed via EXTRA_OEMAKE.

* The sed command on makefile wasn't even working, plus there's no AR, prefix
is not used and better way is to use EXTRA_CFLAGS and EXTRA_LDFLAGS anyway.

* Neither autotools nor pkgconfig are use during the build, don't inherit them.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
Denys Dmytriyenko - April 6, 2014, 10:47 p.m.
ping

On Tue, Apr 01, 2014 at 12:47:51AM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> * Build script tries to locate the correct /usr/include/linux/net_tstamp.h just
> to see if it contains definition for HWTSTAMP_TX_ONESTEP_SYNC. But that header
> file hasn't changed in at least 5 years. The result of the check is to pass
> additional defines to the build, which can be passed via EXTRA_OEMAKE.
> 
> * The sed command on makefile wasn't even working, plus there's no AR, prefix
> is not used and better way is to use EXTRA_CFLAGS and EXTRA_LDFLAGS anyway.
> 
> * Neither autotools nor pkgconfig are use during the build, don't inherit them.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
> index c708b13..10d6744 100644
> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
> @@ -2,20 +2,13 @@ DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>  
> -DEPENDS = "virtual/kernel"
> -
>  SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz"
>  
>  SRC_URI[md5sum] = "a37ad2b2ef7d1ebc4d64a66d3fe55cdf"
>  SRC_URI[sha256sum] = "6cfd5291fb7394cc9f25458927874a203971b66b76d1c9d6568e007d0cbd81f2"
>  
> -inherit autotools pkgconfig
> -
> -EXTRA_OEMAKE = 'KBUILD_OUTPUT="${STAGING_KERNEL_DIR}" CROSS_COMPILE="${TARGET_PREFIX}"'
> -
> -do_configure_append () {
> -    find ${S} -name makefile | xargs sed -i 's,^\(CC\|CFLAGS\|prefix\|AR\)=,\1 ?=,g'
> -}
> +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} ARCH=${TARGET_ARCH} \
> +		EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC'"
>  
>  do_install () {
>      install -d ${D}/${bindir}
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Denys Dmytriyenko - April 10, 2014, 4:59 p.m.
ping^2...

On Sun, Apr 06, 2014 at 06:47:39PM -0400, Denys Dmytriyenko wrote:
> ping
> 
> On Tue, Apr 01, 2014 at 12:47:51AM -0400, Denys Dmytriyenko wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> > 
> > * Build script tries to locate the correct /usr/include/linux/net_tstamp.h just
> > to see if it contains definition for HWTSTAMP_TX_ONESTEP_SYNC. But that header
> > file hasn't changed in at least 5 years. The result of the check is to pass
> > additional defines to the build, which can be passed via EXTRA_OEMAKE.
> > 
> > * The sed command on makefile wasn't even working, plus there's no AR, prefix
> > is not used and better way is to use EXTRA_CFLAGS and EXTRA_LDFLAGS anyway.
> > 
> > * Neither autotools nor pkgconfig are use during the build, don't inherit them.
> > 
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >  meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb | 11 ++---------
> >  1 file changed, 2 insertions(+), 9 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
> > index c708b13..10d6744 100644
> > --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
> > +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
> > @@ -2,20 +2,13 @@ DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for
> >  LICENSE = "GPLv2"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> >  
> > -DEPENDS = "virtual/kernel"
> > -
> >  SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz"
> >  
> >  SRC_URI[md5sum] = "a37ad2b2ef7d1ebc4d64a66d3fe55cdf"
> >  SRC_URI[sha256sum] = "6cfd5291fb7394cc9f25458927874a203971b66b76d1c9d6568e007d0cbd81f2"
> >  
> > -inherit autotools pkgconfig
> > -
> > -EXTRA_OEMAKE = 'KBUILD_OUTPUT="${STAGING_KERNEL_DIR}" CROSS_COMPILE="${TARGET_PREFIX}"'
> > -
> > -do_configure_append () {
> > -    find ${S} -name makefile | xargs sed -i 's,^\(CC\|CFLAGS\|prefix\|AR\)=,\1 ?=,g'
> > -}
> > +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} ARCH=${TARGET_ARCH} \
> > +		EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC'"
> >  
> >  do_install () {
> >      install -d ${D}/${bindir}
> > -- 
> > 1.9.1
> > 
> > -- 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin Jansa - April 20, 2014, 9:05 a.m.
On Tue, Apr 01, 2014 at 12:47:51AM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> * Build script tries to locate the correct /usr/include/linux/net_tstamp.h just
> to see if it contains definition for HWTSTAMP_TX_ONESTEP_SYNC. But that header
> file hasn't changed in at least 5 years. The result of the check is to pass
> additional defines to the build, which can be passed via EXTRA_OEMAKE.
> 
> * The sed command on makefile wasn't even working, plus there's no AR, prefix
> is not used and better way is to use EXTRA_CFLAGS and EXTRA_LDFLAGS anyway.
> 
> * Neither autotools nor pkgconfig are use during the build, don't inherit them.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)

Sorry for delay caused by test-dependencies run, but finally merged,
thanks!

Patch

diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
index c708b13..10d6744 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.4.bb
@@ -2,20 +2,13 @@  DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "virtual/kernel"
-
 SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz"
 
 SRC_URI[md5sum] = "a37ad2b2ef7d1ebc4d64a66d3fe55cdf"
 SRC_URI[sha256sum] = "6cfd5291fb7394cc9f25458927874a203971b66b76d1c9d6568e007d0cbd81f2"
 
-inherit autotools pkgconfig
-
-EXTRA_OEMAKE = 'KBUILD_OUTPUT="${STAGING_KERNEL_DIR}" CROSS_COMPILE="${TARGET_PREFIX}"'
-
-do_configure_append () {
-    find ${S} -name makefile | xargs sed -i 's,^\(CC\|CFLAGS\|prefix\|AR\)=,\1 ?=,g'
-}
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} ARCH=${TARGET_ARCH} \
+		EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC'"
 
 do_install () {
     install -d ${D}/${bindir}