24751721 secondary source patches are not getting applied
authorDanek Duvall <danek.duvall@oracle.com>
Wed, 28 Sep 2016 14:52:01 -0700
changeset 6991 cddc7c0c4e9d
parent 6990 91745b13baa1
child 6992 359f1d9d5c6b
24751721 secondary source patches are not getting applied
make-rules/ips.mk
make-rules/prep-patch.mk
--- a/make-rules/ips.mk	Wed Sep 28 11:51:25 2016 -0700
+++ b/make-rules/ips.mk	Wed Sep 28 14:52:01 2016 -0700
@@ -486,7 +486,7 @@
 
 $(RESOLVED):	install
 
-canonical-manifests:	$(CANONICAL_MANIFESTS) $(MAKEFILE_PREREQ) $(PATCHES) \
+canonical-manifests:	$(CANONICAL_MANIFESTS) $(MAKEFILE_PREREQ) $(ALL_PATCHES) \
     $(HISTORY)
 ifeq	($(strip $(CANONICAL_MANIFESTS)),)
 	# If there were no canonical manifests in the workspace, nothing will
--- a/make-rules/prep-patch.mk	Wed Sep 28 11:51:25 2016 -0700
+++ b/make-rules/prep-patch.mk	Wed Sep 28 14:52:01 2016 -0700
@@ -53,7 +53,7 @@
 PARFAIT_PATCH_DIR =	parfait
 endif
 
-PATCHES =	$(shell find $(PATCH_DIR) $(PARFAIT_PATCH_DIR) -type f \
+ALL_PATCHES =	$(shell find $(PATCH_DIR) $(PARFAIT_PATCH_DIR) -type f \
 			 -name '$(PATCH_PATTERN)' 2>/dev/null | \
 				LC_COLLATE=C sort)
 
@@ -61,16 +61,16 @@
 # match the _X extensions to the COMPONENT_* make variables.  Find these
 # extensions, using $(sort) to uniq them to prevent multiple rules from
 # getting generated.
-PCH_SUFFIXES = $(sort $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(PATCHES)))))
+PCH_SUFFIXES = $(sort $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(ALL_PATCHES)))))
 
 define patch-variables
 
 ifeq ($(1),_0)
 PATCH_PATTERN$(1) ?=	%.patch
-PATCHES$(1) = $(filter %.patch,$(PATCHES))
+PATCHES$(1) = $(filter %.patch,$(ALL_PATCHES))
 else
 PATCH_PATTERN$(1) ?=	%.patch$(1)
-PATCHES$(1) = $(filter %.patch$(1),$(PATCHES))
+PATCHES$(1) = $(filter %.patch$(1),$(ALL_PATCHES))
 endif
 
 ifneq ($$(PATCHES$(1)),)