Skip to content

Commit

Permalink
Merge pull request ComplianceAsCode#12810 from sej7278/add-alma9
Browse files Browse the repository at this point in the history
AlmaLinux OS 9 as a new product
  • Loading branch information
Mab879 authored Jan 17, 2025
2 parents 2931201 + 286afd5 commit 36fdc79
Show file tree
Hide file tree
Showing 43 changed files with 3,730 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ option(SSG_PRODUCT_DEFAULT "If enabled, all default release products will be bui
# project. Note that the example product is always disabled unless explicitly asked for.
option(SSG_PRODUCT_ALINUX2 "If enabled, the Alibaba Cloud Linux 2 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_ALINUX3 "If enabled, the Alibaba Cloud Linux 3 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_ALMALINUX9 "If enabled, the AlmaLinux OS 9 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_ANOLIS8 "If enabled, the Anolis OS 8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_ANOLIS23 "If enabled, the Anolis OS 23 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_CHROMIUM "If enabled, the Chromium SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
Expand Down Expand Up @@ -318,6 +319,7 @@ message(STATUS " ")
message(STATUS "Products:")
message(STATUS "Alibaba Cloud Linux 2: ${SSG_PRODUCT_ALINUX2}")
message(STATUS "Alibaba Cloud Linux 3: ${SSG_PRODUCT_ALINUX3}")
message(STATUS "AlmaLinux OS 9: ${SSG_PRODUCT_ALMALINUX9}")
message(STATUS "Anolis OS 8: ${SSG_PRODUCT_ANOLIS8}")
message(STATUS "Anolis OS 23: ${SSG_PRODUCT_ANOLIS23}")
message(STATUS "Chromium: ${SSG_PRODUCT_CHROMIUM}")
Expand Down Expand Up @@ -384,6 +386,9 @@ endif()
if(SSG_PRODUCT_ALINUX3)
add_subdirectory("products/alinux3" "alinux3")
endif()
if(SSG_PRODUCT_ALMALINUX9)
add_subdirectory("products/almalinux9" "almalinux9")
endif()
if(SSG_PRODUCT_ANOLIS8)
add_subdirectory("products/anolis8" "anolis8")
endif()
Expand Down
3 changes: 2 additions & 1 deletion build-scripts/verify_references.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ def is_remote_feed(href):
href.startswith("security-oval-com.oracle") or \
href.startswith("oval-com.ubuntu") or \
href.startswith("pub-projects-security-oval-suse") or \
href.startswith('security-oval-oval-definitions-bookworm')
href.startswith('security-oval-oval-definitions-bookworm') or \
href.startswith("oval-org.almalinux")


def main():
Expand Down
1 change: 1 addition & 0 deletions build_product
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ all_cmake_products=(
AL2023
ALINUX2
ALINUX3
ALMALINUX9
ANOLIS8
ANOLIS23
CHROMIUM
Expand Down
1 change: 1 addition & 0 deletions components/rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ rules:
- ensure_redhat_gpgkey_installed
- ensure_amazon_gpgkey_installed
- ensure_suse_gpgkey_installed
- ensure_almalinux_gpgkey_installed
- package_dnf-automatic_installed
- package_gnome_software_installed
- rpm_verify_hashes
Expand Down
Loading

0 comments on commit 36fdc79

Please sign in to comment.