Skip to content

fix(openscap): disable optional apt integration#16964

Merged
ddstreetmicrosoft merged 1 commit intotomls/base/mainfrom
users/reubeno/scalpel/openscap-no-apt
May 1, 2026
Merged

fix(openscap): disable optional apt integration#16964
ddstreetmicrosoft merged 1 commit intotomls/base/mainfrom
users/reubeno/scalpel/openscap-no-apt

Conversation

@reubeno
Copy link
Copy Markdown
Member

@reubeno reubeno commented Apr 30, 2026

Disable openscap's apt-libs probe path. Upstream gates it on
%bcond_without apt (default-on for Fedora, default-off for
CentOS/ELN). We only need to support RPM environments.

--
Build validated locally via azldev + koji.

@reubeno reubeno marked this pull request as ready for review April 30, 2026 18:10
Copilot AI review requested due to automatic review settings April 30, 2026 18:10
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Disables OpenSCAP’s optional apt probe integration in Azure Linux to avoid pulling apt-libs/apt into the RPM-only base.

Changes:

  • Load an AZL overlay macro file from the spec and add it as a Source.
  • Add an openscap component build override to build --without apt.
  • Add a generated macros file defining %_without_apt 1 and adjust component declarations accordingly.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File Description
specs/o/openscap/openscap.spec Loads generated AZL macros early in the spec and ships the macros file as a Source.
specs/o/openscap/openscap.azl.macros Defines %_without_apt to force-disable the apt integration path.
base/comps/openscap/openscap.comp.toml Disables the apt bcond for openscap builds in the component system.
base/comps/components.toml Removes the explicit openscap component table entry (likely relying on included *.comp.toml).
Comments suppressed due to low confidence (1)

specs/o/openscap/openscap.spec:1

  • The macro file is loaded via a hardcoded _sourcedir path and literal filename before Source9999 is declared. For better robustness and traceability, consider reordering so Source9999 is declared before it’s loaded, and then load via the corresponding Source macro (e.g., SOURCE9999) rather than _sourcedir + a hardcoded name. This reduces reliance on external directory layout and avoids copy/paste filename mismatches.
# This spec file has been modified by azldev to include build configuration overlays.

Comment thread base/comps/openscap/openscap.comp.toml
Comment thread specs/o/openscap/openscap.spec
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 30, 2026

📄❌ Rendered specs are out of date

🚧🚧🚧🚧🚧

Warning

Disregard this comment.

Spec rendering is still under development and checked-in specs
should not be updated in PRs yet.
Please ignore this comment for now unless you are actively
working on the render pipeline.

🚧🚧🚧🚧🚧

FIX: — run this and commit the result:

azldev component render erlang openscap

Or download the fix patch and apply it:

gh run download 25218236991 -R microsoft/azurelinux -n rendered-specs-patch
git apply rendered-specs.patch
Category Count
Content diffs 2
Extra files (untracked) 0
Missing files (deleted) 0

Content diffs

`specs/e/erlang/erlang.spec`
--- committed/specs/e/erlang/erlang.spec
+++ rendered/specs/e/erlang/erlang.spec
@@ -75,7 +75,7 @@
 
 Name:		erlang
 Version:	26.2.5.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 License:	Apache-2.0
`specs/o/openscap/openscap.spec`
--- committed/specs/o/openscap/openscap.spec
+++ rendered/specs/o/openscap/openscap.spec
@@ -6,7 +6,7 @@
 
 Name:           openscap
 Version:        1.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch:          1
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 License:        LGPL-2.1-or-later

Disable openscap's apt-libs probe path. Upstream gates it on
`%bcond_without apt` (default-on for Fedora, default-off for
CentOS/ELN). We only need to support RPM environments.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@reubeno reubeno force-pushed the users/reubeno/scalpel/openscap-no-apt branch from a235bc9 to 36377ee Compare May 1, 2026 14:31
Copy link
Copy Markdown
Contributor

@ddstreetmicrosoft ddstreetmicrosoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ddstreetmicrosoft ddstreetmicrosoft merged commit 70351b0 into tomls/base/main May 1, 2026
10 checks passed
@ddstreetmicrosoft ddstreetmicrosoft deleted the users/reubeno/scalpel/openscap-no-apt branch May 1, 2026 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants