Merge pull request #475 from citrus-it/pyshebang

Switch pkg default python version to 3.12

src/Makefile.com

@@ -29,10 +29,10 @@ CFLAGS = -m64 -Wall -Werror -Wextra -gdwarf-2 -gstrict-dwarf \
 	-fno-aggressive-loop-optimizations
 CPPFLAGS = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
-# Whitespace separated list of versions to build and test, latest one first
-PYVERSIONS = 3.12 3.11
+# Whitespace separated list of versions to build and test.
+PYVERSIONS = 3.11 3.12
 # The single version used for shebang lines and packaging.
-PYVER = 3.11
+PYVER = 3.12
 
 SHELL= /usr/bin/ksh93
 INSTALL = /usr/sbin/install

src/pkg/Makefile

@@ -126,12 +126,18 @@ sparc_DEFINES     = \
 
 ARCH_DEFINES      = $($(ARCH)_DEFINES)
 
+i386_TRIPLE       = x86_64-pc-solaris2
+aarch64_TRIPLE    = aarch64-unknown-solaris2
+
+ARCH_TRIPLE       = $($(ARCH)_TRIPLE)
+
 PKGMOG_DEFVALS    = \
 	ARCH=$(ARCH) \
 	PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
 	PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 	PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
 	PKGVERS=$(PKGVERS) \
+	TRIPLE=$(ARCH_TRIPLE) \
 	REV=$(REV) \
 	PYDIR=$(PYDIR) \
 	PYDIRVP=$(PYDIRVP) \

src/pkg/manifests/package:pkg.p5m

@@ -36,7 +36,6 @@
 <transform file path=$(PYDIRVP)/pkg/solver -> \
     set pkg.depend.bypass-generate libm.so.0>
 #
-<include bundledlicences.3.11.core.p5m>
 <include bundledmodules.3.11.core.p5m>
 <include bundledlicences.3.12.core.p5m>
 <include bundledmodules.3.12.core.p5m>
@@ -45,7 +44,7 @@ set name=pkg.summary value="Image Packaging System - pkg(7)"
 set name=pkg.description \
     value="The Image Packaging System (IPS), or pkg(7), is the software delivery system used on OmniOS."
 set name=pkg.depend.runpath \
-    value=/usr/lib/pkg/python$(PYVERS):$PKGDEPEND_RUNPATH
+    value=/usr/lib/pkg/python$(PYVERS):/usr/lib/pkg/python3.11:$PKGDEPEND_RUNPATH
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)
@@ -59,17 +58,17 @@ file path=$(PYDIRVP)/pkg-0.1-py$(PYVERS).egg-info/SOURCES.txt
 file path=$(PYDIRVP)/pkg-0.1-py$(PYVERS).egg-info/dependency_links.txt
 file path=$(PYDIRVP)/pkg-0.1-py$(PYVERS).egg-info/top_level.txt
 file path=$(PYDIRVP)/pkg/__init__.py
-file path=$(PYDIRVP)/pkg/_arch.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/_misc.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/_pspawn.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/_sha512_t.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/_sysattr.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/_syscallat.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/_varcet.cpython$(PYPKGVERS).so
+file path=$(PYDIRVP)/pkg/_arch.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/_misc.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/_pspawn.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/_sha512_t.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/_sysattr.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/_syscallat.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/_varcet.cpython$(PYPKGVERS)-$(TRIPLE).so
 dir  path=$(PYDIRVP)/pkg/actions
 file path=$(PYDIRVP)/pkg/actions/__init__.py
-file path=$(PYDIRVP)/pkg/actions/_actions.cpython$(PYPKGVERS).so
-file path=$(PYDIRVP)/pkg/actions/_common.cpython$(PYPKGVERS).so
+file path=$(PYDIRVP)/pkg/actions/_actions.cpython$(PYPKGVERS)-$(TRIPLE).so
+file path=$(PYDIRVP)/pkg/actions/_common.cpython$(PYPKGVERS)-$(TRIPLE).so
 file path=$(PYDIRVP)/pkg/actions/attribute.py
 file path=$(PYDIRVP)/pkg/actions/depend.py
 file path=$(PYDIRVP)/pkg/actions/directory.py
@@ -142,7 +141,7 @@ file path=$(PYDIRVP)/pkg/cpiofile.py
 file path=$(PYDIRVP)/pkg/dependency.py
 file path=$(PYDIRVP)/pkg/depotcontroller.py
 file path=$(PYDIRVP)/pkg/digest.py
-file path=$(PYDIRVP)/pkg/elf.cpython$(PYPKGVERS).so
+file path=$(PYDIRVP)/pkg/elf.cpython$(PYPKGVERS)-$(TRIPLE).so
 file path=$(PYDIRVP)/pkg/facet.py
 dir  path=$(PYDIRVP)/pkg/file_layout
 file path=$(PYDIRVP)/pkg/file_layout/__init__.py
@@ -213,7 +212,7 @@ file path=$(PYDIRVP)/pkg/sha512_t.py
 dir  path=$(PYDIRVP)/pkg/site_paths
 file path=$(PYDIRVP)/pkg/site_paths/__init__.py
 file path=$(PYDIRVP)/pkg/smf.py
-file path=$(PYDIRVP)/pkg/solver.cpython$(PYPKGVERS).so
+file path=$(PYDIRVP)/pkg/solver.cpython$(PYPKGVERS)-$(TRIPLE).so
 file path=$(PYDIRVP)/pkg/sysattr.py
 file path=$(PYDIRVP)/pkg/syscallat.py
 file path=$(PYDIRVP)/pkg/sysvpkg.py
@@ -261,7 +260,7 @@ file path=usr/bin/pkgsurf
 dir  path=usr/lib
 dir  path=usr/lib/pkg
 file path=usr/lib/pkg.depotd mode=0755
-dir  path=usr/lib/python3.12
+dir  path=usr/lib/python3.11
 dir  path=usr/share
 dir  path=usr/share/lib
 dir  path=usr/share/lib/pkg

src/pkg/manifests/system:zones:brand:bhyve.p5m

@@ -13,7 +13,6 @@
 # Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 #
 
-<include bundledlicences.3.11.bhyve.p5m>
 <include bundledmodules.3.11.bhyve.p5m>
 <include bundledlicences.3.12.bhyve.p5m>
 <include bundledmodules.3.12.bhyve.p5m>

src/pkg/transforms/pynext

@@ -22,15 +22,12 @@
 <transform path=TBD -> delete pkg.depend.bypass-generate notfound>
 
 # Deliver 3.12 modules alongside the 3.11 ones (temporary, during migration)
-<transform path=TBD -> edit path 311 312>
-<transform path=TBD -> edit path 3.11 3.12>
+<transform path=TBD -> edit path 312 311>
+<transform path=TBD -> edit path 3.12 3.11>
 
 # During the 3.11 to 3.12 upgrade, we need to also translate the loadable
 # module names as they were unqualified with 3.11
-$(i386_ONLY)<transform path=TBD \
-    -> edit path cpython-312.so cpython-312-x86_64-pc-solaris2.so >
-$(aarch64_ONLY)<transform path=TBD \
-    -> edit path cpython-312.so cpython-312-aarch64-unknown-solaris2.so >
+<transform path=TBD -> edit path cpython-311-$(TRIPLE) cpython-311>
 
 <transform path=TBD -> edit path TBD ''>