Mercurial Mercurial > sustaining > oi_151a > pkg-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.
Fix repo locations and set build to 0.151.1 oi_151a oi_151a_release
authorJon Tibble <meths@btinternet.com>
Sat, 24 Dec 2011 13:50:07 +0000
branchoi_151a
changeset 2534 118f60b6b710
parent 2533 c021373fbc44
child 2535 93ecdf531d8e
Fix repo locations and set build to 0.151.1
src/util/distro-import/151/common/gnome:theme:blueprint file | annotate | diff | comparison | revisions
src/util/distro-import/Makefile file | annotate | diff | comparison | revisions
src/util/publish/Makefile file | annotate | diff | comparison | revisions
src/util/publish/set-publisher.transforms file | annotate | diff | comparison | revisions 
--- a/src/util/distro-import/151/common/gnome:theme:blueprint	Sat Sep 03 04:26:00 2011 +0000
+++ b/src/util/distro-import/151/common/gnome:theme:blueprint	Sat Dec 24 13:50:07 2011 +0000
@@ -2,7 +2,7 @@
 consolidation "gnome"
 classification "Desktop (GNOME)/Theming"
 import SUNWblueprint
-chattr usr/share/doc group=other
+#chattr usr/share/doc group=other
 end package
 
 package SUNWblueprint
--- a/src/util/distro-import/Makefile	Sat Sep 03 04:26:00 2011 +0000
+++ b/src/util/distro-import/Makefile	Sat Dec 24 13:50:07 2011 +0000
@@ -86,7 +86,7 @@
 X_BUILDID=$(BUILDID)
 X_INCORPORATION=consolidation/X/[email protected].$(X_BUILDID)
 
-IPS_REPO=file://$(RELENG_ROOT)/pkg_151a/pkg_$(ARCH)
+IPS_REPO=file://$(RELENG_ROOT)/pkg_151a/$(ARCH)/repo
 IPS_BUILDID=$(BUILDID)
 IPS_INCORPORATION=consolidation/ips/[email protected].$(IPS_BUILDID)
 
@@ -101,8 +101,9 @@
 JAVA_REPO=file://$(RELENG_ROOT)/ub_javavm_151a/$(ARCH)/repo
 JAVA_BUILDID=$(BUILDID)
 UB_JAVAVM_INCORPORATION=consolidation/ub_javavm/[email protected].$(JAVA_BUILDID)
+DBTG_INCORPORATION=consolidation/dbtg/[email protected].$(JAVA_BUILDID)
 
-SICTEAM_REPO=file://$(RELENG_ROOT)/sic_team_151a/$(ARCH)/repo
+SICTEAM_REPO=file://$(RELENG_ROOT)/sic_team_151a/repo.redist
 SICTEAM_BUILDID=$(BUILDID)
 SICTEAM_INCORPORATION=consolidation/sic_team/[email protected].$(SICTEAM_BUILDID)
 
@@ -213,7 +214,7 @@
 CONSOLIDATION_OPTIONS_151 = $(CONSOLIDATION_OPTIONS_148) \
 	$(JAVA_CONSOLIDATION_OPTIONS) \
 	$(SICTEAM_CONSOLIDATION_OPTIONS) \
-	$(NVIDIA_CONSOLIDATION_OPTIONS) \
+	$(NVIDIA_CONSOLIDATION_OPTIONS)
 CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
 
 GLOBAL_CHATTRS_BASE=	\
@@ -284,7 +285,7 @@
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
-	./importer.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \
+	./importer.py -b 0.151.1 $(EXTRA_OPTIONS) -T \*.py \
 	$(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \
 	-p $(PROTO_AREA) $(EXTRA_ENTIRE_CONTENTS:%= -E %)
 
--- a/src/util/publish/Makefile	Sat Sep 03 04:26:00 2011 +0000
+++ b/src/util/publish/Makefile	Sat Dec 24 13:50:07 2011 +0000
@@ -25,9 +25,9 @@
 
 ARCH:sh=	uname -p
 
-RELENG_ROOT=/home/aszeszo/oi151/releng
+RELENG_ROOT=/net/infra01/export/integrate_dock/oi/oi_151a
 
-REPO=file://$(RELENG_ROOT)/repo
+REPO=file:///export/home/sustaining/richlowe-repo
 MERGEDIR=../../../proto/merge
 SETPUBLISHERDIR=../../../proto/set-publisher
 PROTO=../../../proto/root_$(ARCH)
@@ -37,14 +37,15 @@
 EXTRA_ARGS=
 JUST_THESE_PKGS=
 
-ON_REPO=file://$(RELENG_ROOT)/src-ips-repos/osnet/$(ARCH)/repo.redist
-INSTALL_REPO=file://$(RELENG_ROOT)/src-ips-repos/install/$(ARCH)/repo.redist
-X_REPO=file://$(RELENG_ROOT)/src-ips-repos/X/pkg_$(ARCH)
-IPS_REPO=file://$(RELENG_ROOT)/src-ips-repos/ips/$(ARCH)/repo
-VPANELS_REPO=file://$(RELENG_ROOT)/src-ips-repos/vpanels/$(ARCH)
-L10N_REPO=file://$(RELENG_ROOT)/src-ips-repos/l10n/$(ARCH)/repo.redist
-JAVA_REPO=file://$(RELENG_ROOT)/src-ips-repos/java/$(ARCH)
-SICTEAM_REPO=file://$(RELENG_ROOT)/src-ips-repos/sic_team/$(ARCH)
+ON_REPO=file://$(RELENG_ROOT)/illumos_151a/$(ARCH)/nightly-nd/repo.redist
+INSTALL_REPO=file://$(RELENG_ROOT)/slim_source_151a/$(ARCH)/nightly-nd/repo.redist
+NVIDIA_REPO=file://$(RELENG_ROOT)/oi-build_151a/$(ARCH)/repo
+X_REPO=file://$(RELENG_ROOT)/xnv_151a/pkg_$(ARCH)
+IPS_REPO=file://$(RELENG_ROOT)/pkg_151a/i386/repo
+VPANELS_REPO=file://$(RELENG_ROOT)/vpanels_151a/$(ARCH)
+L10N_REPO=file://$(RELENG_ROOT)/l10n_151a/$(ARCH)/repo.redist
+JAVA_REPO=file://$(RELENG_ROOT)/ub_javavm_151a/$(ARCH)/repo
+SICTEAM_REPO=file://$(RELENG_ROOT)/sic_team_151a/repo.redist
 
 INPUT_REPOS = \
     $(ON_REPO) \
@@ -54,7 +55,8 @@
     $(VPANELS_REPO) \
     $(L10N_REPO) \
     $(JAVA_REPO) \
-    $(SICTEAM_REPO)
+    $(SICTEAM_REPO) \
+    $(NVIDIA_REPO)
 
 ON_EXTRA_REPO=http://localhost:30000
 
--- a/src/util/publish/set-publisher.transforms	Sat Sep 03 04:26:00 2011 +0000
+++ b/src/util/publish/set-publisher.transforms	Sat Dec 24 13:50:07 2011 +0000
@@ -1,5 +1,9 @@
 <transform set name=pkg.fmri -> edit value pkg://[^/]+/ pkg://openindiana.org/>
 
+# Change the version to 151.1 per Alasdairrr
+<transform depend -> edit fmri "-0\.151$" "-0.151.1">
+<transform set name=pkg.fmri -> edit value "-0\.151:" "-0.151.1:">
+
 # 192 Need to package mogrify the IPS vendor strings
 <transform legacy -> default vendor "Project OpenIndiana">
 <transform legacy -> edit vendor "Sun Microsystems, Inc\." "Project OpenIndiana">
sustaining/oi_151a/pkg-gate