diff options
author | Franklin Cooper Jr <fcooper@ti.com> | 2014-06-25 07:53:03 -0500 |
---|---|---|
committer | Cliff Brake <cbrake@bec-systems.com> | 2014-07-01 15:08:25 -0400 |
commit | d436ffc7ba06107af54866f0d4ab11e4391cefb7 (patch) | |
tree | 4423277d6f98864a30811690e9a2e6e7030ebb8e | |
parent | a6dcf6265822ca1484d991d10a3042e04a960cdb (diff) | |
download | meta-openembedded-d436ffc7ba06107af54866f0d4ab11e4391cefb7.tar.gz |
ptpd: update to 2.3.0
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Signed-off-by: Cliff Brake <cbrake@bec-systems.com>
-rw-r--r-- | meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch | 37 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb (renamed from meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb) | 21 |
2 files changed, 11 insertions, 47 deletions
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 7d5251be3..000000000 --- a/meta-networking/recipes-daemons/ptpd/ptpd-2.2.0/ld-as-needed.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Patch from http://patch-tracker.debian.org/package/ptpd | ||
2 | |||
3 | Description: Fix ld --as-needed | ||
4 | This patch fixes the order of gcc arguments to fix ld --as-needed | ||
5 | Author: Roland Stigge <stigge@antcom.de> | ||
6 | Bug-Debian: http://bugs.debian.org/607583 | ||
7 | |||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
9 | --- | ||
10 | src/Makefile | 4 ++-- | ||
11 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/Makefile b/src/Makefile | ||
14 | index a672625..88a2fc8 100644 | ||
15 | --- a/src/Makefile | ||
16 | +++ b/src/Makefile | ||
17 | @@ -40,7 +40,7 @@ CFLAGS += -DDBG_SIGUSR2_CHANGE_DEBUG | ||
18 | |||
19 | CFLAGS += -DPTP_EXPERIMENTAL | ||
20 | |||
21 | -LDFLAGS+= -lm -lrt | ||
22 | +LIBS += -lm -lrt | ||
23 | |||
24 | PROG = ptpd | ||
25 | SRCS = ptpd.c arith.c bmc.c protocol.c display.c\ | ||
26 | @@ -63,7 +63,7 @@ TAGFILES = GPATH GRTAGS GSYMS GTAGS cscope.in.out cscope.out cscope.po.out | ||
27 | all: $(PROG) | ||
28 | |||
29 | $(PROG): $(OBJS) | ||
30 | - $(CC) -o $@ $(OBJS) $(LDFLAGS) | ||
31 | + $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) | ||
32 | |||
33 | $(OBJS): $(HDRS) | ||
34 | |||
35 | -- | ||
36 | 1.7.4 | ||
37 | |||
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb index f2e895d1c..54679dcf1 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." | |||
6 | HOMEPAGE = "http://sourceforge.net/projects/ptpd" | 6 | HOMEPAGE = "http://sourceforge.net/projects/ptpd" |
7 | SECTION = "network" | 7 | SECTION = "network" |
8 | LICENSE = "BSD" | 8 | LICENSE = "BSD" |
9 | LIC_FILES_CHKSUM = "file://../COPYRIGHT;md5=3d8ac2c46c116bce2d2ad838b6cf3491" | 9 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4019cad2b3cd55f22ea819ffad6ccd41" |
10 | 10 | ||
11 | PR = "r1" | 11 | DEPENDS = "libpcap" |
12 | 12 | ||
13 | SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz \ | 13 | inherit autotools |
14 | file://ld-as-needed.patch;striplevel=2 \ | ||
15 | " | ||
16 | 14 | ||
17 | SRC_URI[md5sum] = "c63a3a149d30c710773ccb02df5782a3" | 15 | SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz" |
18 | SRC_URI[sha256sum] = "f2266a22db84318d8b9ce266ea83772c03438c31f4993fa9643fa675a07c26b4" | ||
19 | 16 | ||
20 | S = "${WORKDIR}/ptpd-${PV}/src" | 17 | S = "${WORKDIR}/ptpd-${PV}" |
18 | SRC_URI[md5sum] = "f5e931b4a229705ff0dbdfe22490566b" | ||
19 | SRC_URI[sha256sum] = "1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7" | ||
21 | 20 | ||
22 | EXTRA_OEMAKE = "" | 21 | EXTRA_OEMAKE = "" |
23 | 22 | ||
23 | EXTRA_OECONF += "--disable-snmp" | ||
24 | |||
24 | do_install() { | 25 | do_install() { |
25 | install -d ${D}${bindir} ${D}${mandir}/man8 | 26 | install -d ${D}${bindir} ${D}${mandir}/man8 |
26 | install -m 0755 ptpd2 ${D}${bindir} | 27 | install -m 0755 ${B}/src/ptpd2 ${D}${bindir} |
27 | install -m 0644 ptpd2.8 ${D}${mandir}/man8 | 28 | install -m 0644 ${B}/src/ptpd2.8 ${D}${mandir}/man8 |
28 | } | 29 | } |