rpms/rhel-system-roles
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove doc_fragments from vendored modules and fix collection_artifact

Browse Source
This commit is contained in:
Sergei Petrosian 2023-04-06 15:04:58 +02:00
parent b3d9ac7c21
commit 7557e6a1ad
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
linux-system-roles.spec
View File

@ -56,8 +56,8 @@ Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{col
%define ansible_roles_dir %{_datadir}/ansible/roles %define ansible_roles_dir %{_datadir}/ansible/roles
%if %{without ansible} %if %{without ansible}
# Untar and copy everything instead of galaxy-installing the built artifact when ansible is not available # Untar and copy everything instead of galaxy-installing the built artifact when ansible is not available
%define ansible_collection_build() tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz . %define ansible_collection_build() tar -cf %{collection_namespace}-%{collection_name}-%{version}.tar.gz .
%define ansible_collection_install() mkdir -p %{buildroot}%{ansible_collection_files}%{collection_name}; (cd %{buildroot}%{ansible_collection_files}%{collection_name}; tar -xf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz) %define ansible_collection_install() mkdir -p %{buildroot}%{ansible_collection_files}%{collection_name}; tar -xf %{collection_namespace}-%{collection_name}-%{version}.tar.gz --directory %{buildroot}%{ansible_collection_files}%{collection_name}
%else %else
%define ansible_collection_build() ansible-galaxy collection build %define ansible_collection_build() ansible-galaxy collection build
%define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz %define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
@ -388,9 +388,22 @@ for module in "${!module_map[@]}"; do
if [ ! -f $moduledir/$module ]; then if [ ! -f $moduledir/$module ]; then
moduledir=.external/community/general/plugins/modules/files moduledir=.external/community/general/plugins/modules/files
fi fi
cp -pL $moduledir/$module $role/library/$module module_target=$role/library/$module
ls -alrtF $role/library/$module cp -pL $moduledir/$module $module_target
ls -alrtF $module_target
sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' $role/library/$module sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' $role/library/$module
# Remove doc_fragments from vendored modules
if grep -q extends_documentation_fragment $module_target; then
top_line=$(grep extends_documentation_fragment $module_target -n | cut -d":" -f1)
bottom_line=$((top_line+1))
# While $bottom_line is still in the extends_documentation_fragment yaml list
while sed -n ${bottom_line}p $module_target | grep '\-\s' > /dev/null; do
rm_lines="$top_line,$bottom_line"
bottom_line=$((bottom_line+1))
done
sed -i "${rm_lines}d" $module_target
fi
done done
# Fix until the updated redhat_subscription.py is in community.general # Fix until the updated redhat_subscription.py is in community.general