[Buildroot] [git commit branch/2021.05.x] package/swupdate: use package make install for target install
Peter Korsgaard
peter at korsgaard.com
Mon Sep 13 09:34:04 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=afdeb5845c070e34a2b10f0add6fd0ecb490fe7e
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.05.x
This ensures all tools/libraries will be properly installed.
Update SWUPDATE_BUILD_CMDS param ordering for consistency.
Signed-off-by: James Hilliard <james.hilliard1 at gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
(cherry picked from commit 08de8f500e6223a67df96eaf869766a97b4d039f)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
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 10c5f2d1f9..12dafcc1a2 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -168,11 +168,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)
More information about the buildroot
mailing list