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>

11 files changed, 15 insertions, 74 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 25ebcad576..a4ab1312a1 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -191,9 +191,8 @@ CTFFINDMOD=	$(ONBLD_TOOLS)/bin/ctffindmod
 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
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index dbb194fb77..bf01650e0f 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -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/gk
 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/gk/gen_make.machines mode=0755
 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/ctf/dwarf/THIRDPARTYLICENSE \
 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)
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 670c2de281..fe263c4d79 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -90,11 +90,6 @@ ROOTDIRS= \
 	$(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 @@ $(ROOTDIRS):
 	$(INS.dir)
 
 $(ROOTONBLDLIBPY): $(ROOTDIRS)
-	$(RM) -r $@; $(SYMLINK) python2.4 $@
+	$(RM) -r $@; $(SYMLINK) python2.6 $@
 
 FRC:
diff --git a/usr/src/tools/Makefile.python b/usr/src/tools/Makefile.python
index a68ff026f6..dcf7c06360 100644
--- a/usr/src/tools/Makefile.python
+++ b/usr/src/tools/Makefile.python
@@ -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:
diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools
index c2bfdefd74..974543107d 100644
--- a/usr/src/tools/Makefile.tools
+++ b/usr/src/tools/Makefile.tools
@@ -38,7 +38,6 @@ ROOTONBLDLIB=		$(ROOTONBLD)/lib
 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
diff --git a/usr/src/tools/scripts/cddlchk.py b/usr/src/tools/scripts/cddlchk.py
index 62a2695946..816d2f33a7 100644
--- a/usr/src/tools/scripts/cddlchk.py
+++ b/usr/src/tools/scripts/cddlchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/copyrightchk.py b/usr/src/tools/scripts/copyrightchk.py
index 1426a69bfa..210ef1b46c 100644
--- a/usr/src/tools/scripts/copyrightchk.py
+++ b/usr/src/tools/scripts/copyrightchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py
index 74be6a4818..98a5c8628d 100644
--- a/usr/src/tools/scripts/git-pbchk.py
+++ b/usr/src/tools/scripts/git-pbchk.py
@@ -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
diff --git a/usr/src/tools/scripts/hdrchk.py b/usr/src/tools/scripts/hdrchk.py
index 3ecec6b3f2..84acbc8616 100644
--- a/usr/src/tools/scripts/hdrchk.py
+++ b/usr/src/tools/scripts/hdrchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/hg-active.py b/usr/src/tools/scripts/hg-active.py
index 7e49a18db5..88394e98e5 100644
--- a/usr/src/tools/scripts/hg-active.py
+++ b/usr/src/tools/scripts/hg-active.py
@@ -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
diff --git a/usr/src/tools/scripts/mapfilechk.py b/usr/src/tools/scripts/mapfilechk.py
index 83d3d9d70c..9cf2000c7a 100644
--- a/usr/src/tools/scripts/mapfilechk.py
+++ b/usr/src/tools/scripts/mapfilechk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #