Here is a fix for
18852 pkg(5) consolidation needs to conform to new Solaris versioning scheme
https://defect.opensolaris.org/bz/show_bug.cgi?id=18852
which is short enough to put in-line for anyone who wishes to review it:
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -26,13 +26,18 @@ PKGVERS_BUILTON = 5.11
BUILDNUM.cmd = \
hg tags | nawk '$$1 ~ /^in[0-9]*$$/ {print substr($$1, 3) + 1;
exit}'
BUILDNUM = $(BUILDNUM.cmd:sh)
+UPDATENUM = 0
+SRUNUM = 0
+PLATNUM = 0
+BUILDID = 0
+NIGHTLYID:sh = hg tip --template '{rev}'
CHANGESET.cmd = hg id -i
CHANGESET = $(CHANGESET.cmd:sh)
CURBUILD.cmd = \
$(PKG) -R / list -H osnet-incorporation | \
sed -e 's/.*-0\.\([^ .]*\).*/\1/'
CURBUILD = $(CURBUILD.cmd:sh)
-PKGVERS_BRANCH = 0.$(BUILDNUM)
+PKGVERS_BRANCH =
0.$(BUILDNUM).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).$(NIGHTLYID)
PKGVERS =
$(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
ARCH.cmd = uname -p
ARCH = $(ARCH.cmd:sh)
Thanks,
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
