From 3dae4c554ec18f465eb6ee5e6efdbdbe8557e13c Mon Sep 17 00:00:00 2001 From: gobo72 Date: Wed, 2 Mar 2011 05:40:17 +0000 Subject: [PATCH] =?utf8?q?R=C3=A9-organisatrion=20stage3=20et=20stage5=20c?= =?utf8?q?omme=20les=20stages=200=20=C3=A0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- functions | 38 ++--- packages-list | 14 +- stage3/cis-boost | 24 ---- stage3/cis-fcron | 81 ----------- stage3/cis-flashplugin | 29 ---- stage3/cis-libusb | 38 ----- stage3/cis-nano | 29 ---- stage3/cis-net-tools | 23 --- stage3/cis-openssl | 42 ------ stage3/cis-pam | 58 -------- stage3/cis-pciutils | 24 ---- stage3/cis-reiserfsprogs | 24 ---- stage3/cis-usbutils | 37 ----- stage3/install-1 | 125 ++++++++++++++++ stage3/ipkg.def | 7 + stage3/packages-update | 6 +- stage3/pkg/Linux-PAM | 41 ++++++ stage3/{cis-bind => pkg/bind} | 0 stage3/{cis-ddclient => pkg/ddclient} | 0 .../{cis-docbook-dsssl => pkg/docbook-dsssl} | 0 .../{cis-docbook-utils => pkg/docbook-utils} | 0 stage3/{cis-docbook-xml => pkg/docbook-xml} | 0 stage3/{cis-docbook-xsl => pkg/docbook-xsl} | 0 stage3/{cis-dosfstools => pkg/dosfstools} | 0 stage3/pkg/fcron | 87 ++++++++++++ stage3/{cis-fontconfig => pkg/fontconfig} | 0 stage3/pkg/freetype | 4 + stage3/{cis-git => pkg/git} | 0 stage3/{cis-inetutils => pkg/inetutils} | 0 stage3/{cis-iptables => pkg/iptables} | 0 stage3/{cis-libmng => pkg/libmng} | 0 stage3/{cis-libopenjpeg => pkg/libopenjpeg} | 0 stage3/{cis-mysql => pkg/mysql} | 0 stage3/pkg/nano | 8 ++ stage3/{cis-nfs-utils => pkg/nfs-utils} | 0 stage3/{cis-openjade => pkg/openjade} | 0 stage3/{cis-opensp => pkg/opensp} | 0 stage3/{cis-openssh => pkg/openssh} | 0 stage3/pkg/openssl | 32 +++++ stage3/pkg/pciutils | 14 ++ stage3/{cis-portmap => pkg/portmap} | 0 stage3/pkg/reiserfsprogs | 14 ++ stage3/{cis-sgml-common => pkg/sgml-common} | 0 stage3/{cis-sgml-dtd3 => pkg/sgml-dtd3} | 0 stage3/{cis-sgml-dtd4 => pkg/sgml-dtd4} | 0 stage3/{cis-sgml-spm => pkg/sgml-spm} | 0 stage3/{cis-subversion => pkg/subversion} | 0 stage3/{cis-sudo => pkg/sudo} | 0 stage3/{cis-tcl => pkg/tcl} | 0 stage3/{cis-tcp-wrappers => pkg/tcp-wrappers} | 0 stage3/{cis-unrar => pkg/unrar} | 0 stage3/{cis-unzip => pkg/unzip} | 0 stage3/pkg/usbutils | 20 +++ stage3/{cis-xmltoman => pkg/xmltoman} | 0 stage3/{cis-zip => pkg/zip} | 0 stage3/resources/nanorc | 1 - stage3/stage.def | 3 + stage3/stage3-additions | 26 ---- stage3/stage3-install | 133 ------------------ {stage3 => stage5}/bootscripts/alsa | 0 {stage3 => stage5}/bootscripts/apache | 0 {stage3 => stage5}/bootscripts/clamav | 0 {stage3 => stage5}/bootscripts/mailman | 0 .../bootscripts/milter-greylist | 0 {stage3 => stage5}/bootscripts/milter-spf | 0 {stage3 => stage5}/bootscripts/openldap | 0 {stage3 => stage5}/bootscripts/pulseaudio | 0 {stage3 => stage5}/bootscripts/samba | 0 {stage3 => stage5}/bootscripts/saslauthd | 0 {stage3 => stage5}/bootscripts/sendmail | 0 stage5/cis-pm | 27 ---- stage5/{stage5-install => install-1} | 0 stage3/cis-agg => stage5/pkg/agg | 0 stage3/cis-alsa-lib => stage5/pkg/alsa-lib | 0 .../cis-alsa-utils => stage5/pkg/alsa-utils | 0 stage3/cis-apache => stage5/pkg/apache | 0 stage5/{cis-boost => pkg/boost} | 0 stage5/{cis-cdrtools => pkg/cdrtools} | 0 stage3/cis-ckermit => stage5/pkg/ckermit | 0 stage3/cis-clamav => stage5/pkg/clamav | 0 stage5/{cis-cups => pkg/cups} | 0 stage5/{cis-cups-pdf => pkg/cups-pdf} | 0 stage5/{cis-dvd-rw-tools => pkg/dvd-rw-tools} | 0 stage5/{cis-dvdfs => pkg/dvdfs} | 0 stage5/{cis-emacs => pkg/emacs} | 0 stage3/cis-firefox => stage5/pkg/firefox | 0 stage5/{cis-gconf => pkg/gconf} | 0 stage3/cis-getdate => stage5/pkg/getdate | 0 stage5/{cis-ghostscript => pkg/ghostscript} | 0 stage3/cis-gnash => stage5/pkg/gnash | 0 stage5/{cis-gnome => pkg/gnome} | 0 stage5/{cis-gnome-config => pkg/gnome-config} | 0 .../{cis-gnome-nobuild => pkg/gnome-nobuild} | 0 stage5/{cis-iso-codes => pkg/iso-codes} | 0 stage5/{cis-jadetex => pkg/jadetex} | 0 stage3/cis-java => stage5/pkg/java | 0 stage3/cis-krb5 => stage5/pkg/krb5 | 0 stage3/cis-libid3tag => stage5/pkg/libid3tag | 0 stage3/cis-libmad => stage5/pkg/libmad | 0 stage3/cis-ltsp => stage5/pkg/ltsp | 0 .../cis-ltsp-utils => stage5/pkg/ltsp-utils | 0 stage3/cis-mailman => stage5/pkg/mailman | 0 .../pkg/milter-greylist | 0 .../cis-milter-spf => stage5/pkg/milter-spf | 0 stage3/cis-nss => stage5/pkg/nss | 0 stage3/cis-openldap => stage5/pkg/openldap | 0 stage3/cis-php => stage5/pkg/php | 0 stage3/cis-pm => stage5/pkg/pm | 0 stage3/cis-procmail => stage5/pkg/procmail | 0 .../cis-pulseaudio => stage5/pkg/pulseaudio | 0 stage3/cis-samba => stage5/pkg/samba | 0 .../{cis-sane-backends => pkg/sane-backends} | 0 stage3/cis-sasl2 => stage5/pkg/sasl2 | 0 stage3/cis-sendmail => stage5/pkg/sendmail | 0 .../pkg/spamassassin | 0 stage5/{cis-splix => pkg/splix} | 0 .../pkg/squirrelmail | 0 stage5/{cis-tetex => pkg/tetex} | 0 stage3/cis-tftp-hpa => stage5/pkg/tftp-hpa | 0 .../pkg/uml-utilities | 0 stage3/cis-uw-imap => stage5/pkg/uw-imap | 0 stage5/{cis-xsane => pkg/xsane} | 0 stage3/cis-xvidcore => stage5/pkg/xvidcore | 0 stage3/cis-postinstall => stage5/post-install | 0 {stage3 => stage5}/resources/mail-files.sh | 0 stage5/stage5-additions | 26 ---- 126 files changed, 379 insertions(+), 656 deletions(-) delete mode 100755 stage3/cis-boost delete mode 100755 stage3/cis-fcron delete mode 100755 stage3/cis-flashplugin delete mode 100755 stage3/cis-libusb delete mode 100755 stage3/cis-nano delete mode 100755 stage3/cis-net-tools delete mode 100755 stage3/cis-openssl delete mode 100755 stage3/cis-pam delete mode 100755 stage3/cis-pciutils delete mode 100755 stage3/cis-reiserfsprogs delete mode 100755 stage3/cis-usbutils create mode 100755 stage3/install-1 create mode 100644 stage3/ipkg.def create mode 100644 stage3/pkg/Linux-PAM rename stage3/{cis-bind => pkg/bind} (100%) mode change 100755 => 100644 rename stage3/{cis-ddclient => pkg/ddclient} (100%) mode change 100755 => 100644 rename stage3/{cis-docbook-dsssl => pkg/docbook-dsssl} (100%) mode change 100755 => 100644 rename stage3/{cis-docbook-utils => pkg/docbook-utils} (100%) mode change 100755 => 100644 rename stage3/{cis-docbook-xml => pkg/docbook-xml} (100%) mode change 100755 => 100644 rename stage3/{cis-docbook-xsl => pkg/docbook-xsl} (100%) mode change 100755 => 100644 rename stage3/{cis-dosfstools => pkg/dosfstools} (100%) mode change 100755 => 100644 create mode 100644 stage3/pkg/fcron rename stage3/{cis-fontconfig => pkg/fontconfig} (100%) mode change 100755 => 100644 create mode 100644 stage3/pkg/freetype rename stage3/{cis-git => pkg/git} (100%) mode change 100755 => 100644 rename stage3/{cis-inetutils => pkg/inetutils} (100%) mode change 100755 => 100644 rename stage3/{cis-iptables => pkg/iptables} (100%) mode change 100755 => 100644 rename stage3/{cis-libmng => pkg/libmng} (100%) mode change 100755 => 100644 rename stage3/{cis-libopenjpeg => pkg/libopenjpeg} (100%) mode change 100755 => 100644 rename stage3/{cis-mysql => pkg/mysql} (100%) mode change 100755 => 100644 create mode 100644 stage3/pkg/nano rename stage3/{cis-nfs-utils => pkg/nfs-utils} (100%) mode change 100755 => 100644 rename stage3/{cis-openjade => pkg/openjade} (100%) mode change 100755 => 100644 rename stage3/{cis-opensp => pkg/opensp} (100%) mode change 100755 => 100644 rename stage3/{cis-openssh => pkg/openssh} (100%) mode change 100755 => 100644 create mode 100644 stage3/pkg/openssl create mode 100644 stage3/pkg/pciutils rename stage3/{cis-portmap => pkg/portmap} (100%) mode change 100755 => 100644 create mode 100644 stage3/pkg/reiserfsprogs rename stage3/{cis-sgml-common => pkg/sgml-common} (100%) mode change 100755 => 100644 rename stage3/{cis-sgml-dtd3 => pkg/sgml-dtd3} (100%) mode change 100755 => 100644 rename stage3/{cis-sgml-dtd4 => pkg/sgml-dtd4} (100%) mode change 100755 => 100644 rename stage3/{cis-sgml-spm => pkg/sgml-spm} (100%) mode change 100755 => 100644 rename stage3/{cis-subversion => pkg/subversion} (100%) mode change 100755 => 100644 rename stage3/{cis-sudo => pkg/sudo} (100%) mode change 100755 => 100644 rename stage3/{cis-tcl => pkg/tcl} (100%) mode change 100755 => 100644 rename stage3/{cis-tcp-wrappers => pkg/tcp-wrappers} (100%) mode change 100755 => 100644 rename stage3/{cis-unrar => pkg/unrar} (100%) mode change 100755 => 100644 rename stage3/{cis-unzip => pkg/unzip} (100%) mode change 100755 => 100644 create mode 100644 stage3/pkg/usbutils rename stage3/{cis-xmltoman => pkg/xmltoman} (100%) mode change 100755 => 100644 rename stage3/{cis-zip => pkg/zip} (100%) mode change 100755 => 100644 create mode 100644 stage3/stage.def delete mode 100755 stage3/stage3-additions delete mode 100755 stage3/stage3-install rename {stage3 => stage5}/bootscripts/alsa (100%) rename {stage3 => stage5}/bootscripts/apache (100%) rename {stage3 => stage5}/bootscripts/clamav (100%) rename {stage3 => stage5}/bootscripts/mailman (100%) rename {stage3 => stage5}/bootscripts/milter-greylist (100%) rename {stage3 => stage5}/bootscripts/milter-spf (100%) rename {stage3 => stage5}/bootscripts/openldap (100%) rename {stage3 => stage5}/bootscripts/pulseaudio (100%) rename {stage3 => stage5}/bootscripts/samba (100%) rename {stage3 => stage5}/bootscripts/saslauthd (100%) rename {stage3 => stage5}/bootscripts/sendmail (100%) delete mode 100755 stage5/cis-pm rename stage5/{stage5-install => install-1} (100%) rename stage3/cis-agg => stage5/pkg/agg (100%) mode change 100755 => 100644 rename stage3/cis-alsa-lib => stage5/pkg/alsa-lib (100%) mode change 100755 => 100644 rename stage3/cis-alsa-utils => stage5/pkg/alsa-utils (100%) mode change 100755 => 100644 rename stage3/cis-apache => stage5/pkg/apache (100%) mode change 100755 => 100644 rename stage5/{cis-boost => pkg/boost} (100%) mode change 100755 => 100644 rename stage5/{cis-cdrtools => pkg/cdrtools} (100%) mode change 100755 => 100644 rename stage3/cis-ckermit => stage5/pkg/ckermit (100%) mode change 100755 => 100644 rename stage3/cis-clamav => stage5/pkg/clamav (100%) mode change 100755 => 100644 rename stage5/{cis-cups => pkg/cups} (100%) mode change 100755 => 100644 rename stage5/{cis-cups-pdf => pkg/cups-pdf} (100%) mode change 100755 => 100644 rename stage5/{cis-dvd-rw-tools => pkg/dvd-rw-tools} (100%) mode change 100755 => 100644 rename stage5/{cis-dvdfs => pkg/dvdfs} (100%) mode change 100755 => 100644 rename stage5/{cis-emacs => pkg/emacs} (100%) mode change 100755 => 100644 rename stage3/cis-firefox => stage5/pkg/firefox (100%) mode change 100755 => 100644 rename stage5/{cis-gconf => pkg/gconf} (100%) mode change 100755 => 100644 rename stage3/cis-getdate => stage5/pkg/getdate (100%) mode change 100755 => 100644 rename stage5/{cis-ghostscript => pkg/ghostscript} (100%) mode change 100755 => 100644 rename stage3/cis-gnash => stage5/pkg/gnash (100%) mode change 100755 => 100644 rename stage5/{cis-gnome => pkg/gnome} (100%) mode change 100755 => 100644 rename stage5/{cis-gnome-config => pkg/gnome-config} (100%) mode change 100755 => 100644 rename stage5/{cis-gnome-nobuild => pkg/gnome-nobuild} (100%) mode change 100755 => 100644 rename stage5/{cis-iso-codes => pkg/iso-codes} (100%) mode change 100755 => 100644 rename stage5/{cis-jadetex => pkg/jadetex} (100%) mode change 100755 => 100644 rename stage3/cis-java => stage5/pkg/java (100%) mode change 100755 => 100644 rename stage3/cis-krb5 => stage5/pkg/krb5 (100%) mode change 100755 => 100644 rename stage3/cis-libid3tag => stage5/pkg/libid3tag (100%) mode change 100755 => 100644 rename stage3/cis-libmad => stage5/pkg/libmad (100%) mode change 100755 => 100644 rename stage3/cis-ltsp => stage5/pkg/ltsp (100%) mode change 100755 => 100644 rename stage3/cis-ltsp-utils => stage5/pkg/ltsp-utils (100%) mode change 100755 => 100644 rename stage3/cis-mailman => stage5/pkg/mailman (100%) mode change 100755 => 100644 rename stage3/cis-milter-greylist => stage5/pkg/milter-greylist (100%) mode change 100755 => 100644 rename stage3/cis-milter-spf => stage5/pkg/milter-spf (100%) mode change 100755 => 100644 rename stage3/cis-nss => stage5/pkg/nss (100%) mode change 100755 => 100644 rename stage3/cis-openldap => stage5/pkg/openldap (100%) mode change 100755 => 100644 rename stage3/cis-php => stage5/pkg/php (100%) mode change 100755 => 100644 rename stage3/cis-pm => stage5/pkg/pm (100%) mode change 100755 => 100644 rename stage3/cis-procmail => stage5/pkg/procmail (100%) mode change 100755 => 100644 rename stage3/cis-pulseaudio => stage5/pkg/pulseaudio (100%) mode change 100755 => 100644 rename stage3/cis-samba => stage5/pkg/samba (100%) mode change 100755 => 100644 rename stage5/{cis-sane-backends => pkg/sane-backends} (100%) mode change 100755 => 100644 rename stage3/cis-sasl2 => stage5/pkg/sasl2 (100%) mode change 100755 => 100644 rename stage3/cis-sendmail => stage5/pkg/sendmail (100%) mode change 100755 => 100644 rename stage3/cis-spamassassin => stage5/pkg/spamassassin (100%) mode change 100755 => 100644 rename stage5/{cis-splix => pkg/splix} (100%) mode change 100755 => 100644 rename stage3/cis-squirrelmail => stage5/pkg/squirrelmail (100%) mode change 100755 => 100644 rename stage5/{cis-tetex => pkg/tetex} (100%) mode change 100755 => 100644 rename stage3/cis-tftp-hpa => stage5/pkg/tftp-hpa (100%) mode change 100755 => 100644 rename stage3/cis-uml-utilities => stage5/pkg/uml-utilities (100%) mode change 100755 => 100644 rename stage3/cis-uw-imap => stage5/pkg/uw-imap (100%) mode change 100755 => 100644 rename stage5/{cis-xsane => pkg/xsane} (100%) mode change 100755 => 100644 rename stage3/cis-xvidcore => stage5/pkg/xvidcore (100%) mode change 100755 => 100644 rename stage3/cis-postinstall => stage5/post-install (100%) rename {stage3 => stage5}/resources/mail-files.sh (100%) delete mode 100755 stage5/stage5-additions diff --git a/functions b/functions index 8052648..ea18ae2 100644 --- a/functions +++ b/functions @@ -216,7 +216,7 @@ static_bootscript_add() echo "${FUNCNAME}(), invalid level argument : ${*}" return 1 fi - + # Making sure bootscript has correct permissions chmod -v 740 ${LFS}/etc/rc.d/init.d/${SCRIPTNAME} @@ -310,7 +310,7 @@ var_export() echo "${FUNCNAME}(), wrong number of arguments: ${*}" return 1 fi - + # Checking if file exists if [ ! -f ${FILE} ]; then echo "${FUNCNAME}(), file not found: ${FILE}" @@ -357,7 +357,7 @@ var_add() echo "${FUNCNAME}(), wrong number of arguments: ${*}" return 1 fi - + # Checking if file exists if [ ! -f ${FILE} ]; then echo "${FUNCNAME}(), file not found: ${FILE}" @@ -400,7 +400,7 @@ var_add() # Variable value is NOT enclosed by double-quotes sed -i "s!\(^export ${VARIABLE}=.*\)!\1${SEP}${VALUE}!" ${FILE} fi - + return $? } @@ -438,7 +438,7 @@ string_add() echo "${FUNCNAME}(), wrong number of arguments: ${*}" return 1 fi - + # Checking if file exists if [ ! -f ${FILE} ]; then echo "${FUNCNAME}(), file not found: ${FILE}" @@ -450,7 +450,7 @@ string_add() echo "${FUNCNAME}(), string already defined: ${STRING}" return 0 fi - + echo "${STRING}" >> ${FILE} } @@ -470,7 +470,7 @@ var_add_shadow() echo "${FUNCNAME}(), wrong number of arguments: ${*}" return 1 fi - + # Checking if file exists if [ ! -f ${FILE} ]; then echo "${FUNCNAME}(), file not found: ${FILE}" @@ -502,7 +502,7 @@ hv_groupadd() last_argument=${*} shift done - + groupadd ${arguments} error=$? @@ -522,24 +522,14 @@ hv_useradd() { arguments="${*}" - set +e - # The last argument is the username while [ $# -ne 0 ]; do - last_argument=${*} + username=${*} shift done - useradd ${arguments} - error=$? - - set -e - - if [ ${error} -eq 0 -o ${error} -eq 9 ]; then - # 9 means the user already exists - return ${EXIT_SUCCESS} - else - exit ${EXIT_FAILURE} + if ! cat /etc/passwd | egrep "^${username}:" 1> /dev/null 2>&1; then + useradd ${arguments} fi } @@ -585,13 +575,13 @@ apply_patches() echo "Usage: ${FUNCNAME} PACKAGE-NAME" exit ${EXIT_FAILURE} fi - + if [ $# -eq 2 ]; then TARGET_DIR=${2} else TARGET_DIR=${PACKAGE} fi - + # Checking if we can find at least one patch. if ls ${LFS_PKG_DIR}/${1}-*.patch 1> /dev/null 2>&1; then cd ${LFS_PKG_DIR} @@ -640,7 +630,7 @@ static_decompressed_dirname() # Decompression of a package # First argument: package name -# Second argument: directory where decompressing (optional) +# Second argument: directory where decompressing (optional, defaults to LFS_TMP) decompress_package() { # Checking for correct number of arguments diff --git a/packages-list b/packages-list index b49b911..b4bf9b4 100644 --- a/packages-list +++ b/packages-list @@ -40,7 +40,7 @@ CLAMAV="clamav-0.93.3" CLOOG_PPL="cloog-ppl-0.15.10" CONSOLEKIT="ConsoleKit-0.4.1" COREUTILS="coreutils-8.5" -CPIO="cpio-2.9" +CPIO="cpio-2.11" CUPS="cups-1.4.2" CUPS_PDF="cups-pdf-2.5.0" CURL="curl-7.19.7" @@ -76,7 +76,7 @@ EMACS="emacs-23.1" ESOUND="esound-0.2.37" EXPAT="expat-2.0.1" -FCRON="fcron-3.0.0" +FCRON="fcron-3.0.6" FETCHMAIL="fetchmail-6.3.12" FFMPEG="ffmpeg-svn-20539" FIREFOX="firefox-3.6.source" @@ -269,7 +269,7 @@ LIBOGG="libogg-1.1.4" LIBOIL="liboil-0.3.17" LIBOPENJPEG="libopenjpeg-1.2" LIBPCAP="libpcap-1.0.0" -LIBPNG="libpng-1.2.39" +LIBPNG="libpng-1.2.44" LIBPROXY="libproxy-0.2.3" LIBPTHREAD_STUBS="libpthread-stubs-0.1" LIBRSVG="librsvg-2.26.0" @@ -319,10 +319,10 @@ OPENJADE="openjade-1.3.2" OPENLDAP="openldap-2.3.38" OPENSP="OpenSP-1.5.2" OPENSSH="openssh-5.1p1" -OPENSSL="openssl-0.9.8l" -OPENSSL_ROOT_CERTS="BLFS-ca-bundle-20090409" +OPENSSL="openssl-1.0.0b" +OPENSSL_ROOT_CERTS="BLFS-ca-bundle-3.12.8.0" -PAM="Linux-PAM-1.1.0" +PAM="Linux-PAM-1.1.3" PANGO="pango-1.26.2" PANGOMM="pangomm-2.26.0" PARTED="parted-1.9.0" @@ -411,7 +411,7 @@ TETEX_TEXMFSRC="tetex-texmfsrc-3.0" TETEX_CM_SUPER="tetex-cm-super" TEXINFO="texinfo-4.13a" TFTP_HPA="tftp-hpa-0.49" -TIFF="tiff-3.8.2" +TIFF="tiff-3.9.4" TK="tk8.5.8-src" TRANSMISSION="transmission-1.34" diff --git a/stage3/cis-boost b/stage3/cis-boost deleted file mode 100755 index 65cf30f..0000000 --- a/stage3/cis-boost +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -./configure \ - --prefix=/usr -make -make install -ldconfig - -exit $? diff --git a/stage3/cis-fcron b/stage3/cis-fcron deleted file mode 100755 index 4f12551..0000000 --- a/stage3/cis-fcron +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -groupadd -f fcron -hv_useradd -c fcron -g fcron fcron - -cd ${LFS_TMP}/${1} -./configure \ - --with-sendmail \ - --with-answer-all=no -make -make install - -rm -f /etc/fcron.conf -mkdir -p /etc/fcron -mv -f /etc/fcron.allow /etc/fcron -mv -f /etc/fcron.deny /etc/fcron - -cat > /etc/fcron/fcron.conf << "EOF" -# fcron.conf - Configuration file for fcron(8) and fcrontab(1). -# See fcron.conf(5) for syntax and explanations. -# -# WARNING : this file must be owned by root:fcron and 640. -# -# -# The spool directory where fcron stores its files -fcrontabs = /var/spool/fcron -# -# The locations of the pid file and the fifo file -pidfile = /var/run/fcron.pid -fifofile = /var/run/fcron.fifo -# -# allow/deny files to determine which users are allowed to use fcrontab -fcronallow = /etc/fcron/fcron.allow -fcrondeny = /etc/fcron/fcron.deny -# -# Location of the programs used by fcron -shell = /bin/sh -sendmail = /usr/sbin/sendmail -# -# Location of the default editor for "fcrontab -e" -editor = /usr/bin/vi -EOF -chmod 640 /etc/fcron/fcron.conf - -cat > /etc/fcron/fcrontab << "EOF" -# &options min hrs day-of-month month day-of-week command -# Run rotatelogs every day at 00:05 -#&mail(false) 05 00 * * * /usr/local/bin/rotatelogs -EOF -chmod 640 /etc/fcron/fcrontab -chown -R root.fcron /etc/fcron - -cat > /etc/fcron/configure << "EOF" -#!/bin/sh - -fcrontab -c /etc/fcron/fcron.conf /etc/fcron/fcrontab - -exit $? -EOF -chmod 740 /etc/fcron/configure - -# Executing fcron configure script. -/etc/fcron/configure - -install -v -m740 ${SCRDIR}/bootscripts/fcron /etc/rc.d/init.d - -# script-name start stop -bootscript_add_rcS fcron 95 84 - -exit $? diff --git a/stage3/cis-flashplugin b/stage3/cis-flashplugin deleted file mode 100755 index 27e1271..0000000 --- a/stage3/cis-flashplugin +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PLUGINS_DIR=/usr/lib/firefox/plugins - -# Applying patches (if any) -apply_patches ${1} - -# Decompression of a package -# First argument: package name -# Second argument: directory where decompressing (optional) -decompress_package ${1} - -if [ ! -d ${PLUGINS_DIR} ]; then - echo "Plugins directory not found." - return 1 -fi - -install -v -m755 ${LFS_TMP}/${1}/flashplayer.xpt ${PLUGINS_DIR} -install -v -m755 ${LFS_TMP}/${1}/libflashplayer.so ${PLUGINS_DIR} - -exit $? diff --git a/stage3/cis-libusb b/stage3/cis-libusb deleted file mode 100755 index 0d047a8..0000000 --- a/stage3/cis-libusb +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -cat > /etc/udev/rules.d/23-usb.rules << "EOF" -# Set group ownership for raw USB devices -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" -EOF - -# Checking if string exists -#if ! grep "/proc/bus/usb" /etc/fstab 1> /dev/null 2>&1; then -# echo "usbfs /proc/bus/usb usbfs ddevgid=14,devmode=0660 0 0" >> /etc/fstab -#fi - -exit $? diff --git a/stage3/cis-nano b/stage3/cis-nano deleted file mode 100755 index 824eeff..0000000 --- a/stage3/cis-nano +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - ${CONFIGURE_OPTS} -make -make install -install -m644 ${SCRDIR}/resources/nanorc /etc -ldconfig - -exit $? diff --git a/stage3/cis-net-tools b/stage3/cis-net-tools deleted file mode 100755 index cb0940a..0000000 --- a/stage3/cis-net-tools +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -cd ${LFS_TMP}/${1} -yes "" | make config -sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \ - -e 's|HAVE_MII 0|HAVE_MII 1|g' config.h -sed -i -e 's|# HAVE_IP_TOOLS=0|HAVE_IP_TOOLS=1|g' \ - -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make -make -j ${MAKEJOBS} -make update - -exit $? diff --git a/stage3/cis-openssl b/stage3/cis-openssl deleted file mode 100755 index 6299cee..0000000 --- a/stage3/cis-openssl +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -decompress_package ${OPENSSL_ROOT_CERTS} ./ 1> /dev/null -MAKEDEPPROG=gcc CC=gcc ./config \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - shared \ - zlib-dynamic -MAKEDEPPROG=gcc CC=gcc make - -# Install man pages in /usr/share/man instead of /etc/ssl/man -make MANDIR=/usr/share/man install -install -v -d -m755 /usr/share/doc/${PACKAGE} -cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \ - /usr/share/doc/${PACKAGE} - -cp -rv certs /etc/ssl - -# Create a single file that contains all of the installed certificates: -for pem in /etc/ssl/certs/*.pem; do - cat $pem - echo "" -done > /etc/ssl/ca-bundle.crt - -exit $? diff --git a/stage3/cis-pam b/stage3/cis-pam deleted file mode 100755 index e65418e..0000000 --- a/stage3/cis-pam +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -cd ${LFS_TMP}/${1}-build -# --libdir=/lib -# Necessary to prevent PAM from instaling into /lib64 -../${1}/configure \ - --libdir=/lib \ - --sbindir=/lib/security \ - --docdir=/usr/share/doc/${1} \ - --enable-read-both-confs -make -j ${MAKEJOBS} -make install - -chmod -v 4755 /lib/security/unix_chkpwd - -mv -v /lib/security/pam_tally /sbin - -mv -v /lib/libpam{,c,_misc}.la /usr/lib -sed -i 's| /lib| /usr/lib|' /usr/lib/libpam_misc.la - -if [ -L /lib/libpam.so ]; then - for LINK in libpam{,c,_misc}.so; do - ln -svfT ../../lib/$(readlink /lib/${LINK}) /usr/lib/${LINK} - rm -v /lib/${LINK} - done -fi - -mkdir -p /etc/pam.d -cat > /etc/pam.d/other << EOF -# /etc/pam.d/other - -auth required pam_unix.so nullok -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so nullok -EOF - -cat > /etc/pam.conf << EOF -# /etc/pam.conf - -other auth required pam_unix.so nullok -other account required pam_unix.so -other session required pam_unix.so -other password required pam_unix.so nullok -EOF - -exit $? diff --git a/stage3/cis-pciutils b/stage3/cis-pciutils deleted file mode 100755 index 24983fa..0000000 --- a/stage3/cis-pciutils +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -cd /${LFS_TMP}/${1} - -# ZLIB=no: Prevents compression of the pci.ids file which is needed by HAL. -make PREFIX=/usr ZLIB=no - -make PREFIX=/usr install - -# Some packages require the PCI static library: -make PREFIX=/usr install-lib - -exit $? diff --git a/stage3/cis-reiserfsprogs b/stage3/cis-reiserfsprogs deleted file mode 100755 index c330a8f..0000000 --- a/stage3/cis-reiserfsprogs +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -cd ${LFS_TMP}/${1} -./configure \ - --prefix=/usr \ - --sbindir=/sbin -# Doesn't seem to use CFLAGS... -make -j ${MAKEJOBS} -make install -ln -sf reiserfsck /sbin/fsck.reiserfs -ln -sf mkreiserfs /sbin/mkfs.reiserfs - -exit $? diff --git a/stage3/cis-usbutils b/stage3/cis-usbutils deleted file mode 100755 index 80ad22d..0000000 --- a/stage3/cis-usbutils +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-zlib \ - ${CONFIGURE_OPTS} -make -make install -install -v -m755 update-usbids.sh /usr/sbin/update-usbids -ldconfig - -# Addition to /etc/fcron/fcrontab -#string_add "# Run update-usbids every day" /etc/fcron/fcrontab -#string_add "&mail(false) * 3 * * * /usr/sbin/update-usbids" /etc/fcron/fcrontab - -# Update database -/usr/sbin/update-usbids - -exit $? diff --git a/stage3/install-1 b/stage3/install-1 new file mode 100755 index 0000000..5e9469d --- /dev/null +++ b/stage3/install-1 @@ -0,0 +1,125 @@ +#!/bin/bash + +# Reading system configuration informations, functions and package versions. +source ../sysinfos +source ../functions +hvtrap_setup +source ../packages-list +source /etc/profile + +if [ "x${USER}" != "xroot" ]; then + echo "You must be the superuser to install hvlinux." + exit 1 +fi + +init_log_file + +ipkg ${NANO} +ipkg ${WHICH} +ipkg -m acnb ${REISERFSPROGS} +ipkg -m acnb ${POPT} +ipkg ${PAM} +ipkg -m noac ${OPENSSL} +ipkg ${WGET} +ipkg -m noac ${PCIUTILS} +ipkg -m acnb ${LIBUSB} +ipkg ${LIBUSB_COMPAT} +ipkg ${USBUTILS} +ipkg ${FCRON} + +exit 1 + +ipkg ${OPENSSH} +ipkg ${EXPAT} +ipkg ${APR} "--with-installbuilddir=/usr/lib/apr-1/build" +ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config" +ipkg ${NEON} "--with-ssl" +ipkg ${TCL} +ipkg ${SQLITE} +ipkg ${SUBVERSION} +ipkg ${SUDO} +ipkg ${STRACE} +ipkg ${PCRE} \ + --docdir=/usr/share/doc/pcre \ + --enable-utf8 \ + --enable-unicode-properties \ + --enable-pcregrep-libz \ + --enable-pcregrep-libbz2 + +# Networking +ipkg ${TCPWRAPPERS} +ipkg ${PORTMAP} +ipkg ${NFS_UTILS} +ipkg ${INETUTILS} +if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then + ipkg ${DDCLIENT} +fi +ipkg -m acnb ${LIBPCAP} +ipkg ${TCPDUMP} +ipkg -m acnb ${NMAP} "--without-nmapfe" +ipkg ${BIND} +ipkg ${IPTABLES} +ipkg ${CURL} +ipkg ${RSYNC} + +if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then + ipkg ${MYSQL} +fi + +# Archiving +ipkg ${ZIP} +ipkg ${UNZIP} +ipkg ${UNRAR} +ipkg ${CPIO} + +ipkg ${PARTED} "--disable-device-mapper" +ipkg ${ED} +ipkg ${BC} "--with-readline" +INIT_D_PATH=/etc/rc.d/init.d \ + ipkg -m acnb ${FUSE} +ipkg ${DOSFSTOOLS} +ipkg ${GIT} + +# Perl modules +ipkg -m pm ${PERL_MOD_PDL} +ipkg -m pm ${PERL_MOD_XML_WRITER} +ipkg -m pm ${PERL_MOD_XML_PARSER} + +ipkg ${INTLTOOL} +ipkg ${PYTHON} "--enable-shared" + +# DocBook +ipkg ${SGML_COMMON} +ipkg ${SGML_DTD3} +ipkg ${SGML_DTD4} +ipkg ${OPENSP} +ipkg ${OPENJADE} +ipkg ${DOCBOOK_DSSSL} +ipkg -m pm ${SGML_SPM} +ipkg ${DOCBOOK_UTILS} +ipkg -m acnb ${LIBXML2} +ipkg -m acnb ${LIBXSLT} +ipkg ${DOCBOOK_XML} +ipkg ${DOCBOOK_XSL} +ipkg ${XMLTOMAN} +ipkg ${XMLTO} + +# Graphic libraries +ipkg ${LIBJPEG} "--enable-static --enable-shared" +ipkg ${LIBOPENJPEG} +ipkg ${LIBPNG} +ipkg ${LIBART} +ipkg ${LIBEXIF} +ipkg ${FRIBIDI} +ipkg -m acnb ${HICOLOR_ICON_THEME} +ipkg ${TIFF} +ipkg ${GIFLIB} +ipkg -m acnb ${LCMS} +ipkg ${LIBMNG} + +ipkg ${FREETYPE} +ipkg ${FONTCONFIG} + +echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h" + +exit $? diff --git a/stage3/ipkg.def b/stage3/ipkg.def new file mode 100644 index 0000000..135c8da --- /dev/null +++ b/stage3/ipkg.def @@ -0,0 +1,7 @@ +#!/bin/bash + +# Setting default configure options for all scripts +CONFIGURE_OPTS="\ + --prefix=/usr \ + --sysconfdir=/etc \ + ${CONFIGURE_OPTS}" diff --git a/stage3/packages-update b/stage3/packages-update index 58f0bbd..60d825d 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -29,9 +29,9 @@ fpkg_sf ${LIBUSB} fpkg_sf ${LIBUSB_COMPAT} libusb fpkg ${USBUTILS} ${SOURCEFORGE_URL}/project/linux-usb/usbutils fpkg ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs -fpkg ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools fpkg ${POPT} http://rpm5.org/files/popt fpkg ${PAM} http://www.kernel.org/pub/linux/libs/pam/library +fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} http://fcron.free.fr/archives fpkg ${OPENSSL} ftp://ftp.openssl.org/source fpkg ${OPENSSL_ROOT_CERTS} http://anduin.linuxfromscratch.org/files/BLFS fpkg ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable @@ -71,7 +71,7 @@ fpkg_gnu ${ED} fpkg_gnu ${BC} fpkg_sf ${FUSE} fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools" -fpkg ${CVS} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS})" +##fpkg ${CVS} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS})" fpkg ${GIT} "http://www.kernel.org/pub/software/scm/git" fpkg ${GIT_MANPAGES} "http://www.kernel.org/pub/software/scm/git" @@ -105,7 +105,7 @@ fpkg_gnome ${LIBART} fpkg_sf ${LIBEXIF} fpkg ${FRIBIDI} "http://fribidi.org/download" fpkg ${HICOLOR_ICON_THEME} "http://icon-theme.freedesktop.org/releases" -fpkg ${TIFF} "http://libtiff.maptools.org/dl" +fpkg ${TIFF} "http://download.osgeo.org/libtiff" fpkg_sf ${GIFLIB} fpkg ${LCMS} "http://www.littlecms.com" fpkg_sf ${LIBMNG} diff --git a/stage3/pkg/Linux-PAM b/stage3/pkg/Linux-PAM new file mode 100644 index 0000000..26e4915 --- /dev/null +++ b/stage3/pkg/Linux-PAM @@ -0,0 +1,41 @@ +#!/bin/bash + +hvconfig_pre() +{ + # --libdir=/lib + # Necessary to prevent PAM from instaling into /lib64 + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --libdir=/lib \ + --sbindir=/lib/security \ + --enable-securedir=/lib/security \ + --enable-shared \ + --docdir=/usr/share/doc/${1}" +} + +hvbuild_post() +{ + chmod -v 4755 /lib/security/unix_chkpwd + + mv -v /lib/security/pam_tally /sbin + + mv -v /lib/libpam{,c,_misc}.la /usr/lib + sed -i 's| /lib| /usr/lib|' /usr/lib/libpam_misc.la + + if [ -L /lib/libpam.so ]; then + for LINK in libpam{,c,_misc}.so; do + ln -svfT ../../lib/$(readlink /lib/${LINK}) /usr/lib/${LINK} + rm -v /lib/${LINK} + done + fi + + mkdir -p /etc/pam.d + cat > /etc/pam.d/other << EOF +# /etc/pam.d/other + +auth required pam_unix.so nullok +account required pam_unix.so +session required pam_unix.so +password required pam_unix.so nullok +EOF +} diff --git a/stage3/cis-bind b/stage3/pkg/bind old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-bind rename to stage3/pkg/bind diff --git a/stage3/cis-ddclient b/stage3/pkg/ddclient old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-ddclient rename to stage3/pkg/ddclient diff --git a/stage3/cis-docbook-dsssl b/stage3/pkg/docbook-dsssl old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-docbook-dsssl rename to stage3/pkg/docbook-dsssl diff --git a/stage3/cis-docbook-utils b/stage3/pkg/docbook-utils old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-docbook-utils rename to stage3/pkg/docbook-utils diff --git a/stage3/cis-docbook-xml b/stage3/pkg/docbook-xml old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-docbook-xml rename to stage3/pkg/docbook-xml diff --git a/stage3/cis-docbook-xsl b/stage3/pkg/docbook-xsl old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-docbook-xsl rename to stage3/pkg/docbook-xsl diff --git a/stage3/cis-dosfstools b/stage3/pkg/dosfstools old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-dosfstools rename to stage3/pkg/dosfstools diff --git a/stage3/pkg/fcron b/stage3/pkg/fcron new file mode 100644 index 0000000..517298a --- /dev/null +++ b/stage3/pkg/fcron @@ -0,0 +1,87 @@ +#!/bin/bash + +hvconfig_pre() +{ + groupadd -f fcron + hv_useradd -c fcron -g fcron fcron + + # Create a dummy sendmail executable to fool fcron + DUMMY_SM_PATH=/usr/sbin/sendmail + if [ ! -f ${DUMMY_SM_PATH} ]; then + DUMMY_SM=yes + touch ${DUMMY_SM_PATH} + chmod 755 ${DUMMY_SM_PATH} + fi + + CONFIGURE_OPTS="${CONFIGURE_OPTS} \ + --with-editor=/usr/bin/nano \ + --with-boot-install=no \ + --with-answer-all=no" +} + +hvbuild_post() +{ + if [ "x${DUMMY_SM}" = "xyes" ]; then + rm ${DUMMY_SM_PATH} + fi + + rm -f /etc/fcron.conf + mkdir -p /etc/fcron + mv -f /etc/fcron.allow /etc/fcron + mv -f /etc/fcron.deny /etc/fcron + + cat > /etc/fcron/fcron.conf << "EOF" +# fcron.conf - Configuration file for fcron(8) and fcrontab(1). +# See fcron.conf(5) for syntax and explanations. +# +# WARNING : this file must be owned by root:fcron and 640. +# +# +# The spool directory where fcron stores its files +fcrontabs = /var/spool/fcron +# +# The locations of the pid file and the fifo file +pidfile = /var/run/fcron.pid +fifofile = /var/run/fcron.fifo +# +# allow/deny files to determine which users are allowed to use fcrontab +fcronallow = /etc/fcron/fcron.allow +fcrondeny = /etc/fcron/fcron.deny +# +# Location of the programs used by fcron +shell = /bin/sh +sendmail = /usr/sbin/sendmail +# +# Location of the default editor for "fcrontab -e" +editor = /usr/bin/nano +EOF + chmod 640 /etc/fcron/fcron.conf + + cat > /etc/fcron/fcrontab << "EOF" +# &options min hrs day-of-month month day-of-week command +# Run rotatelogs every day at 00:05 +#&mail(false) 05 00 * * * /usr/local/bin/rotatelogs +EOF + chmod 640 /etc/fcron/fcrontab + chown -R root.fcron /etc/fcron + + install -d /var/spool/fcron + chown fcron.fcron /var/spool/fcron + + cat > /etc/fcron/configure << "EOF" +#!/bin/sh + +fcrontab -c /etc/fcron/fcron.conf /etc/fcron/fcrontab + +exit $? +EOF + chmod 740 /etc/fcron/configure + + # Executing fcron configure script. + /etc/fcron/configure + + install -v -m740 ${SCRDIR}/bootscripts/fcron /etc/rc.d/init.d + + # script-name start stop + bootscript_add_rcsysinit fcron 95 84 +} diff --git a/stage3/cis-fontconfig b/stage3/pkg/fontconfig old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-fontconfig rename to stage3/pkg/fontconfig diff --git a/stage3/pkg/freetype b/stage3/pkg/freetype new file mode 100644 index 0000000..7aa6483 --- /dev/null +++ b/stage3/pkg/freetype @@ -0,0 +1,4 @@ + + +sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:' \ + include/freetype/config/ftoption.h && diff --git a/stage3/cis-git b/stage3/pkg/git old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-git rename to stage3/pkg/git diff --git a/stage3/cis-inetutils b/stage3/pkg/inetutils old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-inetutils rename to stage3/pkg/inetutils diff --git a/stage3/cis-iptables b/stage3/pkg/iptables old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-iptables rename to stage3/pkg/iptables diff --git a/stage3/cis-libmng b/stage3/pkg/libmng old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-libmng rename to stage3/pkg/libmng diff --git a/stage3/cis-libopenjpeg b/stage3/pkg/libopenjpeg old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-libopenjpeg rename to stage3/pkg/libopenjpeg diff --git a/stage3/cis-mysql b/stage3/pkg/mysql old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-mysql rename to stage3/pkg/mysql diff --git a/stage3/pkg/nano b/stage3/pkg/nano new file mode 100644 index 0000000..d1c986f --- /dev/null +++ b/stage3/pkg/nano @@ -0,0 +1,8 @@ +#!/bin/bash + +# On re-installe nano car il a ete installe au stage0 avec un path non-standard + +hvbuild_post() +{ + install -m644 ${SCRDIR}/resources/nanorc /etc +} diff --git a/stage3/cis-nfs-utils b/stage3/pkg/nfs-utils old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-nfs-utils rename to stage3/pkg/nfs-utils diff --git a/stage3/cis-openjade b/stage3/pkg/openjade old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-openjade rename to stage3/pkg/openjade diff --git a/stage3/cis-opensp b/stage3/pkg/opensp old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-opensp rename to stage3/pkg/opensp diff --git a/stage3/cis-openssh b/stage3/pkg/openssh old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-openssh rename to stage3/pkg/openssh diff --git a/stage3/pkg/openssl b/stage3/pkg/openssl new file mode 100644 index 0000000..132dc4f --- /dev/null +++ b/stage3/pkg/openssl @@ -0,0 +1,32 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + decompress_package ${OPENSSL_ROOT_CERTS} ./ +} + +hvbuild() +{ + MAKEDEPPROG=gcc CC=gcc ./config \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + shared \ + zlib-dynamic + + MAKEDEPPROG=gcc CC=gcc make + + # Install man pages in /usr/share/man instead of /etc/ssl/man + make MANDIR=/usr/share/man install + install -v -d -m755 /usr/share/doc/${PACKAGE} + cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \ + /usr/share/doc/${PACKAGE} + + cp -rv certs /etc/ssl + + # Create a single file that contains all of the installed certificates: + for pem in /etc/ssl/certs/*.pem; do + cat $pem + echo "" + done > /etc/ssl/ca-bundle.crt +} diff --git a/stage3/pkg/pciutils b/stage3/pkg/pciutils new file mode 100644 index 0000000..a63b8ac --- /dev/null +++ b/stage3/pkg/pciutils @@ -0,0 +1,14 @@ +#!/bin/bash + +hvbuild() +{ + cd ${LFS_TMP}/${PACKAGE} + + # ZLIB=no: Prevents compression of the pci.ids file which is needed by HAL. + make PREFIX=/usr ZLIB=no + + make PREFIX=/usr install + + # Some packages require the PCI static library: + make PREFIX=/usr install-lib +} diff --git a/stage3/cis-portmap b/stage3/pkg/portmap old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-portmap rename to stage3/pkg/portmap diff --git a/stage3/pkg/reiserfsprogs b/stage3/pkg/reiserfsprogs new file mode 100644 index 0000000..36c50d2 --- /dev/null +++ b/stage3/pkg/reiserfsprogs @@ -0,0 +1,14 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --sbindir=/sbin" +} + +hvbuild_post() +{ + ln -sf reiserfsck /sbin/fsck.reiserfs + ln -sf mkreiserfs /sbin/mkfs.reiserfs +} diff --git a/stage3/cis-sgml-common b/stage3/pkg/sgml-common old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sgml-common rename to stage3/pkg/sgml-common diff --git a/stage3/cis-sgml-dtd3 b/stage3/pkg/sgml-dtd3 old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sgml-dtd3 rename to stage3/pkg/sgml-dtd3 diff --git a/stage3/cis-sgml-dtd4 b/stage3/pkg/sgml-dtd4 old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sgml-dtd4 rename to stage3/pkg/sgml-dtd4 diff --git a/stage3/cis-sgml-spm b/stage3/pkg/sgml-spm old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sgml-spm rename to stage3/pkg/sgml-spm diff --git a/stage3/cis-subversion b/stage3/pkg/subversion old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-subversion rename to stage3/pkg/subversion diff --git a/stage3/cis-sudo b/stage3/pkg/sudo old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sudo rename to stage3/pkg/sudo diff --git a/stage3/cis-tcl b/stage3/pkg/tcl old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-tcl rename to stage3/pkg/tcl diff --git a/stage3/cis-tcp-wrappers b/stage3/pkg/tcp-wrappers old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-tcp-wrappers rename to stage3/pkg/tcp-wrappers diff --git a/stage3/cis-unrar b/stage3/pkg/unrar old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-unrar rename to stage3/pkg/unrar diff --git a/stage3/cis-unzip b/stage3/pkg/unzip old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-unzip rename to stage3/pkg/unzip diff --git a/stage3/pkg/usbutils b/stage3/pkg/usbutils new file mode 100644 index 0000000..c20f9b0 --- /dev/null +++ b/stage3/pkg/usbutils @@ -0,0 +1,20 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --disable-zlib" +} + +hvbuild_post() +{ + install -v -m755 update-usbids.sh /usr/sbin/update-usbids + + # Addition to /etc/fcron/fcrontab + #string_add "# Run update-usbids every day" /etc/fcron/fcrontab + #string_add "&mail(false) * 3 * * * /usr/sbin/update-usbids" /etc/fcron/fcrontab + + # Update database + /usr/sbin/update-usbids +} diff --git a/stage3/cis-xmltoman b/stage3/pkg/xmltoman old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-xmltoman rename to stage3/pkg/xmltoman diff --git a/stage3/cis-zip b/stage3/pkg/zip old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-zip rename to stage3/pkg/zip diff --git a/stage3/resources/nanorc b/stage3/resources/nanorc index b2f4e7b..029346a 100644 --- a/stage3/resources/nanorc +++ b/stage3/resources/nanorc @@ -1,6 +1,5 @@ set autoindent set const -set fill 72 set historylog set multibuffer set regexp diff --git a/stage3/stage.def b/stage3/stage.def new file mode 100644 index 0000000..cf17b3f --- /dev/null +++ b/stage3/stage.def @@ -0,0 +1,3 @@ +#!/bin/bash + +export LFS_STAGE=stage3 diff --git a/stage3/stage3-additions b/stage3/stage3-additions deleted file mode 100755 index abc4847..0000000 --- a/stage3/stage3-additions +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage3" -export LFS_LOG_DIR=/var/log/hvlinux-install/stage3 -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP="/tmp" - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list -source /etc/profile - -if [ "x${USER}" != "xroot" ]; then - echo "You must be the superuser to install hvlinux." - exit 1 -fi - -init_log_file - -# Scripts directory -export SCRDIR=$(pwd) - -ipkg_ac ${CPIO} - -exit $? diff --git a/stage3/stage3-install b/stage3/stage3-install deleted file mode 100755 index 4f7a4c5..0000000 --- a/stage3/stage3-install +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh - -LFS_STAGE=stage3 - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}" -export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE} -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP=/tmp - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list -source /etc/profile - -if [ "x${USER}" != "xroot" ]; then - echo "You must be the superuser to install hvlinux." - exit 1 -fi - -init_log_file - -# Scripts directory -export SCRDIR=$(pwd) - -ipkg_cust ${NANO} cis-nano --enable-color --enable-multibuffer -ipkg_ac ${WHICH} -ipkg_cust ${PCIUTILS} cis-pciutils -ipkg_cust ${LIBUSB} cis-libusb -ipkg_ac ${LIBUSB_COMPAT} -ipkg_cust ${USBUTILS} cis-usbutils -ipkg_cust ${REISERFSPROGS} cis-reiserfsprogs -ipkg_cust ${NET_TOOLS} cis-net-tools -ipkg_cust ${DHCP} cis-dhcp -ipkg_ac_nb ${POPT} -ipkg_cust ${PAM} cis-pam -ipkg_cust ${OPENSSL} cis-openssl -ipkg_cust ${OPENSSH} cis-openssh -ipkg_ac ${EXPAT} -ipkg_ac ${APR} --with-installbuilddir=/usr/lib/apr-1/build -ipkg_ac ${APR_UTIL} --with-apr=/usr/bin/apr-1-config -ipkg_ac ${NEON} --with-ssl -ipkg_cust ${TCL} cis-tcl -ipkg_ac ${SQLITE} -ipkg_ac ${SUBVERSION} -ipkg_cust ${SUDO} cis-sudo -ipkg_ac ${STRACE} -ipkg_ac ${PCRE} \ - --docdir=/usr/share/doc/pcre \ - --enable-utf8 \ - --enable-unicode-properties \ - --enable-pcregrep-libz \ - --enable-pcregrep-libbz2 - -# Networking -ipkg_ac ${WGET} -ipkg_cust ${TCPWRAPPERS} cis-tcp-wrappers -ipkg_cust ${PORTMAP} cis-portmap -ipkg_cust ${NFS_UTILS} cis-nfs-utils -ipkg_cust ${INETUTILS} cis-inetutils -if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then - ipkg_cust ${DDCLIENT} cis-ddclient -fi -ipkg_ac_nb ${LIBPCAP} -ipkg_ac ${TCPDUMP} -ipkg_ac_nb ${NMAP} --without-nmapfe -ipkg_cust ${BIND} cis-bind -ipkg_cust ${IPTABLES} cis-iptables -ipkg_ac ${CURL} -ipkg_ac ${RSYNC} - -if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg_cust ${MYSQL} cis-mysql -fi - -# Archiving -ipkg_cust ${ZIP} cis-zip -ipkg_cust ${UNZIP} cis-unzip -ipkg_cust ${UNRAR} cis-unrar -ipkg_ac ${CPIO} - -ipkg_ac ${PARTED} --disable-device-mapper -ipkg_ac ${ED} -ipkg_ac ${BC} --with-readline -INIT_D_PATH=/etc/rc.d/init.d \ - ipkg_ac_nb ${FUSE} -ipkg_cust ${DOSFSTOOLS} cis-dosfstools -#ipkg_ac ${CVS} --disable-server -ipkg_cust ${GIT} cis-git - -# Perl modules -ipkg_pm ${PERL_MOD_PDL} -ipkg_pm ${PERL_MOD_XML_WRITER} -ipkg_pm ${PERL_MOD_XML_PARSER} - -ipkg_ac ${INTLTOOL} -ipkg_ac ${PYTHON} "--enable-shared" - -# DocBook -ipkg_cust ${SGML_COMMON} cis-sgml-common -ipkg_cust ${SGML_DTD3} cis-sgml-dtd3 -ipkg_cust ${SGML_DTD4} cis-sgml-dtd4 -ipkg_cust ${OPENSP} cis-opensp -ipkg_cust ${OPENJADE} cis-openjade -ipkg_cust ${DOCBOOK_DSSSL} cis-docbook-dsssl -ipkg_cust ${SGML_SPM} cis-sgml-spm # Perl module -ipkg_cust ${DOCBOOK_UTILS} cis-docbook-utils -ipkg_ac_nb ${LIBXML2} -ipkg_ac_nb ${LIBXSLT} -ipkg_cust ${DOCBOOK_XML} cis-docbook-xml -ipkg_cust ${DOCBOOK_XSL} cis-docbook-xsl -ipkg_cust ${XMLTOMAN} cis-xmltoman -ipkg_ac ${XMLTO} - -# Graphic libraries -ipkg_ac ${LIBJPEG} "--enable-static --enable-shared" -ipkg_cust ${LIBOPENJPEG} cis-libopenjpeg -ipkg_ac ${LIBPNG} -ipkg_ac ${LIBART} -ipkg_ac ${LIBEXIF} -ipkg_ac ${FRIBIDI} -ipkg_ac_nb ${HICOLOR_ICON_THEME} -ipkg_ac ${TIFF} -ipkg_ac ${GIFLIB} -ipkg_ac_nb ${LCMS} -ipkg_cust ${LIBMNG} cis-libmng - -ipkg_ac ${FREETYPE} -ipkg_cust ${FONTCONFIG} cis-fontconfig - -echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h" - -exit $? diff --git a/stage3/bootscripts/alsa b/stage5/bootscripts/alsa similarity index 100% rename from stage3/bootscripts/alsa rename to stage5/bootscripts/alsa diff --git a/stage3/bootscripts/apache b/stage5/bootscripts/apache similarity index 100% rename from stage3/bootscripts/apache rename to stage5/bootscripts/apache diff --git a/stage3/bootscripts/clamav b/stage5/bootscripts/clamav similarity index 100% rename from stage3/bootscripts/clamav rename to stage5/bootscripts/clamav diff --git a/stage3/bootscripts/mailman b/stage5/bootscripts/mailman similarity index 100% rename from stage3/bootscripts/mailman rename to stage5/bootscripts/mailman diff --git a/stage3/bootscripts/milter-greylist b/stage5/bootscripts/milter-greylist similarity index 100% rename from stage3/bootscripts/milter-greylist rename to stage5/bootscripts/milter-greylist diff --git a/stage3/bootscripts/milter-spf b/stage5/bootscripts/milter-spf similarity index 100% rename from stage3/bootscripts/milter-spf rename to stage5/bootscripts/milter-spf diff --git a/stage3/bootscripts/openldap b/stage5/bootscripts/openldap similarity index 100% rename from stage3/bootscripts/openldap rename to stage5/bootscripts/openldap diff --git a/stage3/bootscripts/pulseaudio b/stage5/bootscripts/pulseaudio similarity index 100% rename from stage3/bootscripts/pulseaudio rename to stage5/bootscripts/pulseaudio diff --git a/stage3/bootscripts/samba b/stage5/bootscripts/samba similarity index 100% rename from stage3/bootscripts/samba rename to stage5/bootscripts/samba diff --git a/stage3/bootscripts/saslauthd b/stage5/bootscripts/saslauthd similarity index 100% rename from stage3/bootscripts/saslauthd rename to stage5/bootscripts/saslauthd diff --git a/stage3/bootscripts/sendmail b/stage5/bootscripts/sendmail similarity index 100% rename from stage3/bootscripts/sendmail rename to stage5/bootscripts/sendmail diff --git a/stage5/cis-pm b/stage5/cis-pm deleted file mode 100755 index ace1555..0000000 --- a/stage5/cis-pm +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -# The option "-n" is used to avoid having to answer a question and accept the -# default configuration. -perl Makefile.PL -n ${CONFIGURE_OPTS} -make -make install -ldconfig - -exit $? diff --git a/stage5/stage5-install b/stage5/install-1 similarity index 100% rename from stage5/stage5-install rename to stage5/install-1 diff --git a/stage3/cis-agg b/stage5/pkg/agg old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-agg rename to stage5/pkg/agg diff --git a/stage3/cis-alsa-lib b/stage5/pkg/alsa-lib old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-alsa-lib rename to stage5/pkg/alsa-lib diff --git a/stage3/cis-alsa-utils b/stage5/pkg/alsa-utils old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-alsa-utils rename to stage5/pkg/alsa-utils diff --git a/stage3/cis-apache b/stage5/pkg/apache old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-apache rename to stage5/pkg/apache diff --git a/stage5/cis-boost b/stage5/pkg/boost old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-boost rename to stage5/pkg/boost diff --git a/stage5/cis-cdrtools b/stage5/pkg/cdrtools old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-cdrtools rename to stage5/pkg/cdrtools diff --git a/stage3/cis-ckermit b/stage5/pkg/ckermit old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-ckermit rename to stage5/pkg/ckermit diff --git a/stage3/cis-clamav b/stage5/pkg/clamav old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-clamav rename to stage5/pkg/clamav diff --git a/stage5/cis-cups b/stage5/pkg/cups old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-cups rename to stage5/pkg/cups diff --git a/stage5/cis-cups-pdf b/stage5/pkg/cups-pdf old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-cups-pdf rename to stage5/pkg/cups-pdf diff --git a/stage5/cis-dvd-rw-tools b/stage5/pkg/dvd-rw-tools old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-dvd-rw-tools rename to stage5/pkg/dvd-rw-tools diff --git a/stage5/cis-dvdfs b/stage5/pkg/dvdfs old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-dvdfs rename to stage5/pkg/dvdfs diff --git a/stage5/cis-emacs b/stage5/pkg/emacs old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-emacs rename to stage5/pkg/emacs diff --git a/stage3/cis-firefox b/stage5/pkg/firefox old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-firefox rename to stage5/pkg/firefox diff --git a/stage5/cis-gconf b/stage5/pkg/gconf old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-gconf rename to stage5/pkg/gconf diff --git a/stage3/cis-getdate b/stage5/pkg/getdate old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-getdate rename to stage5/pkg/getdate diff --git a/stage5/cis-ghostscript b/stage5/pkg/ghostscript old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-ghostscript rename to stage5/pkg/ghostscript diff --git a/stage3/cis-gnash b/stage5/pkg/gnash old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-gnash rename to stage5/pkg/gnash diff --git a/stage5/cis-gnome b/stage5/pkg/gnome old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-gnome rename to stage5/pkg/gnome diff --git a/stage5/cis-gnome-config b/stage5/pkg/gnome-config old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-gnome-config rename to stage5/pkg/gnome-config diff --git a/stage5/cis-gnome-nobuild b/stage5/pkg/gnome-nobuild old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-gnome-nobuild rename to stage5/pkg/gnome-nobuild diff --git a/stage5/cis-iso-codes b/stage5/pkg/iso-codes old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-iso-codes rename to stage5/pkg/iso-codes diff --git a/stage5/cis-jadetex b/stage5/pkg/jadetex old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-jadetex rename to stage5/pkg/jadetex diff --git a/stage3/cis-java b/stage5/pkg/java old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-java rename to stage5/pkg/java diff --git a/stage3/cis-krb5 b/stage5/pkg/krb5 old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-krb5 rename to stage5/pkg/krb5 diff --git a/stage3/cis-libid3tag b/stage5/pkg/libid3tag old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-libid3tag rename to stage5/pkg/libid3tag diff --git a/stage3/cis-libmad b/stage5/pkg/libmad old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-libmad rename to stage5/pkg/libmad diff --git a/stage3/cis-ltsp b/stage5/pkg/ltsp old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-ltsp rename to stage5/pkg/ltsp diff --git a/stage3/cis-ltsp-utils b/stage5/pkg/ltsp-utils old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-ltsp-utils rename to stage5/pkg/ltsp-utils diff --git a/stage3/cis-mailman b/stage5/pkg/mailman old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-mailman rename to stage5/pkg/mailman diff --git a/stage3/cis-milter-greylist b/stage5/pkg/milter-greylist old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-milter-greylist rename to stage5/pkg/milter-greylist diff --git a/stage3/cis-milter-spf b/stage5/pkg/milter-spf old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-milter-spf rename to stage5/pkg/milter-spf diff --git a/stage3/cis-nss b/stage5/pkg/nss old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-nss rename to stage5/pkg/nss diff --git a/stage3/cis-openldap b/stage5/pkg/openldap old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-openldap rename to stage5/pkg/openldap diff --git a/stage3/cis-php b/stage5/pkg/php old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-php rename to stage5/pkg/php diff --git a/stage3/cis-pm b/stage5/pkg/pm old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-pm rename to stage5/pkg/pm diff --git a/stage3/cis-procmail b/stage5/pkg/procmail old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-procmail rename to stage5/pkg/procmail diff --git a/stage3/cis-pulseaudio b/stage5/pkg/pulseaudio old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-pulseaudio rename to stage5/pkg/pulseaudio diff --git a/stage3/cis-samba b/stage5/pkg/samba old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-samba rename to stage5/pkg/samba diff --git a/stage5/cis-sane-backends b/stage5/pkg/sane-backends old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-sane-backends rename to stage5/pkg/sane-backends diff --git a/stage3/cis-sasl2 b/stage5/pkg/sasl2 old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sasl2 rename to stage5/pkg/sasl2 diff --git a/stage3/cis-sendmail b/stage5/pkg/sendmail old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-sendmail rename to stage5/pkg/sendmail diff --git a/stage3/cis-spamassassin b/stage5/pkg/spamassassin old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-spamassassin rename to stage5/pkg/spamassassin diff --git a/stage5/cis-splix b/stage5/pkg/splix old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-splix rename to stage5/pkg/splix diff --git a/stage3/cis-squirrelmail b/stage5/pkg/squirrelmail old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-squirrelmail rename to stage5/pkg/squirrelmail diff --git a/stage5/cis-tetex b/stage5/pkg/tetex old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-tetex rename to stage5/pkg/tetex diff --git a/stage3/cis-tftp-hpa b/stage5/pkg/tftp-hpa old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-tftp-hpa rename to stage5/pkg/tftp-hpa diff --git a/stage3/cis-uml-utilities b/stage5/pkg/uml-utilities old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-uml-utilities rename to stage5/pkg/uml-utilities diff --git a/stage3/cis-uw-imap b/stage5/pkg/uw-imap old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-uw-imap rename to stage5/pkg/uw-imap diff --git a/stage5/cis-xsane b/stage5/pkg/xsane old mode 100755 new mode 100644 similarity index 100% rename from stage5/cis-xsane rename to stage5/pkg/xsane diff --git a/stage3/cis-xvidcore b/stage5/pkg/xvidcore old mode 100755 new mode 100644 similarity index 100% rename from stage3/cis-xvidcore rename to stage5/pkg/xvidcore diff --git a/stage3/cis-postinstall b/stage5/post-install similarity index 100% rename from stage3/cis-postinstall rename to stage5/post-install diff --git a/stage3/resources/mail-files.sh b/stage5/resources/mail-files.sh similarity index 100% rename from stage3/resources/mail-files.sh rename to stage5/resources/mail-files.sh diff --git a/stage5/stage5-additions b/stage5/stage5-additions deleted file mode 100755 index 73591b1..0000000 --- a/stage5/stage5-additions +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -LFS_STAGE=stage4 - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}" -export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE} -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP=/tmp - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list -source /etc/profile - -if [ "x${USER}" != "xroot" ]; then - echo "You must be the superuser to install hvlinux." - exit 1 -fi - -init_log_file - -# Scripts directory -export SCRDIR=$(pwd) - -exit $? -- 2.20.1