This is an automated email from the ASF dual-hosted git repository.
weizhouapache pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new dc0ba1cba74 Packaging: accept normalized Marvin archive names (#13793)
dc0ba1cba74 is described below
commit dc0ba1cba7475f2c5e0d6346a0e974549c35f00e
Author: Brad <[email protected]>
AuthorDate: Fri Sep 11 21:05:07 2026 +0100
Packaging: accept normalized Marvin archive names (#13793)
* packaging: accept normalized Marvin archive name
* packaging: accept normalized Marvin archives in RPMs
Use [Mm]arvin-*.tar.gz when copying, listing and installing the
Marvin archive in the EL8 and SUSE15 RPM specs. Keep legacy
uppercase archive names supported.
Tighten the Debian manifest to the same version-delimited pattern.
---
debian/cloudstack-marvin.install | 2 +-
debian/cloudstack-marvin.postinst | 2 +-
debian/rules | 2 +-
packaging/el8/cloud.spec | 6 +++---
packaging/suse15/cloud.spec | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/cloudstack-marvin.install b/debian/cloudstack-marvin.install
index 5dca252c9ad..324eb76484c 100644
--- a/debian/cloudstack-marvin.install
+++ b/debian/cloudstack-marvin.install
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-/usr/share/cloudstack-marvin/Marvin*.tar.gz
+/usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
diff --git a/debian/cloudstack-marvin.postinst
b/debian/cloudstack-marvin.postinst
index a049c1de611..8adc62544f9 100755
--- a/debian/cloudstack-marvin.postinst
+++ b/debian/cloudstack-marvin.postinst
@@ -20,4 +20,4 @@
set -e
python3 -m pip install --upgrade pip
-python3 -m pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+python3 -m pip install --upgrade
/usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
diff --git a/debian/rules b/debian/rules
index 32744782330..e67a1279626 100755
--- a/debian/rules
+++ b/debian/rules
@@ -177,7 +177,7 @@ override_dh_auto_install:
# cloudstack-marvin
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-marvin
- cp tools/marvin/dist/Marvin-*.tar.gz
$(DESTDIR)/usr/share/$(PACKAGE)-marvin/
+ cp tools/marvin/dist/[Mm]arvin-*.tar.gz
$(DESTDIR)/usr/share/$(PACKAGE)-marvin/
# cloudstack-integration-tests
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests
diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec
index 3ba2e4d5789..9d8cab84616 100644
--- a/packaging/el8/cloud.spec
+++ b/packaging/el8/cloud.spec
@@ -392,7 +392,7 @@ install -D
usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}
# Marvin
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
-cp tools/marvin/dist/Marvin-*.tar.gz
${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
+cp tools/marvin/dist/[Mm]arvin-*.tar.gz
${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
# integration-tests
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
@@ -601,7 +601,7 @@ fi
%post marvin
pip3 install --upgrade
https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
-pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+pip3 install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
#No default permission as the permission setup is complex
%files management
@@ -711,7 +711,7 @@ pip3 install --upgrade
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
%files marvin
-%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
+%attr(0644,root,root) %{_datadir}/%{name}-marvin/[Mm]arvin-*.tar.gz
%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec
index cdfc5a72a34..04ab6690428 100644
--- a/packaging/suse15/cloud.spec
+++ b/packaging/suse15/cloud.spec
@@ -390,7 +390,7 @@ install -D
usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}
# Marvin
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
-cp tools/marvin/dist/Marvin-*.tar.gz
${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
+cp tools/marvin/dist/[Mm]arvin-*.tar.gz
${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
# integration-tests
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
@@ -599,7 +599,7 @@ fi
%post marvin
pip3 install --upgrade
https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
-pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+pip3 install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
#No default permission as the permission setup is complex
%files management
@@ -709,7 +709,7 @@ pip3 install --upgrade
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
%files marvin
-%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
+%attr(0644,root,root) %{_datadir}/%{name}-marvin/[Mm]arvin-*.tar.gz
%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
