Skip to content

sm for XCP-ng 9 #82

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

Draft
ydirson wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

sm for XCP-ng 9 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7635172
Import sm-3.2.12-4.xs8.src.rpm
ydirson Jul 10, 2025
b17ab38
Import sm-3.2.12-7.xs8.src.rpm
ydirson Jul 10, 2025
763230c
Import mk/sm.spec.in from v3.2.12
ydirson Jul 11, 2025
8f936d6
Import sm-3.2.12-8.xs8.src.rpm
ydirson Jul 10, 2025
0f5ea8b
Import mk/sm.spec.in from v4.1.3
ydirson Jul 11, 2025
32495e4
Merge branch 'XS-8.3' into HEAD
ydirson Jul 10, 2025
d938381
Refresh patches
ydirson Jul 10, 2025
6258a66
Adjust deps for Almalinux 9
ydirson Jul 10, 2025
8058040
Merge branch 'upstream-spec'
ydirson Jul 11, 2025
7dc7058
Sync with new upstream v4.1.3
ydirson Jul 11, 2025
72f983b
Skipped all XCP-ng patches for now
ydirson Jul 11, 2025
57a275b
New patch: install relative symlinks
ydirson Jul 11, 2025
7c248d8
TEMP HACK use device-mapper-multipath/lvm2 not XS forks
ydirson Oct 29, 2024
4cf6077
HACK disable patching of non-existant cgrules.conf
ydirson Jul 11, 2025
237b6f8
fixup! Sync with new upstream v4.1.3
ydirson Jul 11, 2025
a31be1e
Fix compat symlinks also being included in main package
ydirson Jul 29, 2025
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
8 changes: 4 additions & 4 deletions SOURCES/0001-Update-xs-sm.service-s-description-for-XCP-ng.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ forked git repo for sm in the xcp-ng github organisation.
systemd/xs-sm.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systemd/xs-sm.service b/systemd/xs-sm.service
index 99cb313f..609c6ef5 100644
--- a/systemd/xs-sm.service
+++ b/systemd/xs-sm.service
Index: sm-3.2.12/systemd/xs-sm.service
===================================================================
--- sm-3.2.12.orig/systemd/xs-sm.service
+++ sm-3.2.12/systemd/xs-sm.service
@@ -1,5 +1,5 @@
[Unit]
-Description=XenServer Storage Manager (SM)
Expand Down
32 changes: 15 additions & 17 deletions SOURCES/0002-feat-drivers-add-CephFS-and-GlusterFS-drivers.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Subject: [PATCH] feat(drivers): add CephFS and GlusterFS drivers
create mode 100644 drivers/CephFSSR.py
create mode 100644 drivers/GlusterFSSR.py

diff --git a/Makefile b/Makefile
index e6ff5a7a..d4f540f4 100755
--- a/Makefile
+++ b/Makefile
Index: sm-3.2.12/Makefile
===================================================================
--- sm-3.2.12.orig/Makefile
+++ sm-3.2.12/Makefile
@@ -14,6 +14,8 @@ SM_DRIVERS += LVHDoHBA
SM_DRIVERS += SHM
SM_DRIVERS += SMB
Expand All @@ -25,11 +25,10 @@ index e6ff5a7a..d4f540f4 100755

SM_LIBS := SR
SM_LIBS += SRCommand
diff --git a/drivers/CephFSSR.py b/drivers/CephFSSR.py
new file mode 100644
index 00000000..415152f7
Index: sm-3.2.12/drivers/CephFSSR.py
===================================================================
--- /dev/null
+++ b/drivers/CephFSSR.py
+++ sm-3.2.12/drivers/CephFSSR.py
@@ -0,0 +1,296 @@
+#!/usr/bin/env python
+#
Expand Down Expand Up @@ -327,11 +326,10 @@ index 00000000..415152f7
+ SRCommand.run(CephFSSR, DRIVER_INFO)
+else:
+ SR.registerSR(CephFSSR)
diff --git a/drivers/GlusterFSSR.py b/drivers/GlusterFSSR.py
new file mode 100644
index 00000000..72c482ae
Index: sm-3.2.12/drivers/GlusterFSSR.py
===================================================================
--- /dev/null
+++ b/drivers/GlusterFSSR.py
+++ sm-3.2.12/drivers/GlusterFSSR.py
@@ -0,0 +1,287 @@
+#!/usr/bin/env python
+#
Expand Down Expand Up @@ -620,11 +618,11 @@ index 00000000..72c482ae
+ SRCommand.run(GlusterFSSR, DRIVER_INFO)
+else:
+ SR.registerSR(GlusterFSSR)
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index 76fcb8d1..24496ac4 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -2987,7 +2987,9 @@ def normalizeType(type):
Index: sm-3.2.12/drivers/cleanup.py
===================================================================
--- sm-3.2.12.orig/drivers/cleanup.py
+++ sm-3.2.12/drivers/cleanup.py
@@ -2991,7 +2991,9 @@ def normalizeType(type):
if type in ["lvm", "lvmoiscsi", "lvmohba", "lvmofcoe"]:
# temporary while LVHD is symlinked as LVM
type = SR.TYPE_LVHD
Expand Down
25 changes: 12 additions & 13 deletions SOURCES/0003-feat-drivers-add-XFS-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ Signed-off-by: Yann Dirson <yann.dirson@vates.fr>
3 files changed, 251 insertions(+)
create mode 100755 drivers/XFSSR.py

diff --git a/Makefile b/Makefile
index d4f540f4..cdf39f32 100755
--- a/Makefile
+++ b/Makefile
Index: sm-3.2.12/Makefile
===================================================================
--- sm-3.2.12.orig/Makefile
+++ sm-3.2.12/Makefile
@@ -16,6 +16,7 @@ SM_DRIVERS += SMB
SM_DRIVERS += LVHDoFCoE
SM_DRIVERS += CephFS
Expand All @@ -32,11 +32,10 @@ index d4f540f4..cdf39f32 100755

SM_LIBS := SR
SM_LIBS += SRCommand
diff --git a/drivers/XFSSR.py b/drivers/XFSSR.py
new file mode 100755
index 00000000..1dfde095
Index: sm-3.2.12/drivers/XFSSR.py
===================================================================
--- /dev/null
+++ b/drivers/XFSSR.py
+++ sm-3.2.12/drivers/XFSSR.py
@@ -0,0 +1,249 @@
+#!/usr/bin/python3
+#
Expand Down Expand Up @@ -287,11 +286,11 @@ index 00000000..1dfde095
+ SRCommand.run(XFSSR, DRIVER_INFO)
+else:
+ SR.registerSR(XFSSR)
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index 24496ac4..7fb8f8fa 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -2989,6 +2989,7 @@ def normalizeType(type):
Index: sm-3.2.12/drivers/cleanup.py
===================================================================
--- sm-3.2.12.orig/drivers/cleanup.py
+++ sm-3.2.12/drivers/cleanup.py
@@ -2993,6 +2993,7 @@ def normalizeType(type):
type = SR.TYPE_LVHD
if type in [
"ext", "nfs", "ocfsoiscsi", "ocfsohba", "smb", "cephfs", "glusterfs",
Expand Down
35 changes: 17 additions & 18 deletions SOURCES/0004-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Subject: [PATCH] feat(drivers): add ZFS driver to avoid losing VDI metadata
4 files changed, 149 insertions(+), 1 deletion(-)
create mode 100644 drivers/ZFSSR.py

diff --git a/Makefile b/Makefile
index cdf39f32..95aa5b2b 100755
--- a/Makefile
+++ b/Makefile
Index: sm-3.2.12/Makefile
===================================================================
--- sm-3.2.12.orig/Makefile
+++ sm-3.2.12/Makefile
@@ -17,6 +17,7 @@ SM_DRIVERS += LVHDoFCoE
SM_DRIVERS += CephFS
SM_DRIVERS += GlusterFS
Expand All @@ -24,11 +24,11 @@ index cdf39f32..95aa5b2b 100755

SM_LIBS := SR
SM_LIBS += SRCommand
diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
index 47fefd83..120b92fc 100755
--- a/drivers/XE_SR_ERRORCODES.xml
+++ b/drivers/XE_SR_ERRORCODES.xml
@@ -915,5 +915,15 @@
Index: sm-3.2.12/drivers/XE_SR_ERRORCODES.xml
===================================================================
--- sm-3.2.12.orig/drivers/XE_SR_ERRORCODES.xml
+++ sm-3.2.12/drivers/XE_SR_ERRORCODES.xml
@@ -921,5 +921,15 @@
<value>1200</value>
</code>

Expand All @@ -44,11 +44,10 @@ index 47fefd83..120b92fc 100755
+ <value>5001</value>
+ </code>
</SM-errorcodes>
diff --git a/drivers/ZFSSR.py b/drivers/ZFSSR.py
new file mode 100644
index 00000000..1b2f398f
Index: sm-3.2.12/drivers/ZFSSR.py
===================================================================
--- /dev/null
+++ b/drivers/ZFSSR.py
+++ sm-3.2.12/drivers/ZFSSR.py
@@ -0,0 +1,137 @@
+#!/usr/bin/env python
+#
Expand Down Expand Up @@ -187,11 +186,11 @@ index 00000000..1b2f398f
+ SRCommand.run(ZFSSR, DRIVER_INFO)
+else:
+ SR.registerSR(ZFSSR)
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index 7fb8f8fa..62e283ab 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -2989,7 +2989,7 @@ def normalizeType(type):
Index: sm-3.2.12/drivers/cleanup.py
===================================================================
--- sm-3.2.12.orig/drivers/cleanup.py
+++ sm-3.2.12/drivers/cleanup.py
@@ -2993,7 +2993,7 @@ def normalizeType(type):
type = SR.TYPE_LVHD
if type in [
"ext", "nfs", "ocfsoiscsi", "ocfsohba", "smb", "cephfs", "glusterfs",
Expand Down
Loading