Commit f6c0fd63 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- copy the _CONFIG_FILES back 

- use the BUSYBOX_CONFIG_FILE if specified by the user
parent b796ecae

package/busybox/busybox.mk

+4 −1
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ endif 


BUSYBOX_UNZIP=$(BZCAT)



ifndef BUSYBOX_CONFIG_FILE

BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))

#")

endif



$(DL_DIR)/$(BUSYBOX_SOURCE):

	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -53,7 +55,7 @@ endif 
	touch $(BUSYBOX_DIR)/.unpacked



$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)

	cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config

	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config

ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)

	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \

		$(BUSYBOX_DIR)/Rules.mak ;
@@ -111,6 +113,7 @@ busybox: uclibc $(TARGET_DIR)/bin/busybox 


busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured

	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig

	cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)



busybox-clean:

	rm -f $(TARGET_DIR)/bin/busybox

toolchain/uClibc/uclibc.mk

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ endif 


# Some targets may wish to provide their own UCLIBC_CONFIG_FILE...

$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE)

	cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config

	cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config

	$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \

		-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \

		-e 's,^TARGET_ARCH="none",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \
@@ -224,6 +224,7 @@ uclibc-menuconfig: $(UCLIBC_DIR)/.config 
		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \

		HOSTCC="$(HOSTCC)" \

		menuconfig && \

	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \

	touch $(UCLIBC_DIR)/.configured