From 8f31699e79f0f10c602898f7fd482d8e9d5eee35 Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Mon, 16 Dec 2002 16:57:14 +0000
Subject: [PATCH] Had to add user-mode-linux/usr/lib/uml to the path to allow
 --home to find port-helper, or otherwise root_fs complain.  Have no idea why
 this change exists with port-helper because wasn't the case before. Also,
 added path for user-mode-linux/usr/bin to find the other tools.

Also, improves all in Makefile
---
 Changes      | 13 +++++++++++++
 Makefile.pkg | 14 +++++++-------
 gbootroot    | 13 +++++++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Changes b/Changes
index e9bf8ac..3c39cb0 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,19 @@
 1.4.0 - 12/12/2002
 ------------------
 
+Had to add user-mode-linux/usr/lib/uml to the path to allow --home to
+find port-helper, or otherwise root_fs complain.  Have no idea why
+this change exists with port-helper because wasn't the case before.
+Also, added path for user-mode-linux/usr/bin to find the other tools.
+
+When root_fs_helper was running with the newer Expect.pm, and
+consequentially the newer uml kernel it became necessary to get out
+when the kernel shuts down with a last function right when it says
+"Power down."
+
+Checks for the proper version for newer libc6 linkers.  Hopefully,
+should work properly with libc6 > 2.3.1, too.
+
 
 1.3.6 - 03/10/2002
 ------------------
diff --git a/Makefile.pkg b/Makefile.pkg
index 7bccd77..6903ecf 100644
--- a/Makefile.pkg
+++ b/Makefile.pkg
@@ -2,7 +2,7 @@
 # buildroot, UML, and gbootroot.
 
 VERSION=2.4.19
-PATCH_VERSION=35
+PATCH_VERSION=38
 UTIL_VER=20021103
 
 BASE_DIR=${shell pwd}
@@ -48,7 +48,7 @@ TOOLS = $(UTIL_DIR)/mconsole $(UTIL_DIR)/port-helper $(UTIL_DIR)/moo $(UTIL_DIR)
 ##BUSYBOX_SITE=http://busybox.lineo.com
 
 all:   world
-world: kernel target
+world: sources initrd
 
 sources: $(BASE_DIR)
 	@if [ ! -e $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; then \
@@ -77,7 +77,7 @@ sources: $(BASE_DIR)
 	fi;
 
 
-kernel:
+kernel: 
 	@if [ ! -f $(KERNEL_DIR)/.config ] ; then \
 		cp $(KCONFIG) $(KERNEL_DIR)/.config; \
 		(cd $(KERNEL_DIR); make oldconfig); \
@@ -92,7 +92,7 @@ kernel:
 
 
 
-root_fs_helper:
+root_fs_helper: genext2fs
 
 	@if [ ! -f $(ROOT_FS_DIR)/root_fs_helper ] ; then \
 		perl -I . ./gbootroot --home . --template Helper.yard --root-filename root_fs_helper --filesystem-command "genext2fs -z -r0" --genext2fs-dir genext2fs/ ; \
@@ -103,7 +103,7 @@ root_fs_helper:
 		cp -fa $(TMP)/root_fs_helper_cramfs $(ROOT_FS_DIR)/root_fs_helper; \
 	fi;
 
-initrd: root_fs_helper
+initrd: modules root_fs_helper
 
 	@if [ ! -f $(ROOT_FS_DIR)/Initrd.gz ] ; then \
 		perl -I. ./gbootroot --home . --template Initrd.yard --root-filename Initrd --uml-exclusively on  --expect-program ./expect_uml --uml-kernel user-mode-linux/usr/bin/linuxbr --root-fs-helper root_filesystem/root_fs_helper --filesystem-size 4096; \
@@ -111,7 +111,7 @@ initrd: root_fs_helper
 	fi;
 
 
-modules: 
+modules: kernel
 	cd linux-$(VERSION) ; \
 		mkdir ../modules-2.4 ; \
 		make modules ARCH=um ; \
@@ -142,7 +142,7 @@ tools:
 	for d in $(TOOLS) ; do $(MAKE) -C $$d all ; done
 	for d in $(TOOLS) ; do $(MAKE) -C $$d install DESTDIR=$(BASE_DIR)/user-mode-linux; done
 
-genext2fs:
+genext2fs: tools
 	@if [ ! -f $(GENEXT2_DIR)/genext2fs ] ; then \
 		$(MAKE) -C $(GENEXT2_DIR); \
 	fi;
diff --git a/gbootroot b/gbootroot
index 85d2c2e..9376966 100755
--- a/gbootroot
+++ b/gbootroot
@@ -232,6 +232,19 @@ BEGIN {
     }
 
 
+    my $pwd = `pwd`; chomp $pwd;
+
+    my $tools = grep(/$pwd\/user-mode-linux\/usr\/bin/,$ENV{'PATH'});
+    if ($sbin == 0) {
+	$ENV{'PATH'} = "$pwd/user-mode-linux/usr/bin:" . $ENV{'PATH'};
+    }
+
+    $tools = grep(/$pwd\/user-mode-linux\/usr\/lib\/uml/,$ENV{'PATH'});
+    if ($sbin == 0) {
+	$ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'};
+    }
+
+
     use BootRoot::Options;
     option();