On 08/12/11 08:40, Danek Duvall wrote:
Danek Duvall wrote:[Got Rich's email right this time.] This fixes a couple of build-reproduction problems, as well as a couple of other small build bugs. https://cr.opensolaris.org/action/browse/pkg/dduvall/pydates/ I've copied Rich and James for the mercurial expertise (the pydates script), if they're willing and able to take a look. It works, but I cobbled it together without a whole lot of knowledge of the mercurial API, so I've probably done things suboptimally.Still looking for reviewers on this one. It's been updated since with a couple of small bugfixes: 18799 add system/header to pkg:/developer/opensolaris/pkg5 18802 'make packages' fails when osnet-incorporation from recent builds is installed The patch is small, so I'm including it inline. --- old/src/pkg/Makefile Fri Aug 12 08:35:32 2011 +++ new/src/pkg/Makefile Fri Aug 12 08:35:31 2011 @@ -27,7 +27,7 @@ BUILDNUM = $(BUILDNUM.cmd:sh) CHANGESET.cmd = hg id -i CHANGESET = $(CHANGESET.cmd:sh) -CURBUILD.cmd = $(PKG) -R / list -H osnet-incorporation | sed -e 's/.*-0\.\([^ ]*\).*/\1/' +CURBUILD.cmd = $(PKG) -R / list -H osnet-incorporation | sed -e 's/.*-0\.\([^ .]*\).*/\1/' CURBUILD = $(CURBUILD.cmd:sh) PKGVERS_BRANCH = 0.$(BUILDNUM) PKGVERS = $(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) @@ -56,7 +56,7 @@ $(PUBLISHALL)MANIFESTS:sh = (cd manifests; print *.p5m) PKGS.cmd = print $(MANIFESTS:%.p5m=%) | sed -e s/%2F/\\//g PKGS = $(PKGS.cmd:sh) -PKGCMDENV = PATH=$(PKGROOT)/usr/bin:/usr/bin PYTHONPATH=$(PKGROOT)/usr/lib/python2.6/vendor-packages +PKGCMDENV = PATH=$(PKGROOT)/usr/bin:/usr/sbin:/usr/bin PYTHONPATH=$(PKGROOT)/usr/lib/python2.6/vendor-packages PKG = $(PKGCMDENV) pkg PKGDEPEND = $(PKGCMDENV) pkgdepend PKGLINT = $(PKGCMDENV) pkglint --- old/src/pkg/external_deps.pkglintrc Fri Aug 12 08:35:32 2011 +++ new/src/pkg/external_deps.pkglintrc Fri Aug 12 08:35:32 2011 @@ -8,7 +8,9 @@ # match all versions of that particular package. If version # numbers are specified, we only match the given version. # -pkglint.action005.1.missing-deps = pkg:/archiver/gnu-tar +pkglint.action005.1.missing-deps = + pkg:/SUNWcs + pkg:/archiver/gnu-tar pkg:/crypto/ca-certificates pkg:/desktop/gksu pkg:/developer/assembler @@ -46,11 +48,11 @@ pkg:/library/python-2/simplejson-26 pkg:/package/svr4 pkg:/runtime/python-26 - pkg:/SUNWcs pkg:/shell/ksh pkg:/system/core-os pkg:/system/extended-system-utilities pkg:/system/font/xorg/xorg-core + pkg:/system/header pkg:/system/library pkg:/system/library/dbus pkg:/system/library/math --- old/src/pkg/manifests/developer%2Fopensolaris%2Fpkg5.p5m Fri Aug 12 08:35:32 2011 +++ new/src/pkg/manifests/developer%2Fopensolaris%2Fpkg5.p5m Fri Aug 12 08:35:32 2011 @@ -44,6 +44,7 @@ depend type=require fmri=pkg:/library/python-2/python-notify-26 depend type=require fmri=pkg:/package/svr4 depend type=require fmri=pkg:/runtime/python-26 +depend type=require fmri=pkg:/system/header depend type=require fmri=pkg:/system/linker depend type=require fmri=pkg:/text/tidy depend type=require fmri=pkg:/web/server/apache-22 No differences encountered No differences encountered No differences encountered --- old/src/setup.py Fri Aug 12 08:35:33 2011 +++ new/src/setup.py Fri Aug 12 08:35:33 2011 @@ -610,9 +610,10 @@ # the path at which the workspace lives, and not just on the interesting content # of the object. # -# In order to work around that deficiency, we create a new compiler class that -# looks at the argument indicating the output file, chdirs to its directory, and -# runs the real link with the output file set to just the base name of the file. +# In order to work around that bug (7076871), we create a new compiler class +# that looks at the argument indicating the output file, chdirs to its +# directory, and runs the real link with the output file set to just the base +# name of the file. # # Unfortunately, distutils isn't too customizable in this regard, so we have to # twiddle with a couple of the names in the distutils.ccompiler namespace: we
LGTM, -Shawn _______________________________________________ pkg-discuss mailing list pkg-discuss@opensolaris.org http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
