On 08/18/12 11:27 AM, Danek Duvall wrote:
There are enough changes out for review right now that won't go into S11U1
that it's probably worthwhile branching to allow default to be s12, and for
people to push changes that would otherwise have to wait. Along with the
following change will be a changeset that introduces the "s11-update"
branch:
@ 2772:f939336f34c9 (none): 7192439 update package versions for S12
|
| o 2771:784edc95356c s11-update: create branch for S11 updates
|/
o 2770:96cbf714e29b (none): Added tag s11u1b22a for changeset 3962a3f5d4c5
Small, so it's inline:
7192439 update package versions for S12
This looks good to me. We've still got a lot of places in the code that
refer to 5.11. As I understand it, the majority of strings are only
used in places where we're creating a pkg.fmri.PkgFmri or a
pkg.version.Version and the build string isn't also declared in the fmri
string.
Would it make sense to use a global variable there instead of '5.11', or
are we happy to leave it as is, and expect that s12 release engineers
will use a pkglint check to flag build_release values == [5, 11] for any
packages that are being published?
Also, a nit - should
> + nawk '$$1 ~ /^s12b[0-9]*/ {exit} END {print substr($$1,
actually be:
> + nawk '$$1 ~ /^s12b[0-9]+/ {exit} END {print substr($$1,
s12b(one or more characters in the range 0-9), not s12(zero or more..)
cheers,
tim
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -21,20 +21,19 @@
# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights
reserved.
#
-PKGVERS_COMPONENT = 0.5.11
+PKGVERS_COMPONENT = 5.12
PKGVERS_BUILTON = 5.11
-BUILDNUM = 175
-UPDATENUM = 1
+UPDATENUM = 0
SRUNUM = 0
PLATNUM = 0
BUILDID.cmd = \
hg tags | \
- nawk '$$1 ~ /^s11u$(UPDATENUM)b[0-9]*/ {print substr($$1, 7) + 0;
exit}'
+ nawk '$$1 ~ /^s12b[0-9]*/ {exit} END {print substr($$1, 5) + 0}'
BUILDID = $(BUILDID.cmd:sh)
NIGHTLYID:sh = hg parents --template '{rev}'
CHANGESET:sh = hg id -i
PKGVERS_BRANCH = \
-
0.$(BUILDNUM).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).$(NIGHTLYID)
+
$(PKGVERS_COMPONENT).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).$(NIGHTLYID)
PKGVERS =
$(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
ARCH = $(TARGET_ARCH:-%=%)
REV:sh = date +%Y.%m.%d.%H.%M.%S
Thanks,
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
