From: Francois Gervais <fgervais@distech-controls.com>
Date: Fri, 21 Feb 2020 14:40:23 +0000 (-0500)
Subject: package/rcw: allow not having custom rcwi files
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=78a9eab661c2e097a43fbee780f80423701796be;p=buildroot.git

package/rcw: allow not having custom rcwi files

A project could quite possibly have a custom rcw file
that does not rely on any custom rcw include files (rcwi).

Allow the build to succeed if this is the case.

Signed-off-by: Francois Gervais <fgervais@distech-controls.com>
[yann.morin.1998@free.fr: install includes in a separate hook]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---

diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk
index 36d2da61b5..81e22fff93 100644
--- a/package/rcw/rcw.mk
+++ b/package/rcw/rcw.mk
@@ -13,6 +13,7 @@ RCW_LICENSE_FILES = LICENSE
 RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH))
 
 ifneq ($(RCW_FILES),)
+RCW_INCLUDES = $(filter-out %.rcw,$(RCW_FILES))
 # Get the name of the custom rcw file from the custom list
 RCW_PROJECT = $(notdir $(filter %.rcw,$(RCW_FILES)))
 
@@ -23,9 +24,16 @@ $(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file)
 endif
 endif
 
+ifneq ($(RCW_INCLUDES),)
+define HOST_RCW_ADD_CUSTOM_RCW_INCLUDES
+	mkdir -p $(@D)/custom_board
+	cp -f $(RCW_INCLUDES) $(@D)/custom_board
+endef
+HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_INCLUDES
+endif
+
 define HOST_RCW_ADD_CUSTOM_RCW_FILES
 	mkdir -p $(@D)/custom_board/rcw
-	cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
 	cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
 endef
 HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES