http://cr.opensolaris.org/~mjnelson/webrev.pkg-root/
This fixes something I tripped over last night when my packages build failed. I have tested it by building the install and packages targets without the fix and without ROOT in my environment, and with the fix with and without ROOT in my environment, and comparing the resulting output of "cd proto/blah ; find . | sort" from each case. Patch attached at current hg tip. --Mark
# HG changeset patch # User Mark J. Nelson <[email protected]> # Date 1259881401 25200 # Node ID 50bbab06bd73005497fd12fdd0833c078115d437 # Parent deb36ca50ed2bc5b0c6222b7d6bd9d7f74f40b14 13044 pkg gate Makefiles should not break when /export/ws/mjnelson/ips-gate/proto/stupid-root-i386 is set in build environment diff --git a/src/gui/Makefile b/src/gui/Makefile --- a/src/gui/Makefile +++ b/src/gui/Makefile @@ -28,29 +28,30 @@ PYTHON = /usr/bin/python2.6 INSTALL = /usr/sbin/install -s -ROOT = ../../proto/root_${MACH}/usr -ROOTETC = ../../proto/root_${MACH}/etc -ROOTSHARE = $(ROOT)/share/package-manager -ROOTUSRLIB = $(ROOT)/lib +ROOT = ../../proto/root_${MACH} +ROOTUSR = $(ROOT)/usr +ROOTETC = $(ROOT)/etc +ROOTUSRSHARE = $(ROOTUSR)/share/package-manager +ROOTUSRLIB = $(ROOTUSR)/lib -ROOTAPPICONSHARE = $(ROOT)/share/icons/hicolor/48x48/apps -ROOTAPPHIGHICONSHARE = $(ROOT)/share/icons/HighContrast/48x48/apps -ROOTDATASHARE = $(ROOTSHARE)/data -ROOTDESKTOPSHARE = $(ROOT)/share/applications +ROOTAPPICONSHARE = $(ROOTUSR)/share/icons/hicolor/48x48/apps +ROOTAPPHIGHICONSHARE = $(ROOTUSR)/share/icons/HighContrast/48x48/apps +ROOTDATASHARE = $(ROOTUSRSHARE)/data +ROOTDESKTOPSHARE = $(ROOTUSR)/share/applications ROOTGCONFSHARE = $(ROOTETC)/gconf/schemas -ROOTHELPSHARE = $(ROOT)/share/gnome/help/package-manager -ROOTHIGHICON16SHARE = $(ROOTSHARE)/icons/HighContrast/16x16/actions -ROOTHIGHICON24SHARE = $(ROOTSHARE)/icons/HighContrast/24x24/actions -ROOTHIGHICON48SHARE = $(ROOTSHARE)/icons/HighContrast/48x48/actions -ROOTICON16SHARE = $(ROOTSHARE)/icons/hicolor/16x16/actions -ROOTICON24SHARE = $(ROOTSHARE)/icons/hicolor/24x24/actions -ROOTICON48SHARE = $(ROOTSHARE)/icons/hicolor/48x48/actions -ROOTMIMEICONSHARE = $(ROOT)/share/icons/hicolor/48x48/mimetypes -ROOTMIMETYPESHARE = $(ROOT)/share/mime/packages +ROOTHELPSHARE = $(ROOTUSR)/share/gnome/help/package-manager +ROOTHIGHICON16SHARE = $(ROOTUSRSHARE)/icons/HighContrast/16x16/actions +ROOTHIGHICON24SHARE = $(ROOTUSRSHARE)/icons/HighContrast/24x24/actions +ROOTHIGHICON48SHARE = $(ROOTUSRSHARE)/icons/HighContrast/48x48/actions +ROOTICON16SHARE = $(ROOTUSRSHARE)/icons/hicolor/16x16/actions +ROOTICON24SHARE = $(ROOTUSRSHARE)/icons/hicolor/24x24/actions +ROOTICON48SHARE = $(ROOTUSRSHARE)/icons/hicolor/48x48/actions +ROOTMIMEICONSHARE = $(ROOTUSR)/share/icons/hicolor/48x48/mimetypes +ROOTMIMETYPESHARE = $(ROOTUSR)/share/mime/packages ROOTPYTHON = $(ROOTUSRLIB)/python2.6 ROOTPYTHONPKG = $(ROOTPYTHONVENDOR)/pkg/gui ROOTPYTHONVENDOR = $(ROOTPYTHON)/vendor-packages -ROOTSPSHARE = $(ROOTSHARE)/data/startpagebase +ROOTSPSHARE = $(ROOTUSRSHARE)/data/startpagebase ROOTDIRS = \ $(ROOTAPPICONSHARE) \ @@ -70,7 +71,7 @@ $(ROOTMIMEICONSHARE) \ $(ROOTMIMETYPESHARE) \ $(ROOTPYTHONPKG) \ - $(ROOTSHARE) \ + $(ROOTUSRSHARE) \ $(ROOTSPSHARE) APPICONS = \ @@ -235,7 +236,7 @@ ROOTICONS24 = $(ICONS24:data/icons/24x24/%=$(ROOTICON24SHARE)/%) ROOTICONS48 = $(ICONS48:data/icons/48x48/%=$(ROOTICON48SHARE)/%) -ROOTPYGLADE = $(ROOTSHARE)/packagemanager.glade +ROOTPYGLADE = $(ROOTUSRSHARE)/packagemanager.glade # # .py and .pyc files @@ -392,5 +393,5 @@ $(ROOTPYTHONPKG)/%: $(ROOTDIRS) modules/% $(INSTALL) -f $(ROOTPYTHONPKG) -m 0644 $< -$(ROOTSHARE)/%: $(ROOTDIRS) data/% - $(INSTALL) -f $(ROOTSHARE) -m 0644 $< +$(ROOTUSRSHARE)/%: $(ROOTDIRS) data/% + $(INSTALL) -f $(ROOTUSRSHARE) -m 0644 $< diff --git a/src/um/Makefile b/src/um/Makefile --- a/src/um/Makefile +++ b/src/um/Makefile @@ -28,23 +28,24 @@ PYTHON = /usr/bin/python INSTALL = /usr/sbin/install -s -ROOT = ../../proto/root_${MACH}/usr -ROOTETC = ../../proto/root_${MACH}/etc -ROOTLIB = ../../proto/root_${MACH}/lib -ROOTSHARE = $(ROOT)/share/update-manager -ROOTUSRLIB = $(ROOT)/lib +ROOT = ../../proto/root_${MACH} +ROOTUSR = $(ROOT)/usr +ROOTETC = $(ROOT)/etc +ROOTLIB = $(ROOT)/lib +ROOTUSRSHARE = $(ROOTUSR)/share/update-manager +ROOTUSRLIB = $(ROOTUSR)/lib -ROOTAPPICONSHARE = $(ROOT)/share/icons/hicolor/48x48/apps +ROOTAPPICONSHARE = $(ROOTUSR)/share/icons/hicolor/48x48/apps ROOTAUTOSTARTSHARE = $(ROOTETC)/xdg/autostart -ROOTDESKTOPSHARE = $(ROOT)/share/applications +ROOTDESKTOPSHARE = $(ROOTUSR)/share/applications ROOTGCONFSHARE = $(ROOTETC)/gconf/schemas -ROOTICON24SHARE = $(ROOTSHARE)/icons/hicolor/24x24/actions -ROOTICON36SHARE = $(ROOTSHARE)/icons/hicolor/36x36/actions -ROOTICON48SHARE = $(ROOTSHARE)/icons/hicolor/48x48/actions +ROOTICON24SHARE = $(ROOTUSRSHARE)/icons/hicolor/24x24/actions +ROOTICON36SHARE = $(ROOTUSRSHARE)/icons/hicolor/36x36/actions +ROOTICON48SHARE = $(ROOTUSRSHARE)/icons/hicolor/48x48/actions ROOTPYTHON = $(ROOTUSRLIB)/python2.6 ROOTPYTHONPKG = $(ROOTPYTHONVENDOR)/pkg/um ROOTPYTHONVENDOR = $(ROOTPYTHON)/vendor-packages -ROOTSCRIPTSSHARE = $(ROOT)/lib/update-manager +ROOTSCRIPTSSHARE = $(ROOTUSRLIB)/update-manager ROOTSVCSHARE = $(ROOTLIB)/svc/method ROOTDIRS = \ @@ -57,7 +58,7 @@ $(ROOTICON48SHARE) \ $(ROOTPYTHONPKG) \ $(ROOTSCRIPTSSHARE) \ - $(ROOTSHARE) \ + $(ROOTUSRSHARE) \ $(ROOTSVCSHARE) APPICONS = \ @@ -105,7 +106,7 @@ ROOTICONS36 = $(ICONS36:data/icons/36x36/%=$(ROOTICON36SHARE)/%) ROOTICONS48 = $(ICONS48:data/icons/48x48/%=$(ROOTICON48SHARE)/%) -ROOTPYGLADE = $(PYGLADE:data/%=$(ROOTSHARE)/%) +ROOTPYGLADE = $(PYGLADE:data/%=$(ROOTUSRSHARE)/%) ROOTSCRIPTS = $(SCRIPTS:%=$(ROOTSCRIPTSSHARE)/%) @@ -206,8 +207,8 @@ $(ROOTSCRIPTSSHARE)/%: $(ROOTDIRS) % $(INSTALL) -f $(ROOTSCRIPTSSHARE) -m 0644 $< -$(ROOTSHARE)/%: $(ROOTDIRS) data/% - $(INSTALL) -f $(ROOTSHARE) -m 0644 $< +$(ROOTUSRSHARE)/%: $(ROOTDIRS) data/% + $(INSTALL) -f $(ROOTUSRSHARE) -m 0644 $< $(ROOTSVCSHARE)/%: $(ROOTDIRS) % $(INSTALL) -f $(ROOTSVCSHARE) -m 0644 $< diff --git a/src/util/distro-import/Makefile b/src/util/distro-import/Makefile --- a/src/util/distro-import/Makefile +++ b/src/util/distro-import/Makefile @@ -20,14 +20,14 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #set default ARCH=i386 NATIVE_ARCH:sh = uname -p -PROTO_AREA=../../../proto/root_$(NATIVE_ARCH) +ROOT=../../../proto/root_$(NATIVE_ARCH) # # Needs to point to filesystem on Solaris install dvd @@ -109,10 +109,10 @@ GLOBAL_CHATTRS_128 = $(GLOBAL_CHATTRS_124) GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID)) -SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \ +SOLARIS.PY=PYTHONPATH=$(ROOT)/usr/lib/python2.6/vendor-packages \ ./importer.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \ $(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \ - -p $(PROTO_AREA) + -p $(ROOT) # # always remove the following (editable) files from packages we bulk import; diff --git a/src/util/publish/Makefile b/src/util/publish/Makefile --- a/src/util/publish/Makefile +++ b/src/util/publish/Makefile @@ -24,8 +24,8 @@ ARCH:sh= uname -p REPO=http://localhost:10000 MERGEDIR=../../../proto/merge -PROTO=../../../proto/root_$(ARCH) -PYTHONPATH=$(PROTO)/usr/lib/python2.6/vendor-packages +ROOT=../../../proto/root_$(ARCH) +PYTHONPATH=$(ROOT)/usr/lib/python2.6/vendor-packages SPARC_REPO=http://localhost:10001 i386_REPO=http://localhost:10002 EXTRA_ARGS=
_______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
