Skip to content

Commit 7b02fb8

Browse files
authored
Merge pull request #68 from mwestphall/SOFTWARE-6225-el10
Add baseline support for el10
2 parents 7baeacf + 98a4ac6 commit 7b02fb8

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def __exit__(self, exc_type, exc_value, traceback):
6767
subprocess.call(['umount', self.proc_dir])
6868

6969

70-
VALID_DVERS = ["el6", "el7", "el8", "el9"]
70+
VALID_DVERS = ["el8", "el9", "el10"]
7171
VALID_BASEARCHES = ["x86_64"]
7272
DEFAULT_BASEARCH = "x86_64"
7373

envsetup.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def write_setup_in_files(dest_dir, dver, basearch):
5757
else:
5858
raise Exception("Unknown basearch %r" % basearch)
5959

60-
if dver in ['el6', 'el7', 'el8', 'el9']:
60+
if dver in ['el6', 'el7', 'el8', 'el9', 'el10']:
6161
osg_perl5lib = ":".join([
6262
"$OSG_LOCATION/usr/share/perl5/vendor_perl",
6363
"$OSG_LOCATION/usr/share/perl5"])
@@ -84,6 +84,10 @@ def write_setup_in_files(dest_dir, dver, basearch):
8484
osg_pythonpath = "$OSG_LOCATION/usr/lib/python3.9/site-packages"
8585
if basearch == 'x86_64':
8686
osg_pythonpath += ":$OSG_LOCATION/usr/lib64/python3.9/site-packages"
87+
elif dver == 'el10':
88+
osg_pythonpath = "$OSG_LOCATION/usr/lib/python3.12/site-packages"
89+
if basearch == 'x86_64':
90+
osg_pythonpath += ":$OSG_LOCATION/usr/lib64/python3.12/site-packages"
8791
else:
8892
raise Exception("Unknown dver %r" % dver)
8993

osg-stage1-el10.lst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Stage 1 packages
2+
# These packages will be installed into the tarball staging directory but their
3+
# files will be excluded from the tarball itself.
4+
# Packages may be separated by newline or whitespace. Actual whitespace must
5+
# be quoted.
6+
@core
7+
python3
8+
setroubleshoot-server
9+
setroubleshoot-plugins
10+
sudo
11+
# X libraries/GUI stuff
12+
cairo
13+
fontconfig
14+
gsettings-desktop-schemas
15+
libX11
16+
libXau
17+
libXcursor
18+
libXdmcp
19+
libXext
20+
libXfixes
21+
libXft
22+
libXi
23+
libXinerama
24+
libXrandr
25+
libXrender
26+
libXtst
27+
# New in el9
28+
gcc
29+
gcc-c++
30+
libstdc++-devel
31+
lua-srpm-macros
32+
llvm-libs
33+
pkgconf

0 commit comments

Comments
 (0)