From 08de8f500e6223a67df96eaf869766a97b4d039f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 28 Aug 2021 20:46:27 -0600 Subject: [PATCH] package/swupdate: use package make install for target install This ensures all tools/libraries will be properly installed. Update SWUPDATE_BUILD_CMDS param ordering for consistency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/swupdate/swupdate.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index f4a398ac8e..fd0fb763c9 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -195,11 +195,12 @@ define SWUPDATE_KCONFIG_FIXUP_CMDS endef define SWUPDATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) $(SWUPDATE_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS) endef define SWUPDATE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/swupdate $(TARGET_DIR)/usr/bin/swupdate + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install $(if $(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE), \ mkdir -p $(TARGET_DIR)/var/www/swupdate; \ cp -dpfr $(@D)/examples/www/v2/* $(TARGET_DIR)/var/www/swupdate)