split into implementation and API endpoint packages

To better handle the case where firewall requires to parse the SDN
config and this package here would like to mount some vnet specific
firewall endpoints, without a split we got a cyclic dependency here,
and those are painful, especially on bootstrapping.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 3de2ff0841048da5bc2621313683b29970465e72..ac1f823af62be4b04a65fc1ecfe6b9aba026f94b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,17 @@ PACKAGE=libpve-network-perl
 
 BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+DEBS=\
+      $(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb \
+      libpve-network-api-perl_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb \
+
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 all: deb
 
 .PHONY: dinstall
 dinstall: deb
-       dpkg -i $(DEB)
+       dpkg -i $(DEBS)
 
 $(BUILDDIR): src debian
        rm -rf $@ $@.tmp
@@ -21,10 +24,10 @@ $(BUILDDIR): src debian
        mv $@.tmp $@
 
 .PHONY: deb
-deb: $(DEB)
-$(DEB): $(BUILDDIR)
+deb: $(DEBS)
+$(DEBS): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
-       lintian $(DEB)
+       lintian $(DEBS)
 
 .PHONY: dsc
 dsc: clean
@@ -44,5 +47,5 @@ clean:
 
 .PHONY: upload
 upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: $(DEB)
-       tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
+upload: $(DEBS)
+       tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)

diff --git a/debian/control b/debian/control
index 6c08fbf7d6db5a4d53699ac99b18d735b46d64b5..687bbd7c493dd453f4ba58ad2a30109dfbccd549 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,5 +26,18 @@ Depends: libpve-common-perl (>= 5.0-45),
 Recommends: ifupdown2
 Suggests: frr-pythontools (>= 8.5.1~), dnsmasq,
 Description: Proxmox VE's SDN (Software Defined Network) stack
- This package contains the Software Defined Network (tech preview) for
+ This package contains the perl side of the Software Defined Network
+ implementation for Proxmox VE.
+
+Package: libpve-network-api-perl
+Architecture: all
+Depends: libpve-common-perl (>= 5.0-45),
+         pve-cluster (>= 8.0.9),
+         libpve-network-perl (= ${binary:Version}),
+         ${misc:Depends},
+         ${perl:Depends},
+Breaks: libpve-network-perl (<< 0.9.9~),
+Replaces: pve-cluster (<< 0.9.9~),
+Description: API endpoints for Proxmox VE's SDN stack
+ This package contains the API endpoints for the Software Defined Network of
  Proxmox VE.

diff --git a/debian/libpve-network-api-perl.install b/debian/libpve-network-api-perl.install
new file mode 100644 (file)
index 0000000..c48f1c7
--- /dev/null
+++ b/debian/libpve-network-api-perl.install
@@ -0,0 +1 @@
+usr/share/perl5/PVE/API2

diff --git a/debian/libpve-network-perl.install b/debian/libpve-network-perl.install
new file mode 100644 (file)
index 0000000..b7cc7c8
--- /dev/null
+++ b/debian/libpve-network-perl.install
@@ -0,0 +1,2 @@
+lib/systemd/system/dnsmasq@.service.d/00-dnsmasq-after-networking.conf
+usr/share/perl5/PVE/Network