Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23228877 prepare for removal of /usr/gnu/bin/patch
authorEsha Wang <esha.wang@oracle.com>
Thu, 29 Sep 2016 15:07:39 -0700
changeset 7003 539760b03c07
parent 7002 c68461b25ddb
child 7004 e6de22056378
23228877 prepare for removal of /usr/gnu/bin/patch
components/gpatch/patch.p5m file | annotate | diff | comparison | revisions
components/quilt/quilt.p5m file | annotate | diff | comparison | revisions
make-rules/prep-patch.mk file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/gpatch/patch.p5m	Thu Sep 29 13:43:36 2016 -0700
+++ b/components/gpatch/patch.p5m	Thu Sep 29 15:07:39 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,9 +32,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/1999/555 value=PSARC/2014/324
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/bin/gpatch target=../gnu/bin/patch facet.compat.gnulinks=true
-link path=usr/bin/patch target=../gnu/bin/patch
-file usr/bin/patch path=usr/gnu/bin/patch
+link path=usr/bin/gpatch target=../bin/patch facet.compat.gnulinks=true
+file path=usr/bin/patch
+link path=usr/gnu/bin/patch target=../../bin/patch
 file usr/share/man/man1/patch.1 path=usr/gnu/share/man/man1/patch.1
 link path=usr/share/man/man1/gpatch.1 \
     target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=all
--- a/components/quilt/quilt.p5m	Thu Sep 29 13:43:36 2016 -0700
+++ b/components/quilt/quilt.p5m	Thu Sep 29 15:07:39 2016 -0700
@@ -65,7 +65,7 @@
 link path=usr/share/quilt/compat/find target=../../../gnu/bin/find
 link path=usr/share/quilt/compat/getopt target=../../../gnu/bin/getopt
 link path=usr/share/quilt/compat/grep target=../../../gnu/bin/grep
-link path=usr/share/quilt/compat/patch target=../../../gnu/bin/patch
+link path=usr/share/quilt/compat/patch target=../../../bin/patch
 link path=usr/share/quilt/compat/perl \
     target=../../../perl5/$(PERL_VERSION)/bin/perl
 link path=usr/share/quilt/compat/sed target=../../../gnu/bin/sed
@@ -109,6 +109,7 @@
 file path=usr/share/quilt/upgrade
 license quilt.license license=GPLv2
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/column
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/patch
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/awk
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/cp
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/date
@@ -116,7 +117,6 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/find
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/getopt
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/grep
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/patch
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/sed
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tail
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tar
--- a/make-rules/prep-patch.mk	Thu Sep 29 13:43:36 2016 -0700
+++ b/make-rules/prep-patch.mk	Thu Sep 29 15:07:39 2016 -0700
@@ -23,7 +23,7 @@
 # Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-GPATCH =	/usr/gnu/bin/patch
+GPATCH =	/usr/bin/patch
 PATCH_LEVEL ?=	1
 GPATCH_BACKUP =	--backup --version-control=numbered
 GPATCH_FLAGS =	--strip=$(PATCH_LEVEL) $(GPATCH_BACKUP)
@@ -53,7 +53,7 @@
 PARFAIT_PATCH_DIR =	parfait
 endif
 
-ALL_PATCHES =	$(shell find $(PATCH_DIR) $(PARFAIT_PATCH_DIR) -type f \
+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 $(ALL_PATCHES)))))
+PCH_SUFFIXES = $(sort $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(PATCHES)))))
 
 define patch-variables
 
 ifeq ($(1),_0)
 PATCH_PATTERN$(1) ?=	%.patch
-PATCHES$(1) = $(filter %.patch,$(ALL_PATCHES))
+PATCHES$(1) = $(filter %.patch,$(PATCHES))
 else
 PATCH_PATTERN$(1) ?=	%.patch$(1)
-PATCHES$(1) = $(filter %.patch$(1),$(ALL_PATCHES))
+PATCHES$(1) = $(filter %.patch$(1),$(PATCHES))
 endif
 
 ifneq ($$(PATCHES$(1)),)
--- a/make-rules/shared-macros.mk	Thu Sep 29 13:43:36 2016 -0700
+++ b/make-rules/shared-macros.mk	Thu Sep 29 15:07:39 2016 -0700
@@ -664,7 +664,7 @@
 DOXYGEN =	/usr/bin/doxygen
 ELFEDIT =	/usr/bin/elfedit
 GMAKE =		/usr/gnu/bin/make
-GPATCH =	/usr/gnu/bin/patch
+GPATCH =	/usr/bin/patch
 PATCH_LEVEL =	1
 GPATCH_BACKUP =	--backup --version-control=numbered
 GPATCH_FLAGS =	-p$(PATCH_LEVEL) $(GPATCH_BACKUP)
upstream/oracle/userland-gate