equal
deleted
inserted
replaced
1 Override pkg version passed to pkgmogrify |
1 Override pkg version passed to pkgmogrify |
2 |
2 |
3 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile |
3 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile |
4 --- a/usr/src/pkg/Makefile |
4 --- a/usr/src/pkg/Makefile |
5 +++ b/usr/src/pkg/Makefile |
5 +++ b/usr/src/pkg/Makefile |
6 @@ -26,7 +26,7 @@ |
6 @@ -26,14 +26,16 @@ |
7 include $(SRC)/Makefile.env |
7 include $(SRC)/Makefile.env |
8 |
8 |
9 PKGVERS_CMD = $(PKG) list -Hv package/pkg | $(SED) 's/^.*@\(.*\):.*/\1.1/' |
9 PKGVERS_CMD = $(PKG) list -Hv package/pkg | $(SED) 's/^.*@\(.*\):.*/\1.1/' |
10 -PKGVERS = $(PKGVERS_CMD:sh) |
10 -PKGVERS = $(PKGVERS_CMD:sh) |
11 +PKGVERS = 0.5.11,5.11-0.147.1 |
11 +#PKGVERS = $(PKGVERS_CMD:sh) |
|
12 +PKGVERS = 0.5.11,5.11-0.148 |
12 |
13 |
13 ARCH:sh=uname -p |
14 ARCH:sh=uname -p |
14 ARCH64_sparc=sparcv9 |
15 ARCH64_sparc=sparcv9 |
|
16 ARCH64_i386=amd64 |
|
17 |
|
18 # The name of the package repo in $(PKG_DIR) |
|
19 -PKGPUBLISHER :sh= /usr/bin/uname -n |
|
20 +#PKGPUBLISHER :sh= /usr/bin/uname -n |
|
21 +PKGPUBLISHER = openindiana.org |
|
22 PKG_DIR = $(CODEMGR_WS)/packages/$(ISA) |
|
23 PKG_REPO_LOCAL = file://$(PKG_DIR) |
|
24 PKG_REPO = $(PKG_REPO_LOCAL) |