oi-releng-force_pkgver
author Jon Tibble <meths@btinternet.com>
Thu, 02 Dec 2010 12:39:52 +0000
changeset 8 f949115789a8
parent 5 61ac7eb971d2
permissions -rw-r--r--
Fix builds with pkg 153

Override pkg version passed to pkgmogrify

diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -28,7 +28,7 @@
 TYPE=normal
 BUILD=BUILD_NOT_DEFINED
 PKGVERS_CMD = $(PKG) list -Hv package/pkg | $(SED) 's/^.*@\(.*\):.*/\1.1/'
-PKGVERS_normal = $(PKGVERS_CMD:sh)
+PKGVERS_normal = 0.5.11,5.11-0.150
 PKGVERS_wos = 0.5.11,5.11-0.$(BUILD)
 PKGVERS=$(PKGVERS_$(TYPE))
 
@@ -37,7 +37,7 @@
 ARCH64_i386=amd64
 
 # The name of the package repo in $(PKG_DIR)
-PKGPUBLISHER_normal :sh= /usr/bin/uname -n
+PKGPUBLISHER_normal = openindiana.org
 PKGPUBLISHER_wos = vpanels
 PKGPUBLISHER=$(PKGPUBLISHER_$(TYPE))