diff --git a/common.py b/common.py index 5967828..fa2a5e6 100644 --- a/common.py +++ b/common.py @@ -67,7 +67,7 @@ def __exit__(self, exc_type, exc_value, traceback): subprocess.call(['umount', self.proc_dir]) -VALID_DVERS = ["el6", "el7", "el8", "el9"] +VALID_DVERS = ["el8", "el9", "el10"] VALID_BASEARCHES = ["x86_64"] DEFAULT_BASEARCH = "x86_64" diff --git a/envsetup.py b/envsetup.py index 5d52504..8ab4fab 100644 --- a/envsetup.py +++ b/envsetup.py @@ -57,7 +57,7 @@ def write_setup_in_files(dest_dir, dver, basearch): else: raise Exception("Unknown basearch %r" % basearch) - if dver in ['el6', 'el7', 'el8', 'el9']: + if dver in ['el6', 'el7', 'el8', 'el9', 'el10']: osg_perl5lib = ":".join([ "$OSG_LOCATION/usr/share/perl5/vendor_perl", "$OSG_LOCATION/usr/share/perl5"]) @@ -84,6 +84,10 @@ def write_setup_in_files(dest_dir, dver, basearch): osg_pythonpath = "$OSG_LOCATION/usr/lib/python3.9/site-packages" if basearch == 'x86_64': osg_pythonpath += ":$OSG_LOCATION/usr/lib64/python3.9/site-packages" + elif dver == 'el10': + osg_pythonpath = "$OSG_LOCATION/usr/lib/python3.12/site-packages" + if basearch == 'x86_64': + osg_pythonpath += ":$OSG_LOCATION/usr/lib64/python3.12/site-packages" else: raise Exception("Unknown dver %r" % dver) diff --git a/osg-stage1-el10.lst b/osg-stage1-el10.lst new file mode 100644 index 0000000..13c8521 --- /dev/null +++ b/osg-stage1-el10.lst @@ -0,0 +1,33 @@ +# Stage 1 packages +# These packages will be installed into the tarball staging directory but their +# files will be excluded from the tarball itself. +# Packages may be separated by newline or whitespace. Actual whitespace must +# be quoted. +@core +python3 +setroubleshoot-server +setroubleshoot-plugins +sudo +# X libraries/GUI stuff +cairo +fontconfig +gsettings-desktop-schemas +libX11 +libXau +libXcursor +libXdmcp +libXext +libXfixes +libXft +libXi +libXinerama +libXrandr +libXrender +libXtst +# New in el9 +gcc +gcc-c++ +libstdc++-devel +lua-srpm-macros +llvm-libs +pkgconf