diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-01-20 20:52:35 +0800 |
---|---|---|
committer | Joe MacDonald <joe.macdonald@windriver.com> | 2014-03-27 15:41:13 -0400 |
commit | d9f21ab787c8eef2cfdc1f5408f973ebbcc196e2 (patch) | |
tree | 219b4c234dea68768c5994773310a9b574b7a03b /meta-networking | |
parent | 61d573ad7c9d3969db5ea3799308e5b1633bb60e (diff) | |
download | meta-openembedded-contrib-d9f21ab787c8eef2cfdc1f5408f973ebbcc196e2.tar.gz |
traceroute: filter-out patches dir
The $(subdirs) contains all the dirs under the ${B}, and this one:
do_unpack[cleandirs] = "${S}/patches"
will create a "patches" dir, then there will be compile errors, filter
out the patches will fix the problem.
Note: poky doesn't have this problem since it separates the ${S} and
${B}
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Diffstat (limited to 'meta-networking')
-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 | 1 |
2 files changed, 48 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 @@ +From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 17 Jan 2014 03:17:44 -0500 +Subject: [PATCH] Make.rules: filter-out the patches from subdirs + +The $(subdirs) contains all the dirs under the ${B}, and this one: + +do_unpack[cleandirs] = "${S}/patches" + +will create a "patches" dir, then there will be compile errors, filter +out the patches will fix the problem. + +Note: poky doesn't have this problem since it separates the ${S} and +${B} + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Make.rules | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Make.rules b/Make.rules +index b077cd5..0bfce2d 100644 +--- a/Make.rules ++++ b/Make.rules +@@ -97,7 +97,7 @@ endif + subdirs := $(filter-out $(SKIPDIRS), $(subdirs)) + endif + +-install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs)) ++install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs)) + + + override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) +@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) + INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs)) + LIBDIRS := $(filter $(LIBDIRS), $(subdirs)) + MODDIRS := $(filter $(MODDIRS), $(subdirs)) +-EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs)) ++EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs)) + MODUSERS := $(filter $(MODUSERS), $(subdirs)) + SBINUSERS := $(filter $(SBINUSERS), $(subdirs)) + +-- +1.7.10.4 + diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb index 83ac5a7427..236bd12c30 100644 --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb @@ -16,6 +16,7 @@ PR = "r1" inherit update-alternatives SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \ + file://filter-out-the-patches-from-subdirs.patch \ " SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef" |