| author | Jon Tibble <meths@btinternet.com> |
| Fri, 29 Oct 2010 00:39:33 +0100 | |
| changeset 5 | 61ac7eb971d2 |
| parent 2 | 4ed444ebfd67 |
| permissions | -rw-r--r-- |
|
0
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
1 |
Override pkg version passed to pkgmogrify |
|
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
2 |
|
|
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
3 |
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile |
|
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
4 |
--- a/usr/src/pkg/Makefile |
|
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
5 |
+++ b/usr/src/pkg/Makefile |
|
5
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
6 |
@@ -28,7 +28,7 @@ |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
7 |
TYPE=normal |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
8 |
BUILD=BUILD_NOT_DEFINED |
|
0
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
9 |
PKGVERS_CMD = $(PKG) list -Hv package/pkg | $(SED) 's/^.*@\(.*\):.*/\1.1/' |
|
5
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
10 |
-PKGVERS_normal = $(PKGVERS_CMD:sh) |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
11 |
+PKGVERS_normal = 0.5.11,5.11-0.150 |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
12 |
PKGVERS_wos = 0.5.11,5.11-0.$(BUILD) |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
13 |
PKGVERS=$(PKGVERS_$(TYPE)) |
|
0
fbc79057b3aa
Add vpanels rebranding and RE patches
Albert Lee <trisk@opensolaris.org>
parents:
diff
changeset
|
14 |
|
|
5
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
15 |
@@ -37,7 +37,7 @@ |
|
2
4ed444ebfd67
Version and publisher for oi_148
Jon Tibble <meths@btinternet.com>
parents:
0
diff
changeset
|
16 |
ARCH64_i386=amd64 |
|
4ed444ebfd67
Version and publisher for oi_148
Jon Tibble <meths@btinternet.com>
parents:
0
diff
changeset
|
17 |
|
|
4ed444ebfd67
Version and publisher for oi_148
Jon Tibble <meths@btinternet.com>
parents:
0
diff
changeset
|
18 |
# The name of the package repo in $(PKG_DIR) |
|
5
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
19 |
-PKGPUBLISHER_normal :sh= /usr/bin/uname -n |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
20 |
+PKGPUBLISHER_normal = openindiana.org |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
21 |
PKGPUBLISHER_wos = vpanels |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
22 |
PKGPUBLISHER=$(PKGPUBLISHER_$(TYPE)) |
|
61ac7eb971d2
Update version and publisher for oi_150
Jon Tibble <meths@btinternet.com>
parents:
2
diff
changeset
|
23 |