Mercurial > illumos > illumos-gate
changeset 13860:70c7a0a08e20
2563 remove python2.4 from onbld
Reviewed by: Bayard Bell <buffer.g.overflow@gmail.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Garrett D'Amore <garrett@damore.org>
author | Piotr Jasiukajtis <estibi@me.com> |
---|---|
date | Wed, 17 Oct 2012 01:35:22 -0700 |
parents | 76e0530c7265 |
children | c6a784e8dbc8 |
files | usr/src/Makefile.master usr/src/pkg/manifests/developer-build-onbld.mf usr/src/tools/Makefile usr/src/tools/Makefile.python usr/src/tools/Makefile.tools usr/src/tools/scripts/cddlchk.py usr/src/tools/scripts/copyrightchk.py usr/src/tools/scripts/git-pbchk.py usr/src/tools/scripts/hdrchk.py usr/src/tools/scripts/hg-active.py usr/src/tools/scripts/mapfilechk.py |
diffstat | 11 files changed, 15 insertions(+), 74 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/Makefile.master Wed Oct 17 01:35:22 2012 -0700 @@ -191,9 +191,8 @@ XREF= $(ONBLD_TOOLS)/bin/xref FIND= /usr/bin/find PERL= /usr/bin/perl -PYTHON_24= /usr/bin/python2.4 PYTHON_26= /usr/bin/python2.6 -PYTHON= $(PYTHON_24) +PYTHON= $(PYTHON_26) SORT= /usr/bin/sort TOUCH= /usr/bin/touch WC= /usr/bin/wc
--- a/usr/src/pkg/manifests/developer-build-onbld.mf Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/pkg/manifests/developer-build-onbld.mf Wed Oct 17 01:35:22 2012 -0700 @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2010, Richard Lowe +# Copyright 2012, Piotr Jasiukajtis # set name=pkg.fmri value=pkg:/developer/build/onbld@$(PKGVERS) @@ -47,11 +48,6 @@ dir path=opt/onbld/lib dir path=opt/onbld/lib/$(ARCH) dir path=opt/onbld/lib/perl -dir path=opt/onbld/lib/python2.4 -dir path=opt/onbld/lib/python2.4/onbld -dir path=opt/onbld/lib/python2.4/onbld/Checks -dir path=opt/onbld/lib/python2.4/onbld/Scm -dir path=opt/onbld/lib/python2.4/onbld/hgext dir path=opt/onbld/lib/python2.6 dir path=opt/onbld/lib/python2.6/onbld dir path=opt/onbld/lib/python2.6/onbld/Checks @@ -149,43 +145,6 @@ file path=opt/onbld/lib/$(ARCH)/libdwarf.so.1 file path=opt/onbld/lib/perl/onbld_elfmod.pm file path=opt/onbld/lib/perl/onbld_elfmod_vertype.pm -file path=opt/onbld/lib/python2.4/onbld/Checks/CStyle.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/CStyle.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Cddl.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Cddl.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/CmtBlk.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/CmtBlk.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Comments.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Comments.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Copyright.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Copyright.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/DbLookups.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/DbLookups.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/HdrChk.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/HdrChk.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/JStyle.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/JStyle.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Keywords.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Keywords.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Mapfile.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Mapfile.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/ProcessCheck.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/ProcessCheck.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Backup.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Backup.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Version.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Version.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/WorkSpace.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/WorkSpace.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/hgext/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/hgext/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/hgext/cdm.py mode=0444 file path=opt/onbld/lib/python2.6/onbld/Checks/CStyle.py mode=0444 file path=opt/onbld/lib/python2.6/onbld/Checks/CStyle.pyc mode=0444 file path=opt/onbld/lib/python2.6/onbld/Checks/Cddl.py mode=0444 @@ -266,10 +225,8 @@ license usr/src/tools/onbld/THIRDPARTYLICENSE \ license=usr/src/tools/onbld/THIRDPARTYLICENSE link path=opt/onbld/bin/git-nits target=git-pbchk -link path=opt/onbld/lib/python target=python2.4 +link path=opt/onbld/lib/python target=python2.6 link path=opt/onbld/man/man1/git-nits.1 target=git-pbchk.1 -# DbLookups.py requires elementtree -depend fmri=library/python-2/python-extra-24 type=require # webrev(1) requires ps2pdf depend fmri=print/filter/ghostscript type=require # hgsetup(1) uses check-hostname(1) and nightly sendmail(1M)
--- a/usr/src/tools/Makefile Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/Makefile Wed Oct 17 01:35:22 2012 -0700 @@ -90,11 +90,6 @@ $(ROOTONBLD)/lib \ $(ROOTONBLD)/lib/$(MACH) \ $(ROOTONBLD)/lib/perl \ - $(ROOTONBLD)/lib/python2.4 \ - $(ROOTONBLD)/lib/python2.4/onbld \ - $(ROOTONBLD)/lib/python2.4/onbld/Checks \ - $(ROOTONBLD)/lib/python2.4/onbld/hgext \ - $(ROOTONBLD)/lib/python2.4/onbld/Scm \ $(ROOTONBLD)/lib/python2.6 \ $(ROOTONBLD)/lib/python2.6/onbld \ $(ROOTONBLD)/lib/python2.6/onbld/Checks \ @@ -146,6 +141,6 @@ $(INS.dir) $(ROOTONBLDLIBPY): $(ROOTDIRS) - $(RM) -r $@; $(SYMLINK) python2.4 $@ + $(RM) -r $@; $(SYMLINK) python2.6 $@ FRC:
--- a/usr/src/tools/Makefile.python Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/Makefile.python Wed Oct 17 01:35:22 2012 -0700 @@ -63,43 +63,34 @@ PYFILES = $(PYSRCS) $(PYOBJS) -ROOTPYDIR_24 = $(PYTOPDIR)/python2.4/$(PYMODDIR) -ROOTPYFILES_24 = $(PYFILES:%=$(ROOTPYDIR_24)/%) - ROOTPYDIR_26 = $(PYTOPDIR)/python2.6/$(PYMODDIR) ROOTPYFILES_26 = $(PYFILES:%=$(ROOTPYDIR_26)/%) -ROOTPYFILES = $(ROOTPYFILES_24) $(ROOTPYFILES_26) +ROOTPYFILES = $(ROOTPYFILES_26) $(ROOTPYFILES) := FILEMODE = 0444 -PYVERSDIRS = python2.4 python2.6 - -PY24OBJS = $(PYOBJS:%=python2.4/%) -$(PY24OBJS) := PYTHON = $(PYTHON_24) +PYVERSDIRS = python2.6 PY26OBJS = $(PYOBJS:%=python2.6/%) $(PY26OBJS) := PYTHON = $(PYTHON_26) -PYVERSOBJS = $(PY24OBJS) $(PY26OBJS) +PYVERSOBJS = $(PY26OBJS) CLOBBERFILES += $(PYVERSOBJS) CLOBBERDIRS += $(PYVERSDIRS) .KEEP_STATE: -python2.4/%.pyc python2.6/%.pyc: %.py +python2.6/%.pyc: %.py @[ -d $(@D) ] || mkdir $(@D) $(RM) $@ $(PYTHON) -mpy_compile $< $(MV) $(*).pyc $@ -$(ROOTPYDIR_24)/%.pyc: python2.4/%.pyc - $(INS.pyfile) - $(ROOTPYDIR_26)/%.pyc: python2.6/%.pyc $(INS.pyfile) -$(ROOTPYDIR_24)/%.py $(ROOTPYDIR_26)/%.py: %.py +$(ROOTPYDIR_26)/%.py: %.py $(INS.pyfile) pyclobber:
--- a/usr/src/tools/Makefile.tools Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/Makefile.tools Wed Oct 17 01:35:22 2012 -0700 @@ -38,7 +38,6 @@ ROOTONBLDLIBMACH= $(ROOTONBLD)/lib/$(MACH) ROOTONBLDLIBPERL= $(ROOTONBLD)/lib/perl ROOTONBLDLIBPY= $(ROOTONBLD)/lib/python -ROOTONBLDLIBPY_24= $(ROOTONBLD)/lib/python2.4 ROOTONBLDLIBPY_26= $(ROOTONBLD)/lib/python2.6 ROOTONBLDENV= $(ROOTONBLD)/env ROOTONBLDGK= $(ROOTONBLD)/gk
--- a/usr/src/tools/scripts/cddlchk.py Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/scripts/cddlchk.py Wed Oct 17 01:35:22 2012 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START #
--- a/usr/src/tools/scripts/copyrightchk.py Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/scripts/copyrightchk.py Wed Oct 17 01:35:22 2012 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START #
--- a/usr/src/tools/scripts/git-pbchk.py Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/scripts/git-pbchk.py Wed Oct 17 01:35:22 2012 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2
--- a/usr/src/tools/scripts/hdrchk.py Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/scripts/hdrchk.py Wed Oct 17 01:35:22 2012 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START #
--- a/usr/src/tools/scripts/hg-active.py Tue Oct 16 03:41:16 2012 -0700 +++ b/usr/src/tools/scripts/hg-active.py Wed Oct 17 01:35:22 2012 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2