| Submitter | Fabio Porcedda |
|---|---|
| Date | Dec. 13, 2012, 10:59 a.m. |
| Message ID | <1355396382-14652-2-git-send-email-fabio.porcedda@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/205803/ |
| State | Accepted |
| Commit | 3fd048a99a3bae8682a6d49154d55075628ba95c |
| Headers | show |
Comments
Dear Fabio Porcedda, On Thu, 13 Dec 2012 11:59:42 +0100, Fabio Porcedda wrote: > Add host-lzop dependency. > Use $(TARGET_MAKE_ENV) when calling $(MAKE) > to able to use binaries built for host. Does Barebox always need lzop? If not, under what conditions does it need lzop? Thomas
Hi Thomas, thanks for the review. On Mon, Jan 7, 2013 at 1:36 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Dear Fabio Porcedda, > > On Thu, 13 Dec 2012 11:59:42 +0100, Fabio Porcedda wrote: >> Add host-lzop dependency. >> Use $(TARGET_MAKE_ENV) when calling $(MAKE) >> to able to use binaries built for host. > > Does Barebox always need lzop? If not, under what conditions does it > need lzop? Barebox doesn't always need lzop. I think the dependency is determined by the barebox configuration (barebox/.config), so I think it's impractical/impossible to know beforehand. We can check the dependency only after the barebox configuration phase it's done. IMHO it's too late. Best regards -- Fabio Porcedda
Patch
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 6cc4976..2aff7e6 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -20,6 +20,7 @@ BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SITE = http://www.barebox.org/download/ endif +BAREBOX_DEPENDENCIES = host-lzop BAREBOX_LICENSE = GPLv2 with exceptions BAREBOX_LICENSE_FILES = COPYING @@ -56,7 +57,7 @@ endif define BAREBOX_CONFIGURE_CMDS cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig - $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig endef ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y) @@ -68,7 +69,7 @@ endif define BAREBOX_BUILD_CMDS $(BAREBOX_BUILD_BAREBOXENV_CMDS) - $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) endef define BAREBOX_INSTALL_IMAGES_CMDS @@ -96,12 +97,12 @@ endif endif barebox-menuconfig barebox-xconfig barebox-gconfig barebox-nconfig: barebox-configure - $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \ $(subst barebox-,,$@) rm -f $(BAREBOX_DIR)/.stamp_{built,target_installed,images_installed} barebox-savedefconfig: barebox-configure - $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \ $(subst barebox-,,$@) ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
Add host-lzop dependency. Use $(TARGET_MAKE_ENV) when calling $(MAKE) to able to use binaries built for host. Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> --- boot/barebox/barebox.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)