#15 Fix ELN build
Merged a year ago by wsato. Opened a year ago by yselkowitz.
rpms/ yselkowitz/scap-security-guide rawhide  into  rawhide

file modified
+4 -4
@@ -45,7 +45,7 @@ 

  hardening guidances that have been generated from XCCDF benchmarks

  present in %{name} package.

  

- %if ( %{defined rhel} && (! %{defined centos}) )

+ %if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )

  %package	rule-playbooks

  Summary:	Ansible playbooks per each rule.

  Group:		System Environment/Base
@@ -60,7 +60,7 @@ 

  

  %define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF

  %define cmake_defines_specific %{nil}

- %if 0%{?rhel}

+ %if 0%{?rhel} && ! %{defined eln}

  %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON

  %endif

  %if 0%{?centos}
@@ -84,7 +84,7 @@ 

  %{_datadir}/%{name}/tailoring

  %lang(en) %{_mandir}/man8/scap-security-guide.8.*

  %doc %{_docdir}/%{name}/LICENSE

- %if ( %{defined rhel} && (! %{defined centos}) )

+ %if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )

  %exclude %{_datadir}/%{name}/ansible/rule_playbooks

  %endif

  
@@ -92,7 +92,7 @@ 

  %doc %{_docdir}/%{name}/guides/*.html

  %doc %{_docdir}/%{name}/tables/*.html

  

- %if ( %{defined rhel} && (! %{defined centos}) )

+ %if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )

  %files rule-playbooks

  %defattr(-,root,root,-)

  %{_datadir}/%{name}/ansible/rule_playbooks

On RHEL, only the product-specific data for RHEL is built and shipped, but ELN is defined as the precursor to the next major version of RHEL, for which data has not yet been created upstream. Therefore, for ELN, follow Fedora which builds and ships data for all distributions.

The alternatives are to build only Fedora data and/or the previous version of RHEL. Either way, as even CentOS Stream does not build the rule-playbooks, those should definitely be disabled on ELN regardless.

ELN scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=94497884

This will be merged by a provenpackager later this week if there is no response.

I am not yet a Fedora packager, but I am one of the Upstream maintainers.
This PR changes LGTM.

The failed tests in Fedora CI - /plans/fedora_tests doesn't seem to be related to the changes in this PR.

The CI failure is unrelated.
Profile anssi_bp28_high is missing on ssg-fedora-ds.xml, we need to update the tests.

Pull-Request has been merged by wsato

a year ago
Metadata