Add administration for linux,uclibc and main

diff --git a/Makefile b/Makefile
index 23107a189de0ab4eead712e27047823a23f003f4..30c70d4e6e324d93f958ea01297432cbfc6a8f65 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -422,6 +422,10 @@ endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
        cp $(shell find ./target/ -name $@) .config
        -@$(MAKE) oldconfig
 
+configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
+
+cross: $(BASE_TARGETS)
+
 help:
        @echo 'Cleaning:'
        @echo '  clean                  - delete temporary files created by build'

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index 83768ada80262daea659c5bb6f052af74de9d0db..c2fa75b82f228a95bc02cbf441fe61eb04825ac0 100644 (file)
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -168,6 +168,8 @@ ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
                $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
+else
+       echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
 endif
 ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
        # precedence for a small initramfs
@@ -225,7 +227,7 @@ linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
 
 linux26-unpacked: $(LINUX26_DIR)/.patched
 
-linux26-config:        $(LINUX26_DIR)/.configured
+linux26-config:        host-sed $(LINUX26_DIR)/.configured
 
 linux26-update:
        cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 2ee6a17a1daaba9fed7b327a2bde39c082a77bd3..7fcef559fc3e3c1ed5f793ea63516b67abc8f705 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -108,8 +108,7 @@ else
 UCLIBC_LOCALE_DATA=
 endif
 
-uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
+$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
        mkdir -p $(TOOL_BUILD_DIR)
        rm -rf $(UCLIBC_DIR)
        $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -442,14 +441,16 @@ uclibc: $(cross_compiler) $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 
-uclibc-config: host-sed $(UCLIBC_DIR)/.config
+uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
+
+uclibc-config: $(UCLIBC_DIR)/.config
 
-uclibc-oldconfig: host-sed $(UCLIBC_DIR)/.oldconfig
+uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
 
-uclibc-update:
+uclibc-update: uclibc-config
        cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
-uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
+uclibc-configured: $(UCLIBC_DIR)/.configured
 
 uclibc-configured-source: uclibc-source