From: aldot at uclibc.org <aldot@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot: package/busybox toolchain/uClibc
Date: Fri, 19 Jan 2007 06:17:35 -0800 (PST) [thread overview]
Message-ID: <20070119141735.DAD3A4859E@busybox.net> (raw)
Author: aldot
Date: 2007-01-19 06:17:34 -0800 (Fri, 19 Jan 2007)
New Revision: 17380
Log:
- copy the _CONFIG_FILES back
- use the BUSYBOX_CONFIG_FILE if specified by the user
Modified:
trunk/buildroot/package/busybox/busybox.mk
trunk/buildroot/toolchain/uClibc/uclibc.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-01-19 13:32:21 UTC (rev 17379)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-01-19 14:17:34 UTC (rev 17380)
@@ -34,8 +34,10 @@
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 @@
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-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
Modified: trunk/buildroot/toolchain/uClibc/uclibc.mk
===================================================================
--- trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-01-19 13:32:21 UTC (rev 17379)
+++ trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-01-19 14:17:34 UTC (rev 17380)
@@ -86,7 +86,7 @@
# 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 @@
RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
HOSTCC="$(HOSTCC)" \
menuconfig && \
+ cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \
touch $(UCLIBC_DIR)/.configured
reply other threads:[~2007-01-19 14:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070119141735.DAD3A4859E@busybox.net \
--to=aldot@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox