Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 5 additions & 1 deletion envsetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand All @@ -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)

Expand Down
33 changes: 33 additions & 0 deletions osg-stage1-el10.lst
Original file line number Diff line number Diff line change
@@ -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