diff options
Diffstat (limited to 'meta-networking/recipes-support/traceroute')
-rw-r--r-- | meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch | 47 | ||||
-rw-r--r-- | meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | 44 |
2 files changed, 91 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch new file mode 100644 index 0000000000..2c030b55dd --- /dev/null +++ b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Fri, 17 Jan 2014 03:17:44 -0500 | ||
4 | Subject: [PATCH] Make.rules: filter-out the patches from subdirs | ||
5 | |||
6 | The $(subdirs) contains all the dirs under the ${B}, and this one: | ||
7 | |||
8 | do_unpack[cleandirs] = "${S}/patches" | ||
9 | |||
10 | will create a "patches" dir, then there will be compile errors, filter | ||
11 | out the patches will fix the problem. | ||
12 | |||
13 | Note: poky doesn't have this problem since it separates the ${S} and | ||
14 | ${B} | ||
15 | |||
16 | Upstream-Status: Inappropriate [OE specific] | ||
17 | |||
18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
19 | --- | ||
20 | Make.rules | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/Make.rules b/Make.rules | ||
24 | index b077cd5..0bfce2d 100644 | ||
25 | --- a/Make.rules | ||
26 | +++ b/Make.rules | ||
27 | @@ -97,7 +97,7 @@ endif | ||
28 | subdirs := $(filter-out $(SKIPDIRS), $(subdirs)) | ||
29 | endif | ||
30 | |||
31 | -install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs)) | ||
32 | +install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs)) | ||
33 | |||
34 | |||
35 | override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) | ||
36 | @@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) | ||
37 | INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs)) | ||
38 | LIBDIRS := $(filter $(LIBDIRS), $(subdirs)) | ||
39 | MODDIRS := $(filter $(MODDIRS), $(subdirs)) | ||
40 | -EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs)) | ||
41 | +EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs)) | ||
42 | MODUSERS := $(filter $(MODUSERS), $(subdirs)) | ||
43 | SBINUSERS := $(filter $(SBINUSERS), $(subdirs)) | ||
44 | |||
45 | -- | ||
46 | 1.7.10.4 | ||
47 | |||
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb new file mode 100644 index 0000000000..236bd12c30 --- /dev/null +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb | |||
@@ -0,0 +1,44 @@ | |||
1 | SUMMARY = "A new modern implementation of traceroute(8) utility for Linux systems" | ||
2 | DESCRIPTION = "The traceroute utility displays the route used by IP packets on \ | ||
3 | their way to a specified network (or Internet) host. Traceroute displays \ | ||
4 | the IP number and host name (if possible) of the machines along the \ | ||
5 | route taken by the packets. Traceroute is used as a network debugging \ | ||
6 | tool. If you're having network connectivity problems, traceroute will \ | ||
7 | show you where the trouble is coming from along the route." | ||
8 | SECTION = "console/network" | ||
9 | HOMEPAGE = "http://traceroute.sourceforge.net/" | ||
10 | LICENSE = "GPL-2.0 LGPL-2.1" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
12 | file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" | ||
13 | |||
14 | PR = "r1" | ||
15 | |||
16 | inherit update-alternatives | ||
17 | |||
18 | SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \ | ||
19 | file://filter-out-the-patches-from-subdirs.patch \ | ||
20 | " | ||
21 | |||
22 | SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef" | ||
23 | SRC_URI[sha256sum] = "5994a88520927fefe3c9754aaf1e02b4d0f3f8fb1f521a68fa86215c3fcab9ef" | ||
24 | |||
25 | do_compile() { | ||
26 | export LDFLAGS="${TARGET_LDFLAGS} -L${S}/libsupp" | ||
27 | oe_runmake "env=yes" | ||
28 | } | ||
29 | |||
30 | do_install() { | ||
31 | install -d ${D}${bindir} | ||
32 | install -m755 ${BPN}/${BPN} ${D}${bindir} | ||
33 | |||
34 | install -m755 wrappers/tcptraceroute ${D}${bindir} | ||
35 | |||
36 | install -d ${D}${mandir} | ||
37 | install -p -m644 ${BPN}/${BPN}.8 ${D}${mandir} | ||
38 | ln -s ${BPN}.8 ${D}${mandir}/${BPN}6.8 | ||
39 | ln -s ${BPN}.8 ${D}${mandir}/tcptraceroute.8 | ||
40 | |||
41 | } | ||
42 | |||
43 | ALTERNATIVE_${PN} = "traceroute" | ||
44 | ALTERNATIVE_LINK_NAME[traceroute] = "${bindir}/traceroute" | ||