From d484d69408c578868e620116617fb533cf2a8a31 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 13 Feb 2010 21:18:00 +0000 Subject: [PATCH] package-update stage4 (xorg) ok --- functions | 2 +- functions-update | 59 +++++- packages-list | 16 +- stage4/packages-update | 266 ++++--------------------- {stage6 => stage7}/README | 0 {stage6 => stage7}/TODO | 0 {stage6 => stage7}/cis-ac | 0 {stage6 => stage7}/cis-ac-nobuild | 0 {stage6 => stage7}/cis-avr-libc | 0 {stage6 => stage7}/cis-avrdude | 0 {stage6 => stage7}/cis-binutils | 0 {stage6 => stage7}/cis-gcc1 | 0 {stage6 => stage7}/cis-gcc2 | 0 {stage6 => stage7}/cis-gdb | 0 {stage6 => stage7}/cis-glibc | 0 {stage6 => stage7}/cis-kernel | 0 {stage6 => stage7}/cis-newlib | 0 {stage6 => stage7}/packages-update | 0 {stage6 => stage7}/stage5-additions | 0 {stage6 => stage7}/stage5-install-arm | 0 {stage6 => stage7}/stage5-install-avr | 0 {stage6 => stage7}/stage5-install-geda | 0 {stage6 => stage7}/stage5-install-ppc | 0 sysinfos | 22 +- 24 files changed, 119 insertions(+), 246 deletions(-) rename {stage6 => stage7}/README (100%) rename {stage6 => stage7}/TODO (100%) rename {stage6 => stage7}/cis-ac (100%) rename {stage6 => stage7}/cis-ac-nobuild (100%) rename {stage6 => stage7}/cis-avr-libc (100%) rename {stage6 => stage7}/cis-avrdude (100%) rename {stage6 => stage7}/cis-binutils (100%) rename {stage6 => stage7}/cis-gcc1 (100%) rename {stage6 => stage7}/cis-gcc2 (100%) rename {stage6 => stage7}/cis-gdb (100%) rename {stage6 => stage7}/cis-glibc (100%) rename {stage6 => stage7}/cis-kernel (100%) rename {stage6 => stage7}/cis-newlib (100%) rename {stage6 => stage7}/packages-update (100%) rename {stage6 => stage7}/stage5-additions (100%) rename {stage6 => stage7}/stage5-install-arm (100%) rename {stage6 => stage7}/stage5-install-avr (100%) rename {stage6 => stage7}/stage5-install-geda (100%) rename {stage6 => stage7}/stage5-install-ppc (100%) diff --git a/functions b/functions index 4f58faf..8ee7dd0 100644 --- a/functions +++ b/functions @@ -99,7 +99,7 @@ get_pkg_name() return 1 fi - echo ${1} | sed "s!^\(.*\)-.*!\1!g" + echo ${1} | sed "s!^\(.*\)-[0-9]*\.[0-9]*.*!\1!g" } # Saves the content of CFLAGS and CXXFLAGS environment variables. diff --git a/functions-update b/functions-update index d602572..e47d383 100644 --- a/functions-update +++ b/functions-update @@ -198,23 +198,27 @@ detect_file_not_found() # Get package if it is not in the repository # Arg. #1: Package name and version # Arg. #2: URL +# Arg. #3: Optional extension static_getpkg() { - PACK=${1} - URL=${2} + local PACK=${1} + local URL=${2} + local MY_ARCH_EXT=${3} # Checking for correct number of arguments - if [ $# -ne 2 ]; then + if [ $# -ne 2 -a $# -ne 3 ]; then echo "${FUNCNAME}(), wrong number of arguments: ${*}" return 1 fi if [ -z "${ARCH_EXT}" ]; then # List of default archive extensions to try - ARCH_EXT="tar.bz2 tar.gz tgz tar.Z" + MY_ARCH_EXT="tar.bz2 tar.gz tgz tar.Z" fi - for arch_ext in ${ARCH_EXT}; do + echo " MY_ARCH_EXT=${MY_ARCH_EXT}" + + for arch_ext in ${MY_ARCH_EXT}; do ${WGETCMD} ${URL}/${PACK}.${arch_ext} # Failure: if it was a connection timeout, don't try for other file extensions. @@ -229,7 +233,7 @@ static_getpkg() fi # If we arrive here, it means we were able to download the file. - if [ "x${arch_ext}" != "xtar.bz2" ]; then + if [ "x${arch_ext}" = "xtar.gz" -o "x${arch_ext}" = "xtgz" -o "x${arch_ext}" = "xtar.Z" ]; then gztobz2 ${LFS_PKG_DIR}/${PACK}.${arch_ext} fi return $? @@ -253,8 +257,34 @@ fpkg() return 1 fi - if [ ! -f ${LFS_PKG_DIR}/${PACK}.tar.bz2 ]; then - rcmd "Fetching ${PACK}" static_getpkg ${PACK} ${URL} + # Default extension + local FINAL_EXT=tar.bz2 + + local FETCH_STRING="Fetching ${PACK}" + + if [ -n "${ARCH_EXT}" ]; then + FINAL_EXT=${ARCH_EXT} + FETCH_STRING="${FETCH_STRING}.${ARCH_EXT}" + fi + + # Default destination directory + local MY_FETCH_DIR=${LFS_PKG_DIR} + + if [ -n "${FETCH_DIR}" ]; then + local MY_FETCH_DIR=${FETCH_DIR} + local MOVE_FILE=1 + fi + + DEST_FILE=${MY_FETCH_DIR}/${PACK}.${FINAL_EXT} + + ##########echo "DEST_FILE=${DEST_FILE}" + if [ ! -f ${DEST_FILE} ]; then + rcmd "${FETCH_STRING}" static_getpkg ${PACK} ${URL} ${ARCH_EXT} + + # Move to final directory if alternate directory specified + if [ -f ${LFS_PKG_DIR}/${PACK}.${FINAL_EXT} -a -n "${MOVE_FILE}" ]; then + mv ${LFS_PKG_DIR}/${PACK}.${FINAL_EXT} ${DEST_FILE} + fi fi # Check if a patch is available. @@ -279,11 +309,18 @@ fpkg_mis() reurn 1 fi - if [ ! -f ${LFS_PKG_DIR}/${TARGET}.tar.bz2 ]; then + if [ -z "${ARCH_EXT}" ]; then + # Default extension + FINAL_EXT=tar.bz2 + else + FINAL_EXT=${ARCH_EXT} + fi + + if [ ! -f ${LFS_PKG_DIR}/${TARGET}.${FINAL_EXT} ]; then fpkg ${SOURCE} ${URL} - if [ -f ${LFS_PKG_DIR}/${SOURCE}.tar.bz2 ]; then - mv ${LFS_PKG_DIR}/${SOURCE}.tar.bz2 ${LFS_PKG_DIR}/${TARGET}.tar.bz2 + if [ -f ${LFS_PKG_DIR}/${SOURCE}.${FINAL_EXT} ]; then + mv ${LFS_PKG_DIR}/${SOURCE}.${FINAL_EXT} ${LFS_PKG_DIR}/${TARGET}.${FINAL_EXT} fi fi diff --git a/packages-list b/packages-list index 5d2e847..743bc38 100644 --- a/packages-list +++ b/packages-list @@ -420,7 +420,21 @@ WINDOWMAKER_EXTRA="WindowMaker-extra-0.1" WMNOTIFY="wmnotify-0.3.2" WV="wv-1.2.4" -XFREE86="XFree86-4.8.0" +XORG_APP=app-7.5-2 +XORG_DATA=data-7.2 +XORG_DRIVER=driver-7.5-2 +XORG_FONT=font-7.5-2 +XORG_LIB=lib-7.5-2 +XORG_PROTO=proto-7.5-2 +XORG_UTIL=util-7.5-2 +LIBXAU=libXau-1.0.5 +LIBXDMCP=libXdmcp-1.0.3 +XBITMAPS=xbitmaps-1.1.0 +XCURSOR_THEMES=xcursor-themes-1.0.2 +XKEYBOARD_CONFIG=xkeyboard-config-1.7 +LUIT=luit-1.0.4 +XORG_SERVER=xorg-server-1.7.1 + XMLTOMAN="xmltoman-0.4" XVIDCORE="xvidcore-1.2.2" XZ_UTILS="xz-4.999.9beta" diff --git a/stage4/packages-update b/stage4/packages-update index 860cd83..831f943 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -17,233 +17,43 @@ export RCMD_NO_EXIT=1 update_packages_init - -fpkg_sf ${FREETYPE} -fpkg ${FONTCONFIG} "http://fontconfig.org/release" -###fpkg_hv ${XFREE86} - - -fpkg ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" -fpkg_mis ${TK} "${TK}-src" ${SOURCEFORGE_URL}/tcl - -fpkg_gnu ${EMACS} - -fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release" -fpkg ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release" -fpkg_sf ${LESSTIF} - -fpkg ${PERL_MOD_XML_SIMPLE} "http://www.cpan.org/modules/by-module/XML" -fpkg ${PERL_MOD_PARSE_REDESCENT} "http://www.cpan.org/modules/by-module/Parse" - -# Gtk -fpkg_gnome ${GTK_DOC} -fpkg_gnome ${GLIB} -fpkg ${PIXMAN} "http://cairographics.org/releases" -fpkg ${GLITZ} "http://cairographics.org/snapshots" -fpkg ${CAIRO} "http://cairographics.org/releases" -fpkg ${CAIROMM} "http://cairographics.org/releases" -fpkg_gnome ${PANGO} -fpkg_gnome ${ATK} -fpkg_gnome ${GTK2} -fpkg_gnome ${GTK_ENGINES} -fpkg_gnome ${PYGOBJECT} -fpkg_gnome ${PYGTK} - -fpkg_gnome ${LIBSIGCPP} -fpkg ${GC} " http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source" -fpkg_gnome ${GLIBMM} -fpkg_gnome ${GTKMM} - - -fpkg_hv ${HVCLOCK} -fpkg_hv ${WMNOTIFY} - -fpkg ${DESKTOP_FILE_UTILS} "http://freedesktop.org/software/desktop-file-utils/releases" -fpkg ${SHARED_MIME_INFO} "http://people.freedesktop.org/~hadess" -fpkg_gnome ${STARTUP_NOTIFICATION} -fpkg_gnome ${LIBWNCK} -fpkg_sf ${LIBXKLAVIER} gswitchit -fpkg_gnome ${LIBGLADE} -fpkg_gnome ${LIBSOUP} -fpkg_gnome ${LIBIDL} -fpkg_gnome ${LIBRSVG} - -fpkg_gnome ${INTLTOOL} -fpkg_gnu ${GSL} - -fpkg_sf ${LIBUSB} -fpkg_sf ${LIBGPHOTO2} "gphoto" - -fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver_base ${BABL})" -fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver_base ${BABL})" -fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver_base ${GIMP})" -fpkg_sf ${GUTENPRINT} -fpkg_hv ${INKSCAPE} - -fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord" -fpkg ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools" - -fpkg_mis ${CUPS} "${CUPS}-source" "http://ftp.easysw.com/pub/cups/$(get_pkg_ver ${CUPS})" -fpkg_sf ${SPLIX} - -fpkg_mis ${ESPGS} "${ESPGS}-source" "http://ftp.easysw.com/pub/ghostscript/$(get_pkg_ver ${ESPGS})" -fpkg_sf ${GHOSTSCRIPT_FONTS_STD} "ghostscript" -fpkg_sf ${GHOSTSCRIPT_FONTS_OTHER} "ghostscript" - -fpkg_hv ${IMAGE_MAGICK} -fpkg ${ICON_NAMING_UTILS} "http://tango.freedesktop.org/releases" -fpkg ${TANGO_ICON_THEME} "http://tango-project.org/releases" -fpkg ${TANGO_ICON_THEME_EXTRAS} "http://tango-project.org/releases" - - -fpkg ${TETEX_SRC} "${TETEX_URL}/$(get_pkg_ver ${TETEX_SRC})/distrib" -fpkg ${TETEX_TEXMF} "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMF})/distrib" -fpkg ${TETEX_TEXMFSRC} "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMFSRC})/distrib" -fpkg ${TETEX_CM_SUPER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/t" -# For re-generating fontconfig documentation. -fpkg_sf ${JADETEX} - -fpkg ${POPPLER} "http://poppler.freedesktop.org" - -fpkg ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane/${SANE_BACKENDS}" -fpkg ${XSANE} "ftp://ftp.sane-project.org/pub/sane/xsane" - -fpkg_sf ${JACK} "jackit" -fpkg ${ALSA_LIB} "ftp://ftp.alsa-project.org/pub/lib" -fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins" -fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils" -fpkg ${ALSA_OSS} "ftp://ftp.alsa-project.org/pub/oss-lib" - -# Multimedia libraries and drivers. -fpkg ${AUDIOFILE} "http://www.68k.org/~michael/audiofile" -fpkg_gnome ${ESOUND} - -fpkg ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC" -fpkg ${LIBOIL} "http://liboil.freedesktop.org/download" -fpkg ${SPEEX} "http://downloads.xiph.org/releases/speex" -fpkg ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio" - -# Temporaire, version beta -fpkg ${LIBSNDFILE} "http://www.mega-nerd.com/tmp" -#fpkg ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile" - -fpkg ${LIBOGG} "http://downloads.xiph.org/releases/ogg" -fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis" -fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora" - -fpkg_hv ${FLAC} -fpkg_hv ${FFMPEG} -fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads" - -# Audio utilities -fpkg_sf ${LAME} -fpkg ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis" -fpkg_hv ${LIBA52} -fpkg_hv ${LIBID3TAG} -fpkg ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg" -fpkg_sf ${LIBFAAC} -fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac" -fpkg_sf ${GRIP} -fpkg_sf ${CDRDAO} -fpkg_hv ${PORTAUDIO} -fpkg_hv ${SWEEP} -fpkg ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})" -fpkg ${SYLPHEED} "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})" - -fpkg_hv ${NSS} -fpkg ${FIREFOX} "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source" - -fpkg_hv ${JAVA} -fpkg_hv ${AGG} -fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})" - -fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus" -fpkg ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib" -fpkg ${HAL} "http://people.freedesktop.org/~david/dist" - -fpkg ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail" -fpkg_mis ${OPENLDAP} "openldap-stable-20070831" \ - "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable" -fpkg_hv ${KERBEROS5} - -fpkg_mis ${SENDMAIL} "sendmail.$(get_pkg_ver ${SENDMAIL})" "ftp://ftp.sendmail.org/pub/sendmail" -fpkg ${LIBSPF2} "http://libspf2.org/spf" -fpkg ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist" -fpkg_hv ${MILTER_SPF} -fpkg ${PROCMAIL} "http://www.procmail.org" -fpkg ${FETCHMAIL} "http://download.berlios.de/fetchmail" -fpkg_sf ${MUTT} - -fpkg_mis ${FCRON} "${FCRON}.src" "ftp://ftp.seul.org/pub/fcron" -fpkg_hv ${GETDATE} - -fpkg_sf ${CLAMAV} - -fpkg ${PERL_MOD_HTML_TAGSET} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules" -fpkg ${PERL_MOD_HTML_PARSER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules" -fpkg ${PERL_MOD_APACHE_LOGGED_AUTH_DBI} "http://search.cpan.org/CPAN/authors/id/S/SI/SIMKIN" -fpkg ${PERL_MOD_DB_FILE} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS" -fpkg ${PERL_MOD_DIGEST_SHA1} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules" -# URI is needed by LWP -fpkg ${PERL_MOD_URI} "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS" -# LWP is Needed by LTSP -fpkg ${PERL_MOD_LWP} "http://www.linpro.no/lwp" - -# ZIP is Needed by OO -fpkg ${PERL_MOD_ARCHIVE_ZIP} "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK" -fpkg ${PERL_MOD_COMPRESS_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS" -fpkg ${PERL_MOD_IO_COMPRESS_BASE} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS" -fpkg ${PERL_MOD_IO_COMPRESS_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS" -fpkg ${PERL_MOD_COMPRESS_RAW_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS" -fpkg ${PERL_MOD_NET_DNS} "http://search.cpan.org/CPAN/authors/id/O/OL/OLAF" - -fpkg ${SPAMASSASSIN} "http://apache.sunsite.ualberta.ca/spamassassin/source" -fpkg ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap" - -fpkg ${HTTPD} "http://www.apache.org/dist/httpd" - - - -fpkg_sf ${MAILMAN} - -fpkg ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions" - -fpkg ${PHP} "http://us2.php.net/distributions" - -lpkg 2 ${SUBVERSION} -fpkg_gnu ${INDENT} - -fpkg ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils" -fpkg ${TFTP_HPA} "http://www.kernel.org/pub/software/network/tftp" - -fpkg_sf ${KVM} -fpkg_hv ${BRIDGE_UTILS} -fpkg_hv ${UML_UTILITIES} - -fpkg_gnu ${GUILE} - -fpkg_sf ${LIBBOOST} - -fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files" - -fpkg_hv ${CKERMIT} - -fpkg ${LIBGAMIN} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" -fpkg_sf ${PCMANFM} - -fpkg_gnu ${HELP2MAN} - -fpkg ${LIBDVDCSS} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" -fpkg ${LIBDVDREAD} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" -fpkg ${DVDFS} "http://jspenguin.org:81/dvdfs" - - - -fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi" -fpkg_gnome ${GOBJECT_INSTROSPECTION} -fpkg ${EGGDBUS} "http://hal.freedesktop.org/releases" -fpkg ${POLKIT} "http://hal.freedesktop.org/releases" - -fpkg ${GNUPG} "ftp://ftp.gnupg.org/gcrypt/gnupg" +XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}" + +BLFS_XORG_URL=http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg +XORG_URL=http://xorg.freedesktop.org/releases/individual + +for module in ${XORG_MODULES_LIST}; do + MOD_NAME=$(get_pkg_name ${module}) + DEST=${LFS_PKG_DIR}/${MOD_NAME} + + ARCH_EXT=wget fpkg ${module} ${BLFS_XORG_URL} + ARCH_EXT=md5 fpkg ${module} ${BLFS_XORG_URL} + unset ARCH_EXT + + SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${module}.wget | sed 's!\.tar\.bz2$!!')" + + mkdir -v -p ${DEST} >> ${LFS_LOG_FILE} 2>&1 + + export FETCH_DIR=${DEST} + for submod in ${SUBMODS}; do + fpkg ${submod} ${XORG_URL}/${MOD_NAME} + done + unset FETCH_DIR + + pushd ${DEST} >> ${LFS_LOG_FILE} + md5sum -c ${LFS_PKG_DIR}/${module}.md5 >> ${LFS_LOG_FILE} + if [ $? -ne 0 ]; then + echo " md5sum error for ${module}" + fi + popd >> ${LFS_LOG_FILE} +done + +fpkg ${LIBXAU} ${XORG_URL}/lib +fpkg ${LIBXDMCP} ${XORG_URL}/lib +fpkg ${XBITMAPS} ${XORG_URL}/data +fpkg ${XCURSOR_THEMES} ${XORG_URL}/data +fpkg ${XKEYBOARD_CONFIG} http://xlibs.freedesktop.org/xkbdesc +fpkg ${LUIT} ${XORG_URL}/app +fpkg ${XORG_SERVER} ${XORG_URL}/xserver exit $? diff --git a/stage6/README b/stage7/README similarity index 100% rename from stage6/README rename to stage7/README diff --git a/stage6/TODO b/stage7/TODO similarity index 100% rename from stage6/TODO rename to stage7/TODO diff --git a/stage6/cis-ac b/stage7/cis-ac similarity index 100% rename from stage6/cis-ac rename to stage7/cis-ac diff --git a/stage6/cis-ac-nobuild b/stage7/cis-ac-nobuild similarity index 100% rename from stage6/cis-ac-nobuild rename to stage7/cis-ac-nobuild diff --git a/stage6/cis-avr-libc b/stage7/cis-avr-libc similarity index 100% rename from stage6/cis-avr-libc rename to stage7/cis-avr-libc diff --git a/stage6/cis-avrdude b/stage7/cis-avrdude similarity index 100% rename from stage6/cis-avrdude rename to stage7/cis-avrdude diff --git a/stage6/cis-binutils b/stage7/cis-binutils similarity index 100% rename from stage6/cis-binutils rename to stage7/cis-binutils diff --git a/stage6/cis-gcc1 b/stage7/cis-gcc1 similarity index 100% rename from stage6/cis-gcc1 rename to stage7/cis-gcc1 diff --git a/stage6/cis-gcc2 b/stage7/cis-gcc2 similarity index 100% rename from stage6/cis-gcc2 rename to stage7/cis-gcc2 diff --git a/stage6/cis-gdb b/stage7/cis-gdb similarity index 100% rename from stage6/cis-gdb rename to stage7/cis-gdb diff --git a/stage6/cis-glibc b/stage7/cis-glibc similarity index 100% rename from stage6/cis-glibc rename to stage7/cis-glibc diff --git a/stage6/cis-kernel b/stage7/cis-kernel similarity index 100% rename from stage6/cis-kernel rename to stage7/cis-kernel diff --git a/stage6/cis-newlib b/stage7/cis-newlib similarity index 100% rename from stage6/cis-newlib rename to stage7/cis-newlib diff --git a/stage6/packages-update b/stage7/packages-update similarity index 100% rename from stage6/packages-update rename to stage7/packages-update diff --git a/stage6/stage5-additions b/stage7/stage5-additions similarity index 100% rename from stage6/stage5-additions rename to stage7/stage5-additions diff --git a/stage6/stage5-install-arm b/stage7/stage5-install-arm similarity index 100% rename from stage6/stage5-install-arm rename to stage7/stage5-install-arm diff --git a/stage6/stage5-install-avr b/stage7/stage5-install-avr similarity index 100% rename from stage6/stage5-install-avr rename to stage7/stage5-install-avr diff --git a/stage6/stage5-install-geda b/stage7/stage5-install-geda similarity index 100% rename from stage6/stage5-install-geda rename to stage7/stage5-install-geda diff --git a/stage6/stage5-install-ppc b/stage7/stage5-install-ppc similarity index 100% rename from stage6/stage5-install-ppc rename to stage7/stage5-install-ppc diff --git a/sysinfos b/sysinfos index 5125c05..9b78a6f 100644 --- a/sysinfos +++ b/sysinfos @@ -15,7 +15,7 @@ INST_TYPE="ltsp-server" REGUSER="hugo" # Destination path where to install new Linux-HV system -LFS="/" +LFS="/mnt/hvlinux-x86_64" # Destination partition where to install new Linux-HV system LFS_PARTITION="/dev/sda8" @@ -30,7 +30,7 @@ SWAP_PARTITION="/dev/sda2" # architecture. Default is x86 32-bits architecture (i686). # x86 (i686) # x86_64 (AMD Athlon 64) -HVL_TARGET="x86" +HVL_TARGET="x86_64" # Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS MACHINE_ARCHITECTURE="athlon-xp" @@ -63,11 +63,23 @@ LAN_NETWORK_MASK="192.168.0.0/24" # Utilise par sane in stage3 # service. USE_DYNAMIC_DNS="no" -# Network interface card eth0 settings -BOOTPROTO[0]="dhcp" +# Network interface card eth0 settings (ROUTEUR/INTERNET) +BOOTPROTO[0]="static" +IP_ADDRESS[0]="192.168.1.2" +PREFIX_LENGTH[0]=24 + +# Network interface card eth1 settings (LAN) +BOOTPROTO[1]="static" +IP_ADDRESS[1]="192.168.0.1" +PREFIX_LENGTH[1]=24 + +# Network interface card eth2 settings (MVPMC) +BOOTPROTO[2]="static" +IP_ADDRESS[2]="192.168.99.1" +PREFIX_LENGTH[2]=24 # DNS servers addresses (not required if using DHCP) -#NAMESERVER[0]="192.168.1.1" +NAMESERVER[0]="192.168.1.1" # Define this if you want the mail addressed to the root user automatically # be forwarded to someone else -- 2.20.1