This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a commit to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.22 by this push:
new a289bb0e6c0 Update suse15 packaging spec, use qemu-ovmf-x86_64 package
instead of edk2-ovmf for agent (#13133)
a289bb0e6c0 is described below
commit a289bb0e6c0dafbcb3e6dec60e5d3933f5b61a95
Author: Suresh Kumar Anaparti <[email protected]>
AuthorDate: Mon May 11 20:15:16 2026 +0530
Update suse15 packaging spec, use qemu-ovmf-x86_64 package instead of
edk2-ovmf for agent (#13133)
* Update qemu-ovmf-x86_64 package in agent for suse instead of edk2-ovmf
for agent
* Maintain separate properties file for suse15 (UEFI properties are
different for suse15)
* Maintain separate packaging spec for suse15
---
packaging/el8/cloud.spec | 2 +-
packaging/suse15 | 1 -
packaging/suse15/cloud-ipallocator.rc | 1 +
packaging/suse15/cloud.limits | 1 +
packaging/{el8 => suse15}/cloud.spec | 12 +++----
packaging/suse15/cloudstack-agent.te | 1 +
packaging/suse15/cloudstack-sccs | 1 +
packaging/suse15/filelimit.conf | 1 +
packaging/suse15/replace.properties | 65 +++++++++++++++++++++++++++++++++++
9 files changed, 77 insertions(+), 8 deletions(-)
diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec
index 3dee161bf27..13c0a36cb10 100644
--- a/packaging/el8/cloud.spec
+++ b/packaging/el8/cloud.spec
@@ -117,7 +117,7 @@ Requires: ipset
Requires: perl
Requires: rsync
Requires: cifs-utils
-Requires: edk2-ovmf
+Requires: (edk2-ovmf or qemu-ovmf-x86_64)
Requires: swtpm
Requires: (python3-libvirt or python3-libvirt-python)
Requires: (qemu-img or qemu-tools)
diff --git a/packaging/suse15 b/packaging/suse15
deleted file mode 120000
index 4dad90d45e0..00000000000
--- a/packaging/suse15
+++ /dev/null
@@ -1 +0,0 @@
-el8
\ No newline at end of file
diff --git a/packaging/suse15/cloud-ipallocator.rc
b/packaging/suse15/cloud-ipallocator.rc
new file mode 120000
index 00000000000..647598e6dc4
--- /dev/null
+++ b/packaging/suse15/cloud-ipallocator.rc
@@ -0,0 +1 @@
+../el8/cloud-ipallocator.rc
\ No newline at end of file
diff --git a/packaging/suse15/cloud.limits b/packaging/suse15/cloud.limits
new file mode 120000
index 00000000000..37be77e3acf
--- /dev/null
+++ b/packaging/suse15/cloud.limits
@@ -0,0 +1 @@
+../el8/cloud.limits
\ No newline at end of file
diff --git a/packaging/el8/cloud.spec b/packaging/suse15/cloud.spec
similarity index 98%
copy from packaging/el8/cloud.spec
copy to packaging/suse15/cloud.spec
index 3dee161bf27..cdfc5a72a34 100644
--- a/packaging/el8/cloud.spec
+++ b/packaging/suse15/cloud.spec
@@ -117,7 +117,7 @@ Requires: ipset
Requires: perl
Requires: rsync
Requires: cifs-utils
-Requires: edk2-ovmf
+Requires: (edk2-ovmf or qemu-ovmf-x86_64)
Requires: swtpm
Requires: (python3-libvirt or python3-libvirt-python)
Requires: (qemu-img or qemu-tools)
@@ -192,7 +192,7 @@ echo Doing CloudStack build
%build
-cp packaging/el8/replace.properties build/replace.properties
+cp packaging/suse15/replace.properties build/replace.properties
echo VERSION=%{_maventag} >> build/replace.properties
echo PACKAGE=%{name} >> build/replace.properties
touch build/gitrev.txt
@@ -243,7 +243,7 @@ cp -r python/lib/cloudutils
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/python-s
python3 -m py_compile
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/python-site/cloud_utils.py
python3 -m compileall
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/python-site/cloudutils
cp build/gitrev.txt ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
-cp packaging/el8/cloudstack-sccs ${RPM_BUILD_ROOT}/usr/bin
+cp packaging/suse15/cloudstack-sccs ${RPM_BUILD_ROOT}/usr/bin
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco
cp -r plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/*
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco
@@ -302,9 +302,9 @@ install python/bindir/cloud-external-ipallocator.py
${RPM_BUILD_ROOT}%{_bindir}/
install -D client/target/pythonlibs/jasypt-1.9.3.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
install -D utils/target/cloud-utils-%{_maventag}-bundled.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
-install -D packaging/el8/cloud-ipallocator.rc
${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
-install -D packaging/el8/cloud.limits
${RPM_BUILD_ROOT}%{_sysconfdir}/security/limits.d/cloud
-install -D packaging/el8/filelimit.conf
${RPM_BUILD_ROOT}%{_sysconfdir}/systemd/system/%{name}-management.service.d
+install -D packaging/suse15/cloud-ipallocator.rc
${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
+install -D packaging/suse15/cloud.limits
${RPM_BUILD_ROOT}%{_sysconfdir}/security/limits.d/cloud
+install -D packaging/suse15/filelimit.conf
${RPM_BUILD_ROOT}%{_sysconfdir}/systemd/system/%{name}-management.service.d
install -D packaging/systemd/cloudstack-management.service
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-management.service
install -D packaging/systemd/cloudstack-management.default
${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-management
install -D server/target/conf/cloudstack-sudoers
${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
diff --git a/packaging/suse15/cloudstack-agent.te
b/packaging/suse15/cloudstack-agent.te
new file mode 120000
index 00000000000..30e123f6cba
--- /dev/null
+++ b/packaging/suse15/cloudstack-agent.te
@@ -0,0 +1 @@
+../el8/cloudstack-agent.te
\ No newline at end of file
diff --git a/packaging/suse15/cloudstack-sccs b/packaging/suse15/cloudstack-sccs
new file mode 120000
index 00000000000..b9e6ed9dc08
--- /dev/null
+++ b/packaging/suse15/cloudstack-sccs
@@ -0,0 +1 @@
+../el8/cloudstack-sccs
\ No newline at end of file
diff --git a/packaging/suse15/filelimit.conf b/packaging/suse15/filelimit.conf
new file mode 120000
index 00000000000..c71688ea640
--- /dev/null
+++ b/packaging/suse15/filelimit.conf
@@ -0,0 +1 @@
+../el8/filelimit.conf
\ No newline at end of file
diff --git a/packaging/suse15/replace.properties
b/packaging/suse15/replace.properties
new file mode 100644
index 00000000000..b1900af8340
--- /dev/null
+++ b/packaging/suse15/replace.properties
@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+DBUSER=cloud
+DBPW=cloud
+DBROOTPW=
+MSLOG=vmops.log
+APISERVERLOG=api.log
+DBHOST=localhost
+DBDRIVER=jdbc:mysql
+COMPONENTS-SPEC=components-premium.xml
+REMOTEHOST=localhost
+AGENTCLASSPATH=
+AGENTLOG=/var/log/cloudstack/agent/agent.log
+AGENTLOGDIR=/var/log/cloudstack/agent/
+AGENTSYSCONFDIR=/etc/cloudstack/agent
+APISERVERLOG=/var/log/cloudstack/management/apilog.log
+BINDIR=/usr/bin
+COMMONLIBDIR=/usr/share/cloudstack-common
+CONFIGUREVARS=
+DEPSCLASSPATH=
+DOCDIR=
+IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
+JAVADIR=/usr/share/java
+LIBEXECDIR=/usr/libexec
+LOCKDIR=/var/lock
+MSCLASSPATH=
+MSCONF=/etc/cloudstack/management
+MSENVIRON=/usr/share/cloudstack-management
+MSLOG=/var/log/cloudstack/management/management-server.log
+MSLOGDIR=/var/log/cloudstack/management/
+MSMNTDIR=/var/cloudstack/mnt
+MSUSER=cloud
+PIDDIR=/var/run
+PLUGINJAVADIR=/usr/share/cloudstack-management/plugin
+PREMIUMJAVADIR=/usr/share/cloudstack-management/premium
+PYTHONDIR=/usr/share/cloudstack-common/python-site/
+SERVERSYSCONFDIR=/etc/sysconfig
+SETUPDATADIR=/usr/share/cloudstack-management/setup
+SYSCONFDIR=/etc/sysconfig
+SYSTEMCLASSPATH=
+SYSTEMJARS=
+USAGECLASSPATH=
+USAGELOG=/var/log/cloudstack/usage/usage.log
+USAGESYSCONFDIR=/etc/sysconfig
+EXTENSIONSDEPLOYMENTMODE=production
+GUESTNVRAMTEMPLATELEGACY=/usr/share/qemu/ovmf-x86_64-vars.bin
+GUESTLOADERLEGACY=/usr/share/qemu/ovmf-x86_64-code.bin
+GUESTNVRAMTEMPLATESECURE=/usr/share/qemu/ovmf-x86_64-ms-vars.bin
+GUESTLOADERSECURE=/usr/share/qemu/ovmf-x86_64-ms-code.bin
+GUESTNVRAMPATH=/var/lib/libvirt/qemu/nvram/
