summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirza Krak <mirza.krak@northern.tech>2018-08-20 15:09:12 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-10-21 16:07:10 +0200
commitbef30a9f4b58194e02ff5b2b6b78a3095c72c72c (patch)
tree4c70b2de57a5757a3d5c468d25861a33a33db0bb
parentc61b49e5b5c83237c8895d8caf76a9c448c41241 (diff)
downloadbuildroot-bef30a9f4b58194e02ff5b2b6b78a3095c72c72c.tar.gz
buildroot-bef30a9f4b58194e02ff5b2b6b78a3095c72c72c.zip
package/mender: use MENDER_PKGDIR to access local files
Utilize the predefined variable MENDER_PKGDIR which points to the directory containing mender.mk and Config.in, along with the local files. One benefit is also that it works when BR2_EXTERNAL is used, which makes it easier to "backport" this to an older external tree. Signed-off-by: Mirza Krak <mirza.krak@northern.tech> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/mender/mender.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 9275426a7b..37a99c1f18 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -38,10 +38,9 @@ define MENDER_INSTALL_CONFIG_FILES
$(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts
echo -n "2" > $(TARGET_DIR)/etc/mender/scripts/version
- $(INSTALL) -D -m 0644 package/mender/mender.conf \
+ $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.conf \
$(TARGET_DIR)/etc/mender/mender.conf
-
- $(INSTALL) -D -m 0644 package/mender/server.crt \
+ $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/server.crt \
$(TARGET_DIR)/etc/mender/server.crt
$(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \
@@ -55,7 +54,7 @@ endef
MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES
define MENDER_INSTALL_INIT_SYSTEMD
- $(INSTALL) -D -m 0644 package/mender/mender.service \
+ $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \
$(TARGET_DIR)/usr/lib/systemd/system/mender.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -fs ../../../../usr/lib/systemd/system/mender.service \
OpenPOWER on IntegriCloud