diff mbox series

[1/4] package/mender/mender.mk: use MENDER_PKGDIR variable

Message ID 20210320222835.3951325-2-aduskett@gmail.com
State Accepted
Headers show
Series mender updates | expand

Commit Message

Adam Duskett March 20, 2021, 10:28 p.m. UTC 
From: Adam Duskett <Aduskett@rivian.com>

Currently there is a mix of calls to package/mender and $(MENDER_PKGDIR) in the
mender.mk file. Standardize the calls to only $(MENDER_PKGDIR).

Signed-off-by: Adam Duskett <Aduskett@rivian.com>
---
 package/mender/mender.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni March 30, 2021, 8:30 p.m. UTC | #1 
On Sat, 20 Mar 2021 15:28:32 -0700
aduskett@gmail.com wrote:

> From: Adam Duskett <Aduskett@rivian.com>
> 
> Currently there is a mix of calls to package/mender and $(MENDER_PKGDIR) in the
> mender.mk file. Standardize the calls to only $(MENDER_PKGDIR).
> 
> Signed-off-by: Adam Duskett <Aduskett@rivian.com>
> ---
>  package/mender/mender.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
Peter Korsgaard April 3, 2021, 4:06 p.m. UTC | #2 
>>>>> "aduskett" == aduskett  <aduskett@gmail.com> writes:

 > From: Adam Duskett <Aduskett@rivian.com>
 > Currently there is a mix of calls to package/mender and $(MENDER_PKGDIR) in the
 > mender.mk file. Standardize the calls to only $(MENDER_PKGDIR).

 > Signed-off-by: Adam Duskett <Aduskett@rivian.com>

Committed to 2020.11.x and 2021.02.x, thanks.
diff mbox series

Patch

diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index bb37f2d8ed..3e82f556fb 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -62,10 +62,10 @@  define MENDER_INSTALL_CONFIG_FILES
 			$(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f)
 	)
 
-	$(INSTALL) -D -m 0755 package/mender/artifact_info \
+	$(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/artifact_info \
 			$(TARGET_DIR)/etc/mender/artifact_info
 
-	$(INSTALL) -D -m 0755 package/mender/device_type \
+	$(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/device_type \
 			$(TARGET_DIR)/etc/mender/device_type
 
 	mkdir -p $(TARGET_DIR)/var/lib
@@ -84,7 +84,7 @@  define MENDER_INSTALL_INIT_SYSTEMD
 endef
 
 define MENDER_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 755 package/mender/S42mender \
+	$(INSTALL) -D -m 755 $(MENDER_PKGDIR)/S42mender \
 		$(TARGET_DIR)/etc/init.d/S42mender
 endef