From 19609cec14f0e747c491985785c4d714f7f654de Mon Sep 17 00:00:00 2001 From: gobo72 Date: Fri, 4 Mar 2011 23:45:01 +0000 Subject: [PATCH] =?utf8?q?Finalis=C3=A9=20implantation=20Makefile=20stages?= =?utf8?q?=200=20=C3=A0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- stage0/INSTALL | 3 ++- stage1/INSTALL | 3 ++- stage1/{install-1 => hv-install-1} | 4 ++-- stage1/{install-2 => hv-install-2} | 0 stage2/INSTALL | 3 ++- stage2/{install-1 => hv-install-1} | 2 +- stage2/{install-2 => hv-install-2} | 0 stage3/INSTALL | 10 ++++++---- stage3/{install-1 => hv-install-1} | 0 9 files changed, 15 insertions(+), 10 deletions(-) rename stage1/{install-1 => hv-install-1} (80%) rename stage1/{install-2 => hv-install-2} (100%) rename stage2/{install-1 => hv-install-1} (97%) rename stage2/{install-2 => hv-install-2} (100%) rename stage3/{install-1 => hv-install-1} (100%) diff --git a/stage0/INSTALL b/stage0/INSTALL index 9ac34f1..a93d6cb 100644 --- a/stage0/INSTALL +++ b/stage0/INSTALL @@ -9,4 +9,5 @@ Installation 2. Modify the 'sysinfos' configuration file to reflect your system configuration. -3. Launch './hv-install-1' +3. Type: + $> sudo make diff --git a/stage1/INSTALL b/stage1/INSTALL index 3341785..fd79a89 100644 --- a/stage1/INSTALL +++ b/stage1/INSTALL @@ -3,7 +3,8 @@ stage1: Construction of temporary system Installation ------------ -1. Launch './install-1' +1. Type: + $> sudo make 2. Compile new kernel (remove loadable modules support) diff --git a/stage1/install-1 b/stage1/hv-install-1 similarity index 80% rename from stage1/install-1 rename to stage1/hv-install-1 index a7bd542..1bc05c2 100755 --- a/stage1/install-1 +++ b/stage1/hv-install-1 @@ -10,10 +10,10 @@ init_log_file rscr mult "Performing pre-install" pre-install -# Logging-in as 'lfs' user, and executing the install-2 script. The +# Logging-in as 'lfs' user, and executing the hv-install-2 script. The # 'su -' command starts with a clean environment and enters the home # directory of the user. -su - lfs -c "cd ${PWD}; ./install-2" +su - lfs -c "cd ${PWD}; ./hv-install-2" rscr mult "Performing post-install" post-install diff --git a/stage1/install-2 b/stage1/hv-install-2 similarity index 100% rename from stage1/install-2 rename to stage1/hv-install-2 diff --git a/stage2/INSTALL b/stage2/INSTALL index bb329b6..5252117 100644 --- a/stage2/INSTALL +++ b/stage2/INSTALL @@ -3,7 +3,8 @@ stage2: Installing basic system software Installation ------------ -1. Launch ./hv-install-1 +1. Type: + $> sudo make 2. Compile new kernel (enable loadable modules support) diff --git a/stage2/install-1 b/stage2/hv-install-1 similarity index 97% rename from stage2/install-1 rename to stage2/hv-install-1 index 94ca72f..5f00f8a 100755 --- a/stage2/install-1 +++ b/stage2/hv-install-1 @@ -62,6 +62,6 @@ ipkg ${AUTOCONF} ipkg ${AUTOMAKE} ipkg ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline" -/bin/bash +h -c ./install-2 +/bin/bash +h -c ./hv-install-2 exit $? diff --git a/stage2/install-2 b/stage2/hv-install-2 similarity index 100% rename from stage2/install-2 rename to stage2/hv-install-2 diff --git a/stage3/INSTALL b/stage3/INSTALL index 4741fee..d651941 100644 --- a/stage3/INSTALL +++ b/stage3/INSTALL @@ -1,5 +1,7 @@ +stage3: Installing basic system software (after reboot) + +Installation +------------ -Installation instructions -------------------------- - -1. ./install-1 +1. Type: + $> sudo make diff --git a/stage3/install-1 b/stage3/hv-install-1 similarity index 100% rename from stage3/install-1 rename to stage3/hv-install-1 -- 2.20.1