Re: [meta-networking][PATCH] ptpd: update to 2.3.0

[Joe MacDonald <joe@deserted.net>]

[-- Attachment #1: Type: text/plain, Size: 4215 bytes --]

[[oe] [meta-networking][PATCH] ptpd: update to 2.3.0] On 14.06.12 (Thu 13:10) Franklin S. Cooper Jr wrote:

> ---
>  .../ptpd/ptpd-2.2.0/ld-as-needed.patch             |   37 --------------------
>  .../ptpd/{ptpd_2.2.0.bb => ptpd_2.3.0.bb}          |   21 ++++++-----
>  2 files changed, 11 insertions(+), 47 deletions(-)
>  delete mode 100644 meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch
>  rename meta-networking/recipes-daemons/ptpd/{ptpd_2.2.0.bb => ptpd_2.3.0.bb} (57%)

I merged a version of this.  My changes are:

   - changed do_install to (hopefully) play nice with B!=S

   - explicitly disabled net-snmp support since it was not called out as
     a dependency in the recipe, it wasn't immediately obvious to me how
     to safely update the recipe to find the proper net-snmp support,
     and ntp already sets that precedent

   - removed setting of PR

Please also be sure to add a SOB line for any patches you send in the
future.

-J.

> 
> 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
> deleted file mode 100644
> index 7d5251b..0000000
> --- a/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -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_2.2.0.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb
> similarity index 57%
> rename from meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
> rename to meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb
> index f2e895d..1febbb1 100644
> --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
> +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb
> @@ -6,23 +6,24 @@ time coordination of LAN connected computers."
>  HOMEPAGE = "http://sourceforge.net/projects/ptpd"
>  SECTION = "network"
>  LICENSE = "BSD"
> -LIC_FILES_CHKSUM = "file://../COPYRIGHT;md5=3d8ac2c46c116bce2d2ad838b6cf3491"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4019cad2b3cd55f22ea819ffad6ccd41"
>  
> -PR = "r1"
> +DEPENDS = "libpcap"
>  
> -SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz \
> -           file://ld-as-needed.patch;striplevel=2 \
> -"
> +PR = "r0"
>  
> -SRC_URI[md5sum] = "c63a3a149d30c710773ccb02df5782a3"
> -SRC_URI[sha256sum] = "f2266a22db84318d8b9ce266ea83772c03438c31f4993fa9643fa675a07c26b4"
> +inherit autotools
>  
> -S = "${WORKDIR}/ptpd-${PV}/src"
> +SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz"
> +
> +S = "${WORKDIR}/ptpd-${PV}"
> +SRC_URI[md5sum] = "f5e931b4a229705ff0dbdfe22490566b"
> +SRC_URI[sha256sum] = "1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7"
>  
>  EXTRA_OEMAKE = ""
>  
>  do_install() {
>      install -d ${D}${bindir} ${D}${mandir}/man8
> -    install -m 0755 ptpd2 ${D}${bindir}
> -    install -m 0644 ptpd2.8 ${D}${mandir}/man8
> +    install -m 0755 ${S}/src/ptpd2 ${D}${bindir}
> +    install -m 0644 ${S}/src/ptpd2.8 ${D}${mandir}/man8
>  }
> -- 
> 1.7.0.4
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]