Skip to content

Commit

Permalink
Merge branch 'master' into endpoints-together
Browse files Browse the repository at this point in the history
  • Loading branch information
@k-rister
k-rister authored Feb 28, 2024
2 parents 7c34d4c + b8e6c68 commit 3af75be
Show file tree
Hide file tree
Showing 23 changed files with 268 additions and 79 deletions.
25 changes: 18 additions & 7 deletions userenvs/alma8.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"distro_info": {
"packages": [
"python39",
"python39-pip"
"python39-pip",
"python39-devel"
]
}
},
Expand All @@ -54,15 +55,11 @@
"iputils",
"iproute",
"elfutils-libelf",
"elfutils-libelf-devel",
"openssl",
"openssl-devel",
"xz",
"xz-devel",
"libcap",
"libzstd",
"libzstd-devel",
"libcap-devel"
"numactl"
]
}
},
Expand All @@ -76,7 +73,21 @@
"libtool",
"autoconf",
"automake",
"make"
"make",
"clang",
"slang-devel",
"libbabeltrace",
"elfutils-libelf-devel",
"elfutils-debuginfod",
"elfutils-debuginfod-client-devel",
"openssl-devel",
"xz-devel",
"libzstd-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
},
Expand Down
25 changes: 18 additions & 7 deletions userenvs/alma9.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"distro_info": {
"packages": [
"python3",
"python3-pip"
"python3-pip",
"python3-devel"
]
}
},
Expand All @@ -54,15 +55,11 @@
"iputils",
"iproute",
"elfutils-libelf",
"elfutils-libelf-devel",
"openssl",
"openssl-devel",
"xz",
"xz-devel",
"libcap",
"libzstd",
"libzstd-devel",
"libcap-devel"
"numactl"
]
}
},
Expand All @@ -76,7 +73,21 @@
"libtool",
"autoconf",
"automake",
"make"
"make",
"clang",
"slang-devel",
"libbabeltrace",
"elfutils-libelf-devel",
"elfutils-debuginfod",
"elfutils-debuginfod-client-devel",
"openssl-devel",
"xz-devel",
"libzstd-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
},
Expand Down
20 changes: 17 additions & 3 deletions userenvs/centos7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"distro_info": {
"packages": [
"rh-python38",
"rh-python38-python-pip"
"rh-python38-python-pip",
"rh-python38-python-devel"
]
}
},
Expand Down Expand Up @@ -76,7 +77,8 @@
"libcap",
"libzstd",
"libzstd-devel",
"libcap-devel"
"libcap-devel",
"which"
]
}
},
Expand All @@ -90,7 +92,18 @@
"libtool",
"autoconf",
"automake",
"make"
"make",
"clang",
"slang-devel",
"elfutils-libelf-devel",
"openssl-devel",
"xz-devel",
"zlib-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
},
Expand Down Expand Up @@ -129,6 +142,7 @@
"manual_info": {
"commands": [
"alternatives --install /usr/bin/python3 python3 /opt/rh/rh-python38/root/usr/bin/python3 1",
"alternatives --install /usr/bin/python3-config python3-config /opt/rh/rh-python38/root/usr/bin/python3-config 1",
"alternatives --install /usr/bin/pip3 pip3 /opt/rh/rh-python38/root/usr/bin/pip3 1"
]
}
Expand Down
2 changes: 1 addition & 1 deletion userenvs/centos7/requirements/04-core-compiling.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../components/rpm-core-compiling.json
../../components/rpm-core-compiling-older.json
3 changes: 2 additions & 1 deletion userenvs/components/python39-pip3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"distro_info": {
"packages": [
"python39",
"python3-pip"
"python3-pip",
"python3-devel"
]
}
}
3 changes: 2 additions & 1 deletion userenvs/components/python39-pip39-symlink.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"distro_info": {
"packages": [
"python39",
"python39-pip"
"python39-pip",
"python39-devel"
]
}
},
Expand Down
1 change: 1 addition & 0 deletions userenvs/components/rh-alternatives-python.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"manual_info": {
"commands": [
"alternatives --install /usr/bin/python3 python3 /opt/rh/rh-python38/root/usr/bin/python3 1",
"alternatives --install /usr/bin/python3-config python3-config /opt/rh/rh-python38/root/usr/bin/python3-config 1",
"alternatives --install /usr/bin/pip3 pip3 /opt/rh/rh-python38/root/usr/bin/pip3 1"
]
}
Expand Down
3 changes: 2 additions & 1 deletion userenvs/components/rh-python38.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"distro_info": {
"packages": [
"rh-python38",
"rh-python38-python-pip"
"rh-python38-python-pip",
"rh-python38-python-devel"
]
}
}
25 changes: 25 additions & 0 deletions userenvs/components/rpm-core-compiling-older.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "core-compiling",
"type": "distro",
"distro_info": {
"packages": [
"diffutils",
"gcc",
"libtool",
"autoconf",
"automake",
"make",
"clang",
"slang-devel",
"elfutils-libelf-devel",
"openssl-devel",
"xz-devel",
"zlib-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
}
21 changes: 20 additions & 1 deletion userenvs/components/rpm-core-compiling.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,26 @@
"type": "distro",
"distro_info": {
"packages": [
"diffutils", "gcc", "libtool", "autoconf", "automake", "make"
"diffutils",
"gcc",
"libtool",
"autoconf",
"automake",
"make",
"clang",
"slang-devel",
"libbabeltrace",
"elfutils-libelf-devel",
"elfutils-debuginfod",
"elfutils-debuginfod-client-devel",
"openssl-devel",
"xz-devel",
"libzstd-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
}
3 changes: 2 additions & 1 deletion userenvs/components/rpm-core-utils-no-iproute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"openssl", "openssl-devel",
"xz", "xz-devel",
"libcap", "libzstd",
"libzstd-devel", "libcap-devel"
"libzstd-devel", "libcap-devel",
"which"
]
}
}
25 changes: 17 additions & 8 deletions userenvs/components/rpm-core-utils.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,23 @@
"type": "distro",
"distro_info": {
"packages": [
"curl", "tar", "cpio", "gzip",
"jq", "git", "cpio", "findutils",
"hostname", "iputils", "iproute",
"elfutils-libelf", "elfutils-libelf-devel",
"openssl", "openssl-devel",
"xz", "xz-devel",
"libcap", "libzstd",
"libzstd-devel", "libcap-devel"
"curl",
"tar",
"cpio",
"gzip",
"jq",
"git",
"cpio",
"findutils",
"hostname",
"iputils",
"iproute",
"elfutils-libelf",
"openssl",
"xz",
"libcap",
"libzstd",
"numactl"
]
}
}
3 changes: 2 additions & 1 deletion userenvs/components/rpm-python3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"distro_info": {
"packages": [
"python3",
"python3-pip"
"python3-pip",
"python3-devel"
]
}
}
3 changes: 2 additions & 1 deletion userenvs/components/rpm-python39.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"distro_info": {
"packages": [
"python39",
"python39-pip"
"python39-pip",
"python39-devel"
]
}
}
22 changes: 16 additions & 6 deletions userenvs/fedora38.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,11 @@
"iputils",
"iproute",
"elfutils-libelf",
"elfutils-libelf-devel",
"openssl",
"openssl-devel",
"xz",
"xz-devel",
"libcap",
"libzstd",
"libzstd-devel",
"libcap-devel"
"numactl"
]
}
},
Expand All @@ -77,7 +73,21 @@
"libtool",
"autoconf",
"automake",
"make"
"make",
"clang",
"slang-devel",
"libbabeltrace",
"elfutils-libelf-devel",
"elfutils-debuginfod",
"elfutils-debuginfod-client-devel",
"openssl-devel",
"xz-devel",
"libzstd-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
},
Expand Down
22 changes: 16 additions & 6 deletions userenvs/fedora39.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,11 @@
"iputils",
"iproute",
"elfutils-libelf",
"elfutils-libelf-devel",
"openssl",
"openssl-devel",
"xz",
"xz-devel",
"libcap",
"libzstd",
"libzstd-devel",
"libcap-devel"
"numactl"
]
}
},
Expand All @@ -77,7 +73,21 @@
"libtool",
"autoconf",
"automake",
"make"
"make",
"clang",
"slang-devel",
"libbabeltrace",
"elfutils-libelf-devel",
"elfutils-debuginfod",
"elfutils-debuginfod-client-devel",
"openssl-devel",
"xz-devel",
"libzstd-devel",
"libcap-devel",
"libnl3-devel",
"numactl-devel",
"java-1.8.0-openjdk",
"libpfm"
]
}
},
Expand Down
Loading

0 comments on commit 3af75be

Please sign in to comment.