49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
|
From 36b93e4a2504f72e5a371a75a23e7cd2c695b84b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Hecko <mhecko@redhat.com>
|
||
|
|
Date: Sun, 6 Oct 2024 21:01:13 +0200
|
||
|
|
Subject: [PATCH 32/40] spec: create /etc/leapp/actor_conf.d
|
||
|
|
|
||
|
|
Add additional build steps to the specfile that create the actor
|
||
|
|
configuration directory. The directory is owned by the package, so
|
||
|
|
it gets removed when the user uninstalls leapp.
|
||
|
|
|
||
|
|
Also prepared some comment lines for future when we will want to
|
||
|
|
include some configuration files as part of the rpm.
|
||
|
|
---
|
||
|
|
etc/leapp/actor_conf.d/.gitkeep | 0
|
||
|
|
packaging/leapp-repository.spec | 7 +++++++
|
||
|
|
2 files changed, 7 insertions(+)
|
||
|
|
create mode 100644 etc/leapp/actor_conf.d/.gitkeep
|
||
|
|
|
||
|
|
diff --git a/etc/leapp/actor_conf.d/.gitkeep b/etc/leapp/actor_conf.d/.gitkeep
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000..e69de29b
|
||
|
|
diff --git a/packaging/leapp-repository.spec b/packaging/leapp-repository.spec
|
||
|
|
index 570d0df2..828355bf 100644
|
||
|
|
--- a/packaging/leapp-repository.spec
|
||
|
|
+++ b/packaging/leapp-repository.spec
|
||
|
|
@@ -250,6 +250,11 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/leapp/files/
|
||
|
|
install -m 0644 etc/leapp/transaction/* %{buildroot}%{_sysconfdir}/leapp/transaction
|
||
|
|
install -m 0644 etc/leapp/files/* %{buildroot}%{_sysconfdir}/leapp/files
|
||
|
|
|
||
|
|
+# Actor configuration dir
|
||
|
|
+install -m 0755 -d %{buildroot}%{_sysconfdir}/leapp/actor_conf.d/
|
||
|
|
+# uncomment to install existing configs
|
||
|
|
+#install -m 0644 etc/leapp/actor_conf.d/* %%{buildroot}%%{_sysconfdir}/leapp/actor_conf.d
|
||
|
|
+
|
||
|
|
# install CLI commands for the leapp utility on the expected path
|
||
|
|
install -m 0755 -d %{buildroot}%{leapp_python_sitelib}/leapp/cli/
|
||
|
|
cp -r commands %{buildroot}%{leapp_python_sitelib}/leapp/cli/
|
||
|
|
@@ -295,6 +300,8 @@ done;
|
||
|
|
%dir %{custom_repositorydir}
|
||
|
|
%dir %{leapp_python_sitelib}/leapp/cli/commands
|
||
|
|
%config %{_sysconfdir}/leapp/files/*
|
||
|
|
+# uncomment to package installed configs
|
||
|
|
+#%%config %%{_sysconfdir}/leapp/actor_conf.d/*
|
||
|
|
%{_sysconfdir}/leapp/repos.d/*
|
||
|
|
%{_sysconfdir}/leapp/transaction/*
|
||
|
|
%{repositorydir}/*
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|