Rework package generation

Cargo.toml

@@ -66,17 +66,22 @@ depends = [
     "libgssapi-krb5-2 (>= 1.19)",
 ]
 assets = [
-  ["target/release/sybil", "/usr/sbin/sybil", "755"],
-  ["target/release/sybild", "/usr/sbin/sybild", "755"],
-  ["target/release/libsybil.so", "/usr/lib/slurm/spank_sybil.so", "644"],
-  ["pkg/sybil.toml", "/etc/sybil.toml", "644"],
-  ["pkg/sybil.env", "/etc/default/sybil", "644"],
-  ["pkg/slurm.override", "/lib/systemd/system/slurmd.service.d/sybil.conf", "644"],
+  ["target/release/sybil", "usr/sbin/sybil", "755"],
+  ["target/release/sybild", "usr/sbin/sybild", "755"],
+  ["pkg/sybil.toml", "etc/sybil.toml", "644"],
+  ["pkg/sybil.env", "etc/default/sybil", "644"],
 ]
 conf-files = [
-    "/etc/sybil.toml",
-    "/etc/default/sybil",
-    "/lib/systemd/system/slurmd.service.d/sybil.conf"
+    "etc/sybil.toml",
+    "etc/default/sybil",
+]
+
+[package.metadata.deb.variants.spank]
+depends = [ "sybil (>= 2.0)" ]
+assets = [
+  ["target/release/libsybil.so", "usr/lib/slurm/spank_sybil.so", "644"],
+  ["pkg/slurmd.conf", "usr/share/sybil/slurm/slurmd.conf", "644"],
+  ["pkg/plugstack.conf", "usr/share/sybil/slurm/plugstack.conf", "644"],
 ]
 
 [package.metadata.generate-rpm]
@@ -86,8 +91,15 @@ assets = [
   {source = "pkg/rpm/sybil.service", dest = "/lib/systemd/system/sybil.service", mode = "644"},
   {source = "target/release/sybil", dest = "/usr/sbin/sybil", mode = "755"},
   {source = "target/release/sybild", dest = "/usr/sbin/sybild", mode = "755"},
-  {source = "target/release/libsybil.so", dest = "/usr/lib64/slurm/spank_sybil.so", mode = "644"},
   {source = "pkg/sybil.toml", dest = "/etc/sybil.toml", mode = "644", config = true},
   {source = "pkg/sybil.env", dest = "/etc/sysconfig/sybil", mode = "644", config = true},
-  {source = "pkg/slurm.override", dest = "/lib/systemd/system/slurmd.service.d/sybil.conf", mode = "644", config = true},
+]
+
+[package.metadata.generate-rpm.variants.spank]
+name = "sybil-spank"
+requires = { sybil = ">= 2.0" }
+assets = [
+  {source = "target/release/libsybil.so", dest = "/usr/lib64/slurm/spank_sybil.so", mode = "644"},
+  {source = "pkg/slurmd.conf", dest = "/usr/share/sybil/slurm/slurmd.conf", mode = "644"},
+  {source = "pkg/plugstack.conf", dest = "/usr/share/sybil/slurm/plugstack.conf", mode = "644"},
 ]

Makefile

@@ -1,23 +1,32 @@
 export SLURM_VERSION ?= 24.11
+export TARGET ?= $(shell rustc -vV | awk '/host/{print $$2}')
 
 check:
 	cargo clippy --all-features
 
 debug:
-	cargo build
-	[ "$$WITH_SLURM" = "1" ] && cargo rustc --lib --crate-type=cdylib --features slurm ||:
+	cargo build --target $(TARGET)
+ifdef WITH_SLURM
+	cargo rustc --target $(TARGET) --lib --crate-type=cdylib --features slurm
+endif
 
 release:
-	cargo build --release
-	[ "$$WITH_SLURM" = "1" ] && cargo rustc --release --lib --crate-type=cdylib --features slurm ||:
+	cargo build --target $(TARGET) --release
+ifdef WITH_SLURM
+	cargo rustc --target $(TARGET) --release --lib --crate-type=cdylib --features slurm
+endif
 
-deb: export WITH_SLURM := 1
 deb: release
-	cargo deb --no-build
+	cargo deb --target $(TARGET) --no-build --multiarch foreign
+ifdef WITH_SLURM
+	cargo deb --target $(TARGET) --no-build --multiarch foreign --variant spank
+endif
 
-rpm: export WITH_SLURM := 1
 rpm: release
-	cargo generate-rpm
+	cargo generate-rpm --target $(TARGET)
+ifdef WITH_SLURM
+	cargo generate-rpm --target $(TARGET) --variant spank
+endif
 
 clean:
 	cargo clean

pkg/plugstack.conf

@@ -0,0 +1 @@
+required spank_sybil.so min_tkt_lifetime=