From c0040714fd70eb07d6ed82c07e3678a9303c7d6b Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 3 Aug 2012 14:44:00 +0200 Subject: cleo/devkit/tests/common: adapt to new busybox sources, refs #3085 --- cleopatre/devkit/tests/common/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cleopatre/devkit') diff --git a/cleopatre/devkit/tests/common/Makefile b/cleopatre/devkit/tests/common/Makefile index ed720de007..3874303b8b 100644 --- a/cleopatre/devkit/tests/common/Makefile +++ b/cleopatre/devkit/tests/common/Makefile @@ -2,7 +2,6 @@ BUILDROOT_DIR = ../../../buildroot BUILDROOT_TARGET = spk300g -BUILDROOT_BUSYBOX_DIR = $(BUILDROOT_DIR)/project_build_$(BR2_ARCH)/$(BUILDROOT_TARGET)/busybox-$(BR2_BUSYBOX_VERSION) BUILDROOT_BUSYBOX_CONFIG = $(BUILDROOT_DIR)/$(subst ",,$(BR2_PACKAGE_BUSYBOX_CONFIG)) #") .PHONY: all busybox busybox-config busybox-unpacked \ @@ -12,6 +11,14 @@ all: -include $(BUILDROOT_DIR)/.config +ifeq ($(BR2_BUSYBOX_VERSION_CUSTOM),y) +BUILDROOT_BUSYBOX_DIR = $(BUILDROOT_DIR)/$(BR2_BUSYBOX_VERSION_CUSTOM_SRC_DIR) +BUILDROOT_BUSYBOX_UNPACK = +else +BUILDROOT_BUSYBOX_DIR = $(BUILDROOT_DIR)/project_build_$(BR2_ARCH)/$(BUILDROOT_TARGET)/busybox-$(BR2_BUSYBOX_VERSION) +BUILDROOT_BUSYBOX_UNPACK = busybox-unpacked +endif + ifdef BR2_PROJECT ifneq ($(BR2_PROJECT),"$(BUILDROOT_TARGET)") ifndef FORCE @@ -25,7 +32,7 @@ busybox: busybox-config busybox-config: busybox/.config -busybox/.config: $(BUILDROOT_BUSYBOX_CONFIG) busybox-unpacked +busybox/.config: $(BUILDROOT_BUSYBOX_CONFIG) buildroot-config $(BUILDROOT_BUSYBOX_UNPACK) test -n '$(BR2_PACKAGE_BUSYBOX_CONFIG)' mkdir -p busybox cp $< $@ -- cgit v1.2.3