From 2ad910e22979500192ea43d5599ad003440744a4 Mon Sep 17 00:00:00 2001 From: gobo72 Date: Sat, 5 Mar 2011 00:06:52 +0000 Subject: [PATCH] =?utf8?q?Cr=C3=A9=C3=A9=20r=C3=A9pertoire=20de=20configur?= =?utf8?q?ation?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- dependencies => config/dependencies | 0 packages-list => config/packages-list | 0 sysinfos => config/sysinfos | 10 +++++----- sysinfos.server => config/sysinfos.server | 0 sysinfos.workstn => config/sysinfos.workstn | 0 stage0/hv-install-1 | 4 ++-- stage0/hv-install-2 | 4 ++-- stage0/packages-update | 4 ++-- stage0/pre-install | 4 ++-- stage1/create-config-files | 4 ++-- stage1/create-directories | 4 ++-- stage1/create-groups | 4 ++-- stage1/create-logfiles | 4 ++-- stage1/create-symlinks | 9 +++++---- stage1/create-users | 4 ++-- stage1/hv-install-1 | 4 ++-- stage1/hv-install-2 | 4 ++-- stage1/install-bootscripts | 4 ++-- stage1/packages-update | 4 ++-- stage1/post-install | 4 ++-- stage1/pre-install | 4 ++-- stage2/compressdoc | 4 ++-- stage2/create-config-files | 4 ++-- stage2/hv-install-1 | 4 ++-- stage2/hv-install-2 | 4 ++-- stage2/install-bootscripts | 4 ++-- stage2/install-hv-utilities | 4 ++-- stage2/packages-update | 4 ++-- stage2/post-install | 4 ++-- stage2/pre-install | 4 ++-- stage2/stripping | 4 ++-- stage2/toolchain-adjust | 4 ++-- stage2/toolchain-test | 4 ++-- stage3/hv-install-1 | 4 ++-- stage3/packages-update | 4 ++-- 35 files changed, 68 insertions(+), 67 deletions(-) rename dependencies => config/dependencies (100%) rename packages-list => config/packages-list (100%) rename sysinfos => config/sysinfos (93%) rename sysinfos.server => config/sysinfos.server (100%) rename sysinfos.workstn => config/sysinfos.workstn (100%) diff --git a/dependencies b/config/dependencies similarity index 100% rename from dependencies rename to config/dependencies diff --git a/packages-list b/config/packages-list similarity index 100% rename from packages-list rename to config/packages-list diff --git a/sysinfos b/config/sysinfos similarity index 93% rename from sysinfos rename to config/sysinfos index f5a38dc..a60b7c9 100644 --- a/sysinfos +++ b/config/sysinfos @@ -20,13 +20,13 @@ REGUSER="hugo" LFS="/mnt/stockage/hvlinux-hp-mini" # Destination partition where to install new Linux-HV system -LFS_PARTITION="/dev/sdb7" +LFS_PARTITION="/dev/sda3" # Boot partition (if applicable) -BOOT_PARTITION="/dev/sdb1" +BOOT_PARTITION="/dev/sda1" # Swap partition (if applicable) -SWAP_PARTITION="/dev/sdb2" +#SWAP_PARTITION="/dev/sdb2" # Define this when cross-compiling to the desired target # architecture. Default is x86 32-bits architecture (i686). @@ -47,8 +47,8 @@ KEYBOARD="us" # Sound card support: yes or no SOUND_CARD="yes" -# Removable media drives -CDROM="/dev/sr0" +# Removable media drives. Comment if your system doesn't have one. +#CDROM="/dev/sr0" # Set to yes to have SANE support SANE_SUPPORT="yes" diff --git a/sysinfos.server b/config/sysinfos.server similarity index 100% rename from sysinfos.server rename to config/sysinfos.server diff --git a/sysinfos.workstn b/config/sysinfos.workstn similarity index 100% rename from sysinfos.workstn rename to config/sysinfos.workstn diff --git a/stage0/hv-install-1 b/stage0/hv-install-1 index 260e3c4..cb89a5b 100755 --- a/stage0/hv-install-1 +++ b/stage0/hv-install-1 @@ -1,10 +1,10 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions hvtrap_setup -source ../packages-list +source ../config/packages-list init_log_file diff --git a/stage0/hv-install-2 b/stage0/hv-install-2 index 6bcd4d2..8b6c069 100755 --- a/stage0/hv-install-2 +++ b/stage0/hv-install-2 @@ -3,9 +3,9 @@ source ~/.bashrc # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list init_log_file diff --git a/stage0/packages-update b/stage0/packages-update index b110c61..4b1ad8b 100755 --- a/stage0/packages-update +++ b/stage0/packages-update @@ -6,10 +6,10 @@ USE_CLFS_PATCHES=1 USE_HV_PATCHES=1 # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions source ../functions-fpkg -source ../packages-list +source ../config/packages-list update_packages_init diff --git a/stage0/pre-install b/stage0/pre-install index c891f37..aa33684 100755 --- a/stage0/pre-install +++ b/stage0/pre-install @@ -2,9 +2,9 @@ set -o errexit # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Making sure that this script was executed by the root user if [ "x${USER}" != "xroot" ]; then diff --git a/stage1/create-config-files b/stage1/create-config-files index 108504f..bf8780c 100755 --- a/stage1/create-config-files +++ b/stage1/create-config-files @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list echo "Creating /etc/fstab" cat > ${LFS}/etc/fstab << "EOF" diff --git a/stage1/create-directories b/stage1/create-directories index d2b719b..6e9e854 100755 --- a/stage1/create-directories +++ b/stage1/create-directories @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list mkdir -pv ${LFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt} mkdir -pv ${LFS}/{proc,media/{cdrom,dvd},sbin,srv,sys} diff --git a/stage1/create-groups b/stage1/create-groups index 881ae53..d2b8a8e 100755 --- a/stage1/create-groups +++ b/stage1/create-groups @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # In order for root to be able to login and for the name "root" to be # recognized, there need to be relevant entries in the /etc/group file. diff --git a/stage1/create-logfiles b/stage1/create-logfiles index 990c054..fe4b5a7 100755 --- a/stage1/create-logfiles +++ b/stage1/create-logfiles @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list touch ${LFS}/var/run/utmp ${LFS}/var/log/{btmp,lastlog,wtmp} chmod -v 664 ${LFS}/var/run/utmp ${LFS}/var/log/lastlog diff --git a/stage1/create-symlinks b/stage1/create-symlinks index b61685a..51dba78 100755 --- a/stage1/create-symlinks +++ b/stage1/create-symlinks @@ -1,16 +1,17 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Some programs hard-wire paths to programs which don't exist yet. In order to # satisfy these programs, we create a number of symbolic links which will be # replaced by real files when we're installing all the software. -# We must not use "-sf" to force the creation of a symlink, because we don't want -# to write over a valid program if the install script needs to be re-started. +# We must not use "-sf" to force the creation of a symlink, because we don't +# want to write over a valid program if the install script needs to be +# re-started. source=/tools/bin target=${LFS}/bin diff --git a/stage1/create-users b/stage1/create-users index 7529f45..2fc9fa2 100755 --- a/stage1/create-users +++ b/stage1/create-users @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # In order for root to be able to login and for the name "root" to be # recognized, there need to be relevant entries in the /etc/passwd file. diff --git a/stage1/hv-install-1 b/stage1/hv-install-1 index 1bc05c2..e7c7bda 100755 --- a/stage1/hv-install-1 +++ b/stage1/hv-install-1 @@ -1,10 +1,10 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions hvtrap_setup -source ../packages-list +source ../config/packages-list init_log_file diff --git a/stage1/hv-install-2 b/stage1/hv-install-2 index a063fb4..c6bc078 100755 --- a/stage1/hv-install-2 +++ b/stage1/hv-install-2 @@ -3,9 +3,9 @@ source ~/.bashrc # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list init_log_file diff --git a/stage1/install-bootscripts b/stage1/install-bootscripts index 8874b63..40894e0 100755 --- a/stage1/install-bootscripts +++ b/stage1/install-bootscripts @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Clock settings cat > ${LFS}/etc/sysconfig/clock << "EOF" diff --git a/stage1/packages-update b/stage1/packages-update index bd39bce..ca445b2 100755 --- a/stage1/packages-update +++ b/stage1/packages-update @@ -4,10 +4,10 @@ USE_CLFS_PATCHES=1 USE_HV_PATCHES=1 # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions source ../functions-fpkg -source ../packages-list +source ../config/packages-list update_packages_init diff --git a/stage1/post-install b/stage1/post-install index 72addc2..a8e5738 100755 --- a/stage1/post-install +++ b/stage1/post-install @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # We need /dev/null and /dev/console before udev is started. mkdir -pv ${LFS}/dev diff --git a/stage1/pre-install b/stage1/pre-install index b9e314c..b1aeead 100755 --- a/stage1/pre-install +++ b/stage1/pre-install @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Making sure that this script was executed by the root user if [ "x${USER}" != "xroot" ]; then diff --git a/stage2/compressdoc b/stage2/compressdoc index c705f49..764bc79 100755 --- a/stage2/compressdoc +++ b/stage2/compressdoc @@ -3,9 +3,9 @@ # First argument of this script is the package name. # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # If not already installed by previous invocation of this script: install -m755 ${SCRDIR}/misc/compressdoc /usr/sbin diff --git a/stage2/create-config-files b/stage2/create-config-files index 686af78..b207785 100755 --- a/stage2/create-config-files +++ b/stage2/create-config-files @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Removing /tools from PATH: SED_REP='/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin' diff --git a/stage2/hv-install-1 b/stage2/hv-install-1 index 5f00f8a..2e3cc41 100755 --- a/stage2/hv-install-1 +++ b/stage2/hv-install-1 @@ -1,10 +1,10 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions hvtrap_setup -source ../packages-list +source ../config/packages-list source /etc/profile if [ "x${USER}" != "xroot" ]; then diff --git a/stage2/hv-install-2 b/stage2/hv-install-2 index 6f7cf5f..bb0079c 100755 --- a/stage2/hv-install-2 +++ b/stage2/hv-install-2 @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list init_log_file diff --git a/stage2/install-bootscripts b/stage2/install-bootscripts index 75b4011..894c344 100755 --- a/stage2/install-bootscripts +++ b/stage2/install-bootscripts @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list DHCP_USED="no" diff --git a/stage2/install-hv-utilities b/stage2/install-hv-utilities index da17a9b..b043a7d 100755 --- a/stage2/install-hv-utilities +++ b/stage2/install-hv-utilities @@ -3,9 +3,9 @@ # First argument of this script is the package name # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list SRCDIR="./hv-utilities" PREFIX="/usr/local" diff --git a/stage2/packages-update b/stage2/packages-update index 9bb528a..501dad4 100755 --- a/stage2/packages-update +++ b/stage2/packages-update @@ -6,10 +6,10 @@ USE_CLFS_PATCHES=1 USE_HV_PATCHES=1 # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions source ../functions-fpkg -source ../packages-list +source ../config/packages-list update_packages_init diff --git a/stage2/post-install b/stage2/post-install index 74122ad..fba81f2 100755 --- a/stage2/post-install +++ b/stage2/post-install @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list cat > /etc/default/useradd << "EOF" # useradd defaults file diff --git a/stage2/pre-install b/stage2/pre-install index b9e0775..672666e 100755 --- a/stage2/pre-install +++ b/stage2/pre-install @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Removing /cross-tools directory if [ -d /cross-tools ]; then diff --git a/stage2/stripping b/stage2/stripping index 92161d1..d78c2fc 100755 --- a/stage2/stripping +++ b/stage2/stripping @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list /tools/bin/find /{,usr/}{bin,lib,sbin} -type f \ -exec /tools/bin/strip --strip-debug '{}' ';' diff --git a/stage2/toolchain-adjust b/stage2/toolchain-adjust index 4b11cfc..300fc17 100755 --- a/stage2/toolchain-adjust +++ b/stage2/toolchain-adjust @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Amend the GCC specs file so that it points to the new dynamic linker, and so # that GCC knows where to find its start files. diff --git a/stage2/toolchain-test b/stage2/toolchain-test index 9881dc1..2b0a729 100755 --- a/stage2/toolchain-test +++ b/stage2/toolchain-test @@ -1,9 +1,9 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Testing toolchain cd /tmp diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index f2c52ad..a0f6897 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -1,10 +1,10 @@ #!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions hvtrap_setup -source ../packages-list +source ../config/packages-list source /etc/profile if [ "x${USER}" != "xroot" ]; then diff --git a/stage3/packages-update b/stage3/packages-update index 3d0b79b..1ce421c 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -5,10 +5,10 @@ USE_BLFS_PATCHES=1 USE_HV_PATCHES=1 # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions source ../functions-fpkg -source ../packages-list +source ../config/packages-list update_packages_init -- 2.20.1