diff options
Diffstat (limited to 'meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch')
-rw-r--r-- | meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch | 47 |
1 files changed, 47 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 000000000..2c030b55d --- /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 | |||