mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-06 16:58:24 +00:00
Code Issues Projects Releases Wiki Activity

traceroute: filter-out patches dir

Browse Source 
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>
This commit is contained in:
Robert Yang
2014-01-20 20:52:35 +08:00
committed by Joe MacDonald
parent 61d573ad7c
commit d9f21ab787
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch Normal file
View File

@@ -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

1
meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
View File

@@ -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"