* [Buildroot] [PATCH] boot/afboot-stm32: create destination directory during installation
@ 2018-12-08 14:18 Thomas Petazzoni
2018-12-08 16:23 ` Yann E. MORIN
2018-12-08 19:50 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2018-12-08 14:18 UTC (permalink / raw)
To: buildroot
Following d0f4f95e390bcb1c953efa125f5277a8a235396e ("Makefile: rework
main directory creation logic"), BINARIES_DIR is not implicitly
created by the main Makefile at the beginning of the build, leaving
that up to whatever piece of code needs to install something in
$(BINARIES_DIR).
The afboot-stm32 package didn't pay attention to this, which this
commit fixes.
While at it, we move the afboot-stm32 installation into
<pkg>_INSTALL_IMAGES_CMDS, because using <pkg>_INSTALL_TARGET_CMDS to
install only files to BINARIES_DIR is a bit strange.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/131217111
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
boot/afboot-stm32/afboot-stm32.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/boot/afboot-stm32/afboot-stm32.mk b/boot/afboot-stm32/afboot-stm32.mk
index 042b21fa55..5e221cf364 100644
--- a/boot/afboot-stm32/afboot-stm32.mk
+++ b/boot/afboot-stm32/afboot-stm32.mk
@@ -6,13 +6,15 @@
AFBOOT_STM32_VERSION = v0.1
AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION))
+AFBOOT_STM32_INSTALL_IMAGES = YES
+AFBOOT_STM32_INSTALL_TARGET = NO
define AFBOOT_STM32_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) all
endef
-define AFBOOT_STM32_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 $(@D)/stm32*.bin $(BINARIES_DIR)
+define AFBOOT_STM32_INSTALL_IMAGES_CMDS
+ $(INSTALL) -m 0755 -t $(BINARIES_DIR) -D $(@D)/stm32*.bin
endef
$(eval $(generic-package))
--
2.19.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH] boot/afboot-stm32: create destination directory during installation
2018-12-08 14:18 [Buildroot] [PATCH] boot/afboot-stm32: create destination directory during installation Thomas Petazzoni
@ 2018-12-08 16:23 ` Yann E. MORIN
2018-12-08 19:50 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2018-12-08 16:23 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2018-12-08 15:18 +0100, Thomas Petazzoni spake thusly:
> Following d0f4f95e390bcb1c953efa125f5277a8a235396e ("Makefile: rework
> main directory creation logic"), BINARIES_DIR is not implicitly
> created by the main Makefile at the beginning of the build, leaving
> that up to whatever piece of code needs to install something in
> $(BINARIES_DIR).
>
> The afboot-stm32 package didn't pay attention to this, which this
> commit fixes.
>
> While at it, we move the afboot-stm32 installation into
> <pkg>_INSTALL_IMAGES_CMDS, because using <pkg>_INSTALL_TARGET_CMDS to
> install only files to BINARIES_DIR is a bit strange.
>
> Fixes:
>
> https://gitlab.com/buildroot.org/buildroot/-/jobs/131217111
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> boot/afboot-stm32/afboot-stm32.mk | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/boot/afboot-stm32/afboot-stm32.mk b/boot/afboot-stm32/afboot-stm32.mk
> index 042b21fa55..5e221cf364 100644
> --- a/boot/afboot-stm32/afboot-stm32.mk
> +++ b/boot/afboot-stm32/afboot-stm32.mk
> @@ -6,13 +6,15 @@
>
> AFBOOT_STM32_VERSION = v0.1
> AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION))
> +AFBOOT_STM32_INSTALL_IMAGES = YES
> +AFBOOT_STM32_INSTALL_TARGET = NO
>
> define AFBOOT_STM32_BUILD_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) all
> endef
>
> -define AFBOOT_STM32_INSTALL_TARGET_CMDS
> - $(INSTALL) -m 0755 $(@D)/stm32*.bin $(BINARIES_DIR)
> +define AFBOOT_STM32_INSTALL_IMAGES_CMDS
> + $(INSTALL) -m 0755 -t $(BINARIES_DIR) -D $(@D)/stm32*.bin
> endef
>
> $(eval $(generic-package))
> --
> 2.19.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread* [Buildroot] [PATCH] boot/afboot-stm32: create destination directory during installation
2018-12-08 14:18 [Buildroot] [PATCH] boot/afboot-stm32: create destination directory during installation Thomas Petazzoni
2018-12-08 16:23 ` Yann E. MORIN
@ 2018-12-08 19:50 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-12-08 19:50 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> Following d0f4f95e390bcb1c953efa125f5277a8a235396e ("Makefile: rework
> main directory creation logic"), BINARIES_DIR is not implicitly
> created by the main Makefile at the beginning of the build, leaving
> that up to whatever piece of code needs to install something in
> $(BINARIES_DIR).
> The afboot-stm32 package didn't pay attention to this, which this
> commit fixes.
> While at it, we move the afboot-stm32 installation into
> <pkg>_INSTALL_IMAGES_CMDS, because using <pkg>_INSTALL_TARGET_CMDS to
> install only files to BINARIES_DIR is a bit strange.
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/131217111
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-08 19:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-08 14:18 [Buildroot] [PATCH] boot/afboot-stm32: create destination directory during installation Thomas Petazzoni
2018-12-08 16:23 ` Yann E. MORIN
2018-12-08 19:50 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox