From 0eb6b605c5b958e8b73027fb62595a777232db05 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 16 Apr 2021 13:47:18 +0530 Subject: [PATCH 1/2] debian: remove duplicate agent jar copy The cloud-agent is dependency of the KVM hypervisor plugin, don't explicitly install/copy it again. Fixes #4906 Signed-off-by: Rohit Yadav --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index de45255d9bd8..cfb497a325cc 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,6 @@ override_dh_auto_install: mkdir $(DESTDIR)/$(SYSCONFDIR)/profile.d mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins - install -D agent/target/cloud-agent-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ From 5d31d90297c5b5e9a984fac8907d4527216c1188 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 16 Apr 2021 15:16:50 +0530 Subject: [PATCH 2/2] Update rules --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index cfb497a325cc..a19089a18165 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,7 @@ override_dh_auto_install: mkdir $(DESTDIR)/$(SYSCONFDIR)/profile.d mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins + mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/