jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 15:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

- copy the _CONFIG_FILES back

Browse Source 
- use the BUSYBOX_CONFIG_FILE if specified by the user
This commit is contained in:
Bernhard Reutner-Fischer 2007-01-19 14:17:34 +00:00
parent b796ecae8f
commit f6c0fd635a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/busybox/busybox.mk
View File

@ -34,8 +34,10 @@ endif
BUSYBOX_UNZIP=$(BZCAT) BUSYBOX_UNZIP=$(BZCAT)
ifndef BUSYBOX_CONFIG_FILE
BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG))) BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
#") #")
endif
$(DL_DIR)/$(BUSYBOX_SOURCE): $(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@ -53,7 +55,7 @@ endif
touch $(BUSYBOX_DIR)/.unpacked touch $(BUSYBOX_DIR)/.unpacked
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE) $(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) ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \ $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
$(BUSYBOX_DIR)/Rules.mak ; $(BUSYBOX_DIR)/Rules.mak ;
@ -111,6 +113,7 @@ busybox: uclibc $(TARGET_DIR)/bin/busybox
busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
busybox-clean: busybox-clean:
rm -f $(TARGET_DIR)/bin/busybox rm -f $(TARGET_DIR)/bin/busybox

3
toolchain/uClibc/uclibc.mk
View File

@ -86,7 +86,7 @@ endif
# Some targets may wish to provide their own UCLIBC_CONFIG_FILE... # Some targets may wish to provide their own UCLIBC_CONFIG_FILE...
$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(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' \ $(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_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
-e 's,^TARGET_ARCH="none",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",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/ \ RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
menuconfig && \ menuconfig && \
cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \
touch $(UCLIBC_DIR)/.configured touch $(UCLIBC_DIR)/.configured