Fix builds with pkg 153 default tip
authorJon Tibble <meths@btinternet.com>
Thu, 02 Dec 2010 12:39:52 +0000
changeset 8 f949115789a8
parent 7 92e60ef9bdcb
Fix builds with pkg 153
series
vpanels-pkgdepend-153-fix
--- a/series	Fri Oct 29 01:59:52 2010 +0100
+++ b/series	Thu Dec 02 12:39:52 2010 +0000
@@ -3,3 +3,4 @@
 oi-branding-java-vpanels-panels-hypervisor
 oi-releng-disable_hypervisor
 oi-releng-force_pkgver
+vpanels-pkgdepend-153-fix
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vpanels-pkgdepend-153-fix	Thu Dec 02 12:39:52 2010 +0000
@@ -0,0 +1,23 @@
+diff -r e06e787fb463 usr/src/pkg/Makefile
+--- a/usr/src/pkg/Makefile	Wed Nov 24 15:02:13 2010 -0800
++++ b/usr/src/pkg/Makefile	Thu Dec 02 04:34:32 2010 -0800
+@@ -36,6 +36,10 @@
+ PKGARCH64_sparc=sparcv9
+ PKGARCH64_i386=amd64
+ 
++# Root of pkg image to use for dependency resolution
++# Normally / on the machine used to build the binaries
++PKGDEP_RESOLVE_IMAGE = /
++
+ # The name of the package repo in $(PKG_DIR)
+ PKGPUBLISHER_normal :sh= /usr/bin/uname -n
+ PKGPUBLISHER_wos = vpanels
+@@ -162,7 +166,7 @@
+ #
+ 
+ $(RESS): $(DEPS)
+-	pkgdepend resolve -m $(DEPS)
++	pkgdepend -R $(PKGDEP_RESOLVE_IMAGE) resolve -m $(DEPS)
+ 
+ #
+ # Step 5a