Update the toolchain build, per the latest in the standalone

toolchain builders
 -Erik

1 files changed, 35 insertions, 43 deletions

diff --git a/make/user-mode-linux.mk b/make/user-mode-linux.mk
index 09dd66f06..ecdbd775c 100644
--- a/make/user-mode-linux.mk
+++ b/make/user-mode-linux.mk
@@ -5,67 +5,59 @@
 #############################################################
 ifneq ($(filter $(TARGETS),user-mode-linux),)
 
+LINUX_VERSION=2.4.19
+LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_SOURCE=linux-$(LINUX_VERSION).tar.bz2
+LINUX_SITE=http://ftp.us.kernel.org/pub/linux/kernel/v2.4
+LINUX_PATCH_1:=uml-patch-$(LINUX_VERSION)-5.bz2
+LINUX_PATCH_1_SITE:=http://telia.dl.sourceforge.net/sourceforge/user-mode-linux
+LINUX_KCONFIG=$(SOURCE_DIR)/linux-uml.config
 LINUX_KERNEL=$(BASE_DIR)/UMlinux
-UMLINUX_DIR=$(BUILD_DIR)/linux-2.4.19
-LINUX_DIR=$(UMLINUX_DIR)
-UMLINUX_SOURCE=linux-2.4.19.tar.bz2
-UMLINUX_SITE=http://ftp.us.kernel.org/pub/linux/kernel/v2.4
-UMLINUX_PATCH_1:=uml-patch-2.4.19-5.bz2
-UMLINUX_PATCH_1_SITE:=http://telia.dl.sourceforge.net/sourceforge/user-mode-linux
-UMLINUX_KCONFIG=$(SOURCE_DIR)/linux-uml.config
 
-$(DL_DIR)/$(UMLINUX_SOURCE):
-	$(WGET) -P $(DL_DIR) $(UMLINUX_SITE)/$(UMLINUX_SOURCE)
+$(DL_DIR)/$(LINUX_SOURCE):
+	$(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
 
-$(DL_DIR)/$(UMLINUX_PATCH_1):
-	$(WGET) -P $(DL_DIR) $(UMLINUX_PATCH_1_SITE)/$(UMLINUX_PATCH_1)
+$(DL_DIR)/$(LINUX_PATCH_1):
+	$(WGET) -P $(DL_DIR) $(LINUX_PATCH_1_SITE)/$(LINUX_PATCH_1)
 
-user-mode-linux-source: $(DL_DIR)/$(UMLINUX_SOURCE) $(DL_DIR)/$(UMLINUX_PATCH_1)
+user-mode-linux-source: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_PATCH_1)
 
-$(UMLINUX_DIR)/.unpacked: $(DL_DIR)/$(UMLINUX_SOURCE) $(DL_DIR)/$(UMLINUX_PATCH_1)
-	bzcat $(DL_DIR)/$(UMLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	touch $(UMLINUX_DIR)/.unpacked
+$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_PATCH_1)
+	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	-(cd $(BUILD_DIR); ln -sf $(LINUX_DIR) linux)
+	touch $(LINUX_DIR)/.unpacked
 
-$(UMLINUX_DIR)/.patched: $(UMLINUX_DIR)/.unpacked
-	bzcat $(DL_DIR)/$(UMLINUX_PATCH_1) | patch -d $(UMLINUX_DIR) -p1
-	touch $(UMLINUX_DIR)/.patched
+$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
+	bzcat $(DL_DIR)/$(LINUX_PATCH_1) | patch -d $(LINUX_DIR) -p1
+	touch $(LINUX_DIR)/.patched
 
-$(UMLINUX_DIR)/.set_arch: $(UMLINUX_DIR)/.patched
-	perl -i -p -e "s/^ARCH :=.*/ARCH:=um/g;" $(UMLINUX_DIR)/Makefile
-	touch $(UMLINUX_DIR)/.set_arch
+$(LINUX_DIR)/.set_arch: $(LINUX_DIR)/.patched
+	perl -i -p -e "s/^ARCH :=.*/ARCH:=um/g;" $(LINUX_DIR)/Makefile
+	touch $(LINUX_DIR)/.set_arch
 
-$(UMLINUX_DIR)/.configured:  $(UMLINUX_DIR)/.set_arch  $(UMLINUX_KCONFIG)
-	cp $(UMLINUX_KCONFIG) $(UMLINUX_DIR)/.config
-	make -C $(UMLINUX_DIR) oldconfig include/linux/version.h
-	touch $(UMLINUX_DIR)/.configured
+$(LINUX_DIR)/.configured:  $(LINUX_DIR)/.set_arch  $(LINUX_KCONFIG)
+	cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
+	make -C $(LINUX_DIR) oldconfig include/linux/version.h
+	touch $(LINUX_DIR)/.configured
 
-$(UMLINUX_DIR)/.depend_done:  $(UMLINUX_DIR)/.configured
-	make -C $(UMLINUX_DIR) dep
-	touch $(UMLINUX_DIR)/.depend_done
+$(LINUX_DIR)/.depend_done:  $(LINUX_DIR)/.configured
+	make -C $(LINUX_DIR) dep
+	touch $(LINUX_DIR)/.depend_done
 
-$(UMLINUX_DIR)/linux: $(UMLINUX_DIR)/.depend_done
-	make -C $(UMLINUX_DIR) linux
+$(LINUX_DIR)/linux: $(LINUX_DIR)/.depend_done
+	make -C $(LINUX_DIR) linux
 
-$(LINUX_KERNEL): $(UMLINUX_DIR)/linux
-	cp -fa $(UMLINUX_DIR)/linux $(LINUX_KERNEL)
+$(LINUX_KERNEL): $(LINUX_DIR)/linux
+	cp -fa $(LINUX_DIR)/linux $(LINUX_KERNEL)
 
 user-mode-linux: $(LINUX_KERNEL)
 
 # Renamed so it is not cleaned by default on a make clean
 user-mode-linux_clean: clean
 	rm -f $(LINUX_KERNEL)
-	-make -C $(UMLINUX_DIR) clean
+	-make -C $(LINUX_DIR) clean
 
 user-mode-linux-dirclean:
-	rm -rf $(UMLINUX_DIR)
-
-#############################################################
-#
-# Setup the kernel headers, but don't compile anything for the target yet,
-# since we still need to build a cross-compiler to do that little task for
-# us...  Try to work around this little chicken-and-egg problem..
-#
-#############################################################
-linux_headers: $(UMLINUX_DIR)/.configured
+	rm -rf $(LINUX_DIR)
 
 endif