sts-sponsors team mailing list archive

[Alberto Donato <mp+435820@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:machine-resources-deb-fix into maas:master.

Commit message:
fix deb package inclusion of machine-resources binaries



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/435820
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:machine-resources-deb-fix into maas:master.

diff --git a/debian/rules b/debian/rules
index 33b52bd..eb1f4c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,9 +39,7 @@ override_dh_auto_install:
 	# Build and move lxd commissioning binaries
 	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/maas/machine-resources
 	# dependencies are already vendored, skip vendoring
-	make -C $(CURDIR)/src/host-info build-no-vendor
-	mv $(CURDIR)/src/host-info/bin/machine-resources/* \
-		$(CURDIR)/debian/tmp/usr/share/maas/machine-resources/
+	make -C $(CURDIR)/src/host-info build-no-vendor install DESTDIR=$(CURDIR)/debian/tmp
 
 	# install the apparmor profile
 	install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d