filter-out-the-patches-from-subdirs.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  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. The $(subdirs) contains all the dirs under the ${B}, and this one:
  6. do_unpack[cleandirs] = "${S}/patches"
  7. will create a "patches" dir, then there will be compile errors, filter
  8. out the patches will fix the problem.
  9. Note: poky doesn't have this problem since it separates the ${S} and
  10. ${B}
  11. Upstream-Status: Inappropriate [OE specific]
  12. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
  13. ---
  14. Make.rules | 4 ++--
  15. 1 file changed, 2 insertions(+), 2 deletions(-)
  16. diff --git a/Make.rules b/Make.rules
  17. index b077cd5..0bfce2d 100644
  18. --- a/Make.rules
  19. +++ b/Make.rules
  20. @@ -97,7 +97,7 @@ endif
  21. subdirs := $(filter-out $(SKIPDIRS), $(subdirs))
  22. endif
  23. -install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs))
  24. +install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs))
  25. override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
  26. @@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
  27. INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs))
  28. LIBDIRS := $(filter $(LIBDIRS), $(subdirs))
  29. MODDIRS := $(filter $(MODDIRS), $(subdirs))
  30. -EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))
  31. +EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs))
  32. MODUSERS := $(filter $(MODUSERS), $(subdirs))
  33. SBINUSERS := $(filter $(SBINUSERS), $(subdirs))
  34. --
  35. 1.7.10.4