Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable redhat-access-insights only in RHEL < 10 #254

Merged
merged 3 commits into from
Jun 12, 2024
Merged

Enable redhat-access-insights only in RHEL < 10 #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04df400
chore(build): reformat %meson call
ptoscano Mar 5, 2024
81b7699
feat(build): add redhat_access_insights meson option
ptoscano Jun 12, 2024
3920b32
feat(build): enable redhat-access-insights only in RHEL < 10
ptoscano Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion insights-client.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ Resource Optimization service upon modifying ros_collect parameter to True.


%build
%{meson} -Dpython=%{__python3}
%{meson} \
-Dpython=%{__python3} \
%if (0%{?rhel} && 0%{?rhel} < 10)
-Dredhat_access_insights=true \
%endif
%{nil}
%{meson_build}


Expand Down
1 change: 1 addition & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
option('python', type: 'string', value: 'python3', description: 'python interpreter to use when finding python installation')
option('auto_registration', type: 'feature', value: 'disabled', description: 'enable automatic registration')
option('checkin', type: 'feature', value: 'disabled', description: 'enable hourly check-in')
option('redhat_access_insights', type: 'boolean', value: false, description: 'enable deprecated redhat-access-insights executable')
5 changes: 4 additions & 1 deletion src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
insights_client_sources = [
'insights-client.in',
'redhat-access-insights.in'
]

if get_option('redhat_access_insights')
insights_client_sources += 'redhat-access-insights.in'
endif

foreach source : insights_client_sources
configure_file(
input: source,
Expand Down
Loading