split package into pve-cluster/pmxcfs and perl modules

with the former containing:
- pmxcfs binary + service
- IPCC perl bindings
- PVE::Cluster

and the latter being further split into

libpve-cluster-perl:
- PVE::DataCenterConfig
- various other perl modules not directly related to pmxcfs

and libpve-cluster-api-perl:
- ClusterConfig API
- pvecm CLI
- PVE::Corosync
- PVE::Cluster::Setup helper module

this second split is needed to avoid a (pre-existing) circular
dependency between libpve-access-control and libpve-cluster-perl:
- the cluster API code uses PVE::RPCEnvironment
- the access-control API code uses PVE::DataCenterConfig

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/control b/debian/control
index e7f1746f1bf1d1dbc9a645ec7792e4345e1668f6..6fd494fbd898f856c6158db9742daae20d55f530 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: check,
-               libcorosync-common-dev,
                debhelper (>= 10),
                libcmap-dev (>= 0.17.1-1),
+               libcorosync-common-dev,
                libcpg-dev (>= 2.3.4-1),
                libdigest-hmac-perl,
                libfuse-dev (>= 2.9.2-4),
                libglib2.0-dev (>= 2.42.1-1),
-               libpve-apiclient-perl,
                libpve-access-control,
+               libpve-apiclient-perl,
                libpve-common-perl (>= 5.0-28),
                libqb-dev (>= 0.17.1-1),
                libquorum-dev (>= 2.3.4-1),
@@ -28,21 +28,12 @@ Package: pve-cluster
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends},
 Depends: corosync (>= 2.3.4-1),
-         faketime,
          fuse,
-         libcrypt-ssleay-perl,
-         libdigest-hmac-perl,
          libfuse2 (>= 2.9.2-4),
          libglib2.0-0 (>= 2.42.1-1),
-         libpve-apiclient-perl,
          libpve-common-perl (>= 6.0-7~),
          libqb0 (>= 0.17.1-1),
-         librrds-perl,
          libsqlite3-0,
-         libuuid-perl,
-         openssl,
-         rrdcached,
-         rsync,
          sqlite3,
          systemd,
          ${misc:Depends},
@@ -55,7 +46,43 @@ Breaks: libpve-access-control (<= 6.0-3),
         pve-ha-manager (<= 3.0-2),
         pve-manager (<= 6.0-11),
         qemu-server (<= 6.0-13),
-Description: Cluster Infrastructure for Proxmox Virtual Environment
- This package contains the Cluster Infrastructure for the Proxmox
- Virtual Environment, namely a distributed filesystem to store
- configuration data on all nodes.
+Description: The "pmxcfs" distributed cluster filesystem for Proxmox Virtual Environment.
+  This FUSE filesystem is using corosync and sqlite3 to provide a cluster-wide,
+  consistent view of config and other files.
+
+Package: libpve-cluster-perl
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libcrypt-ssleay-perl,
+         libpve-apiclient-perl,
+         libpve-common-perl (>= 6.0-7~),
+         librrds-perl,
+         rrdcached,
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends},
+Breaks: pve-cluster (<= 6.0-7),
+Replaces: pve-cluster (<= 6.0-7),
+Description: The Proxmox Virtual Environment cluster Perl modules.
+  This package contains various cluster-related perl modules.
+
+Package: libpve-cluster-api-perl
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends},
+Depends: faketime,
+         libcrypt-ssleay-perl,
+         libdigest-hmac-perl,
+         libpve-access-control,
+         libpve-apiclient-perl,
+         libpve-cluster-perl,
+         libpve-common-perl (>= 5.0-28),
+         libuuid-perl,
+         openssl,
+         rsync,
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends},
+Breaks: pve-cluster (<= 6.0-7),
+Replaces: pve-cluster (<= 6.0-7),
+Description: The Proxmox Virtual Environment cluster Perl modules.
+  This package contains the API2 endpoints and CLI binary 'pvecm'.

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index a07aa4e..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin
-/var/lib/pve-cluster

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 310840d..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-debian/SOURCE

diff --git a/debian/install b/debian/install
deleted file mode 100644 (file)
index c1ec5ec..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/sysctl.d/pve.conf etc/sysctl.d

diff --git a/debian/libpve-cluster-api-perl.docs b/debian/libpve-cluster-api-perl.docs
new file mode 100644 (file)
index 0000000..8696672
--- /dev/null
+++ b/debian/libpve-cluster-api-perl.docs
@@ -0,0 +1 @@
+debian/SOURCE

diff --git a/debian/libpve-cluster-api-perl.install b/debian/libpve-cluster-api-perl.install
new file mode 100644 (file)
index 0000000..44a04c6
--- /dev/null
+++ b/debian/libpve-cluster-api-perl.install
@@ -0,0 +1,7 @@
+usr/bin/pvecm
+usr/share/bash-completion/completions/pvecm
+usr/share/man/man1/pvecm.1
+usr/share/perl5/PVE/API2
+usr/share/perl5/PVE/CLI
+usr/share/perl5/PVE/Cluster/Setup.pm
+usr/share/zsh/vendor-completions/_pvecm

diff --git a/debian/libpve-cluster-api-perl.triggers b/debian/libpve-cluster-api-perl.triggers
new file mode 100644 (file)
index 0000000..59dd688
--- /dev/null
+++ b/debian/libpve-cluster-api-perl.triggers
@@ -0,0 +1 @@
+activate-noawait pve-api-updates

diff --git a/debian/libpve-cluster-perl.docs b/debian/libpve-cluster-perl.docs
new file mode 100644 (file)
index 0000000..8696672
--- /dev/null
+++ b/debian/libpve-cluster-perl.docs
@@ -0,0 +1 @@
+debian/SOURCE

diff --git a/debian/libpve-cluster-perl.install b/debian/libpve-cluster-perl.install
new file mode 100644 (file)
index 0000000..51223f9
--- /dev/null
+++ b/debian/libpve-cluster-perl.install
@@ -0,0 +1,5 @@
+usr/share/man/man5/datacenter.cfg.5
+usr/share/perl5/PVE/Corosync.pm
+usr/share/perl5/PVE/DataCenterConfig.pm
+usr/share/perl5/PVE/RRD.pm
+usr/share/perl5/PVE/SSHInfo.pm

diff --git a/debian/pve-cluster.dirs b/debian/pve-cluster.dirs
new file mode 100644 (file)
index 0000000..a07aa4e
--- /dev/null
+++ b/debian/pve-cluster.dirs
@@ -0,0 +1,2 @@
+/usr/bin
+/var/lib/pve-cluster

diff --git a/debian/pve-cluster.docs b/debian/pve-cluster.docs
new file mode 100644 (file)
index 0000000..310840d
--- /dev/null
+++ b/debian/pve-cluster.docs
@@ -0,0 +1,2 @@
+README
+debian/SOURCE

diff --git a/debian/pve-cluster.install b/debian/pve-cluster.install
new file mode 100644 (file)
index 0000000..407972a
--- /dev/null
+++ b/debian/pve-cluster.install
@@ -0,0 +1,8 @@
+debian/sysctl.d/pve.conf etc/sysctl.d
+usr/bin/create_pmxcfs_db
+usr/bin/pmxcfs
+usr/lib/
+usr/share/man/man8/pmxcfs.8
+usr/share/perl5/PVE/Cluster.pm
+usr/share/perl5/PVE/Cluster/IPCConst.pm
+usr/share/perl5/PVE/IPCC.pm

diff --git a/debian/pve-cluster.triggers b/debian/pve-cluster.triggers
deleted file mode 100644 (file)
index 59dd688..0000000
--- a/debian/pve-cluster.triggers
+++ /dev/null
@@ -1 +0,0 @@
-activate-noawait pve-api-updates

diff --git a/debian/rules b/debian/rules
index 7a9be9e3eed00b8cded8dde4865b2af7bef2bd6c..7fe972705d6f0f85cfa8bd2788086fd1a7b6a000 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,6 @@ override_dh_systemd_start:
        dh_systemd_start --restart-after-upgrade
 
 override_dh_installinit:
+
+override_dh_missing:
+       dh_missing --fail-missing