Fixup 'make source' target

diff --git a/Makefile b/Makefile
index 0b8a1f0a60654183c858e305d66947e304d3a966..946eed8611c0f368121568a618520d06a03e24ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -154,17 +154,18 @@ STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 #STRIP:=/bin/true
 IMAGE:=$(BASE_DIR)/root_fs
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-#KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-
-KERNEL_CROSS:=
+KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-
 
 all:   world
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 
 world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
 
-.PHONY: all world clean dirclean distclean $(TARGETS) $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN)
+.PHONY: all world clean dirclean distclean source $(TARGETS) \
+       $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE)
 
 include make/*.mk
 
@@ -192,6 +193,7 @@ $(TARGET_DIR):
        cp -a $(SOURCE_DIR)/target_skeleton/* $(TARGET_DIR)/
        -find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
 
+source: $(TARGETS_SOURCE)
 
 #############################################################
 #

diff --git a/make/linux.mk b/make/linux.mk
index 8b89806d8ec76d72104c29e3cddfe910a5d1c3a9..ca97b72691360d05a7f9291f0d84f364b3cb1fc3 100644 (file)
--- a/make/linux.mk
+++ b/make/linux.mk
@@ -24,7 +24,7 @@ ifneq ($(filter $(TARGETS),linux),)
 # Version of Linux to download and then apply patches to
 DOWNLOAD_LINUX_VERSION=2.4.20
 # Version of Linux AFTER patches
-LINUX_VERSION=2.4.20
+LINUX_VERSION=2.4.21-pre4
 
 LINUX_FORMAT=bzImage
 LINUX_BINLOC=arch/$(ARCH)/boot/$(LINUX_FORMAT)

diff --git a/make/uclibc.mk b/make/uclibc.mk
index 25a31d93ab5fdd53cda840771df38f73fa2db866..af62ea504ce34399f610d2144c9849574967a0de 100644 (file)
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -83,6 +83,8 @@ $(TARGET_DIR)/usr/bin/ldd: $(TARGET_DIR)/lib/libc.so.0
 uclibc: $(BUILD_DIR)/linux/.configured $(STAGING_DIR)/lib/libc.a \
            $(TARGET_DIR)/lib/libc.so.0 $(TARGET_DIR)/usr/bin/ldd
 
+uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
+
 uclibc-clean:
        rm -f $(TARGET_DIR)/lib/libc.so.0
        -$(MAKE) -C $(UCLIBC_DIR) clean

diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk
index 8e015d28080c3b0b6902331f39b8dce78fbea62d..1ec528bd2db57e7518f11ab33644e6a3d039d60e 100644 (file)
--- a/make/uclibc_toolchain.mk
+++ b/make/uclibc_toolchain.mk
@@ -95,6 +95,8 @@ $(STAGING_DIR)/.setup:
 #############################################################
 uclibc_toolchain: gcc_final
 
+uclibc_toolchain-source: $(DL_DIR)/$(BINUTILS_SOURCE) $(DL_DIR)/$(UCLIBC_SOURCE) $(DL_DIR)/$(GCC_SOURCE)
+
 uclibc_toolchain-clean: gcc_final-clean uclibc-clean gcc_initial-clean binutils-clean
 
 uclibc_toolchain-dirclean: gcc_final-dirclean uclibc-dirclean gcc_initial-dirclean binutils-dirclean

diff --git a/make/uclibc_toolchain_2_95.mk b/make/uclibc_toolchain_2_95.mk
index 90b0b4d7a2358c9f3218bd8b33005af8e8ae3e96..619f93433b708d832be66ed17af10524dbaf7886 100644 (file)
--- a/make/uclibc_toolchain_2_95.mk
+++ b/make/uclibc_toolchain_2_95.mk
@@ -103,6 +103,9 @@ endif
 
 uclibc_toolchain: gcc_final
 
+uclibc_toolchain-source: $(DL_DIR)/$(BINUTILS_SOURCE) $(DL_DIR)/$(UCLIBC_SOURCE) \
+                           $(DL_DIR)/$(GCC_SOURCE) $(DL_DIR)/$(STLPORT_SOURCE)
+
 uclibc_toolchain-clean: gcc_final-clean uclibc-clean gcc_initial-clean binutils-clean
 
 uclibc_toolchain-dirclean: gcc_final-dirclean uclibc-dirclean gcc_initial-dirclean binutils-dirclean