From aa229d2908422fce286bbd65710e31b086c8a2a2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Feb 2010 20:33:46 +0000 Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20niveau=20d=C3=A9but=20du=20stage?= =?utf8?q?3=20avant=20X-window?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- dependencies | 33 +++++++++++- functions | 9 +++- functions-update | 81 +++++++++++++++--------------- packages-list | 72 ++++++++++++++------------- stage3/cis-cups | 24 ++++----- stage3/cis-docbook-xsl | 37 +++++++------- stage3/cis-postinstall | 12 ++--- stage3/cis-samba | 46 ++++++++--------- stage3/cis-sane-backends | 38 +++++++------- stage3/cis-sendmail | 96 +++++++++++++++++------------------ stage3/cis-tetex | 3 ++ stage3/cis-unrar | 23 +++++++++ stage3/packages-update | 78 +++++++++++++++++------------ stage3/stage3-install | 105 +++++++++++++++++++-------------------- stage4/packages-update | 1 - stage4/stage4-install | 1 - sysinfos | 2 +- 17 files changed, 365 insertions(+), 296 deletions(-) create mode 100755 stage3/cis-unrar diff --git a/dependencies b/dependencies index 0b4452a..087f851 100644 --- a/dependencies +++ b/dependencies @@ -1,5 +1,6 @@ #!/bin/sh +${INTLTOOL}: ${PERL_MOD_XML_PARSER} ${INKSCAPE}: ${LIBBOOST} ${INTLTOOL} ${LIBXML2}: ${PYTHON} ${TETEX_SRC}: ${ED} @@ -15,7 +16,7 @@ ${AUDACIOUS}: taglib, libmowgli, mcs ${GRIP}: id3lib ${PULSEAUDIO}: liboil, gdbm -${GOFFICE}: ${LIBGSF} ${PCRE} +${GOFFICE}: ${LIBGSF} ${PCRE} ${PANGO} ${GNUMERIC}: ${GOFFICE} ${ABIWORD}: ${WV} ${GOFFICE} ${GIT}: cpio @@ -39,3 +40,33 @@ ${GOBJECT_INSTROSPECTION}: ${GLIB} ${LIBFFI} ${POLKIT}: ${GOBJECT_INSTROSPECTION} ${EGGDBUS} ${GNOME_KEYRING}: ${LIBTASN1} + +${HELP2MAN}: ${PERL} +${BITBAKE}: ${HELP2MAN} + +${LIBTIFF}: ${XORG} + +${GIFLIB}: ${XORG} +${LCMS}: ${LIBTIFF} ${LIBJPEG} ${PYTHON} + +${LIBMNG}: ${LCMS} ${LIBJPEG} + +${FONTCONFIG}: ${FREETYPE} ${EXPAT} + +${LIBRSVG}: ${GTK} ${LIBXML2} + +${IMLIB2}: ${FREETYPE} ${LIBJPEG} ${LIBPNG} ${LIBTIFF} ${XORG} ${GIFLIB} ${LIBID3TAG} + +${POPPLER}: ${FONTCONFIG} ${LIBJPEG} ${CAIRO} ${GLIB} ${LIBOPENJPEG} + +${LIBDVDREAD}: ${LIBDVDCSS} +${DVDFS}: ${FUSE} ${LIBDVDREAD} + +${DVDRWTOOLS}: ${CDRTOOLS} + +${T1LIB}: ${XORG} +${TETEX}: ${ED} ${LIBPNG} ${T1LIB} ${XORG} ${GD} + +${GIT}: ${OPENSSL} ${EXPAT} ${ZLIB} ${PERL} ${CURL} + +${NMAP}: ${OPENSSL} ${PCRE} ${LIBPCAP} diff --git a/functions b/functions index b799c51..5d7d083 100644 --- a/functions +++ b/functions @@ -853,7 +853,14 @@ rcmd() # Executing command ${CMD_WITH_ARGS} 1>> ${LFS_LOG_FILE} 2>&1 - eval_retval + if [ $? -ne 0 ]; then + print_status failure + if [ -n "${RCMD_NO_EXIT}" ]; then + return ${EXIT_FAILURE} + else + exit ${EXIT_FAILURE} + fi + fi # Displaying build time after the package name print_status success diff --git a/functions-update b/functions-update index de02b74..cb7a7e8 100644 --- a/functions-update +++ b/functions-update @@ -55,17 +55,25 @@ update_packages_init() install -v -m755 -d ${LFS_PKG_DIR} 1> ${LFS_LOG_FILE} 2>&1 || exit 1 fi - # Getting list of all patches from LFS server. - rcmd "Fetching LFS patches list" static_fetch_patches_list ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} + if [ -n "${USE_LFS_PATCHES}" ]; then + # Getting list of all patches from LFS server. + rcmd "Fetching LFS patches list" static_fetch_patches_list ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} + fi - # Getting list of all patches from BLFS server. - rcmd "Fetching BLFS patches list" static_fetch_patches_list ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST} + if [ -n "${USE_BLFS_PATCHES}" ]; then + # Getting list of all patches from BLFS server. + rcmd "Fetching BLFS patches list" static_fetch_patches_list ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST} + fi - # Getting list of all patches from CLFS server. - rcmd "Fetching CLFS patches list" static_fetch_patches_list ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST} + if [ -n "${USE_CLFS_PATCHES}" ]; then + # Getting list of all patches from CLFS server. + rcmd "Fetching CLFS patches list" static_fetch_patches_list ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST} + fi - # Getting list of all patches from hugovil.com server. - rcmd "Fetching hugovil.com patches list" static_fetch_patches_list ${HV_PATCHES_URL} ${HV_PATCHES_LIST} + if [ -n "${USE_HV_PATCHES}" ]; then + # Getting list of all patches from hugovil.com server. + rcmd "Fetching hugovil.com patches list" static_fetch_patches_list ${HV_PATCHES_URL} ${HV_PATCHES_LIST} + fi } # Get patch package if it is not in the repository @@ -196,42 +204,33 @@ static_getpkg() return 1 fi - ${WGETCMD} ${URL}/${PACK}.tar.bz2 && return 0 - - # Failure: if it was a connection timeout, don't try for other file extensions. - if grep "failed: Connection timed out" ${WGET_LOG_FILE} 1> /dev/null 2>&1; then - echo "Error, wget reported: Connection timed out" - return 1 + if [ -z "${ARCH_EXT}" ]; then + # List of default archive extensions to try + ARCH_EXT="tar.bz2 tar.gz tgz .tar.Z" fi - if detect_file_not_found; then - # If file was not found, maybe a .tar.gz file exist... - ${WGETCMD} ${URL}/${PACK}.tar.gz - if [ ${?} -eq 0 ]; then - gztobz2 ${LFS_PKG_DIR}/${PACK}.tar.gz || return 1 - return 0 - else - if detect_file_not_found; then - # If file was not found, maybe a .tgz file exist... - ${WGETCMD} ${URL}/${PACK}.tgz - if [ ${?} -eq 0 ]; then - gztobz2 ${LFS_PKG_DIR}/${PACK}.tgz || return 1 - return 0 - else - if detect_file_not_found; then - # If file was not found, maybe a .tar.Z file exist... (uw-imap...) - ${WGETCMD} ${URL}/${PACK}.tar.Z - if [ ${?} -eq 0 ]; then - gztobz2 ${LFS_PKG_DIR}/${PACK}.tar.Z || return 1 - return 0 - fi - fi - fi - fi + for arch_ext in ${ARCH_EXT}; do + ${WGETCMD} ${URL}/${PACK}.${arch_ext} + + # Failure: if it was a connection timeout, don't try for other file extensions. + if grep "failed: Connection timed out" ${WGET_LOG_FILE} 1> /dev/null 2>&1; then + echo "Error, wget reported: Connection timed out" + return 1 + fi + + if detect_file_not_found; then + # Try next archive extension if web server reported that file is not found. + continue; fi - fi - # Failure... + # If we arrive here, it means we were able to download the file. + if [ "x${arch_ext}" != "xtar.bz2" ]; then + gztobz2 ${LFS_PKG_DIR}/${PACK}.${arch_ext} + fi + return $? + done + + # Failure or file not found return 1 } @@ -272,7 +271,7 @@ fpkg_mis() # Checking for correct number of arguments if [ $# -ne 3 ]; then echo "${FUNCNAME}(), wrong number of arguments: ${*}" - return 1 + reurn 1 fi if [ ! -f ${LFS_PKG_DIR}/${TARGET}.tar.bz2 ]; then diff --git a/packages-list b/packages-list index 933a9c8..107235a 100644 --- a/packages-list +++ b/packages-list @@ -24,7 +24,7 @@ BABL="babl-0.0.22" BASH="bash-4.0" BC="bc-1.06" BISON="bison-2.4.1" -BIND="bind-9.5.0-P2" +BIND="bind-9.6.1-P3" BINUTILS="binutils-2.20" ARM_BINUTILS=${BINUTILS} AVR_BINUTILS=${BINUTILS} @@ -41,8 +41,8 @@ CLOOG_PPL="cloog-ppl-0.15.7" COREUTILS="coreutils-7.6" CPIO="cpio-2.9" CUPS="cups-1.1.23" -CURL="curl-7.15.3" -CVS_PACKAGE="cvs-1.11.18" +CURL="curl-7.19.7" +CVS="cvs-1.11.23" DBUS="dbus-1.2.16" DBUS_GLIB="dbus-glib-0.82" @@ -59,13 +59,13 @@ DOCBOOK_XML_VER_PREV="4.1.2 4.2 4.3" DOCBOOK_XML="docbook-xml-${DOCBOOK_XML_VER}" DOCBOOK_XSL_VER="1.68.1" DOCBOOK_XSL="docbook-xsl-${DOCBOOK_XSL_VER}" -DOSFSTOOLS="dosfstools-3.0.1" +DOSFSTOOLS="dosfstools-3.0.9" DVDFS="dvdfs-0.2" DVDRWTOOLS="dvd+rw-tools-7.1" E2FSPROGS="e2fsprogs-1.41.9" EASYTAG="easytag-2.1" -ED="ed-0.8" +ED="ed-1.4" EGGDBUS="eggdbus-0.5" EGLIBC="eglibc-2.10.1" EMACS="emacs-23.1" @@ -81,10 +81,10 @@ FILE_PKG="file-5.03" FINDUTILS="findutils-4.4.2" FLAC="flac-1.2.1" FLEX="flex-2.5.35" -FONTCONFIG="fontconfig-2.4.2" -FREETYPE="freetype-2.3.4" -FRIBIDI="fribidi-0.10.7" -FUSE="fuse-2.8.1" +FONTCONFIG="fontconfig-2.7.3" +FREETYPE="freetype-2.3.11" +FRIBIDI="fribidi-0.10.9" +FUSE="fuse-2.8.3" GAWK="gawk-3.1.7" GC="gc6.5" @@ -93,8 +93,8 @@ ARM_GCC_CORE=${GCC_CORE} AVR_GCC_CORE=${GCC_CORE} GDB="gdb-6.4" GDBM="gdbm-1.8.3" -GIT="git-1.5.5" -GIT_MANPAGES="git-manpages-1.5.5" +GIT="git-1.6.6.1" +GIT_MANPAGES="git-manpages-1.6.6.1" GEDA_SYMBOLS="geda-symbols-1.2.0" GEDA_GSCHEM="geda-gschem-1.2.0" GEDA_GNETLIST="geda-gnetlist-1.2.0" @@ -109,7 +109,7 @@ GNASH=" gnash-0.8.5" GIMP="gimp-2.6.6" GUTENPRINT="gutenprint-5.2.3" GLIB="glib-2.22.3" -GTK2="gtk+-2.14.7" +GTK="gtk+-2.14.7" GTK_ENGINES="gtk-engines-2.18.4" GLITZ="glitz-0.5.6" @@ -161,7 +161,7 @@ EVOLUTION="evolution-2.12.2" GTKSOURCEVIEW="gtksourceview-1.8.5" SYSTEM_TOOLS_BACKENDS="system-tools-backends-1.4.2" GNOME_AUDIO="gnome-audio-2.0.0" -GIFLIB="giflib-4.1.4" +GIFLIB="giflib-4.1.6" # GNOME2 Additional Packages - Utilities GEDIT="gedit-2.18.2" EOG="eog-2.18.2" @@ -213,13 +213,13 @@ HVCLOCK="hvclock-0.2.0" IANA="iana-etc-2.30" IMAGE_MAGICK="ImageMagick-6.5.0-8" -IMLIB="imlib-1.9.14" +IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" INETUTILS="inetutils-1.7" INKSCAPE="inkscape-r19727" INTLTOOL="intltool-0.40.6" IPROUTE2="iproute2-2.6.29-1" -IPTABLES="iptables-1.3.7" +IPTABLES="iptables-1.3.8" ISO_CODES="iso-codes-1.2" JACK="jack-audio-connection-kit-0.103.0" @@ -232,17 +232,17 @@ KERNEL="linux-2.6.32.3" KVM="kvm-84" LAME="lame-3.97" -LCMS="lcms-1.17" +LCMS="lcms-1.18a" LESS="less-436" LESSTIF="lesstif-0.95.0" LFS_BOOTSCRIPTS="lfs-bootscripts-20070813" LIBA52="a52dec-0.7.4" -LIBART="libart_lgpl-2.3.17" +LIBART="libart_lgpl-2.3.20" LIBBOOST="boost_1_35_0" LIBFFI="libffi-3.0.8" LIBDVDCSS="libdvdcss-1.2.10" LIBDVDREAD="libdvdread-0.9.7" -LIBEXIF="libexif-0.6.16" +LIBEXIF="libexif-0.6.17" LIBFAAD2="faad2-2.7" LIBFAAC="faac-1.28" LIBGAMIN="gamin-0.1.9" @@ -250,7 +250,7 @@ LIBGEDA="libgeda-1.2.0" LIBGLADE="libglade-2.6.0" LIBGSF="libgsf-1.14.5" LIBIDL="libIDL-0.8.6" -LIBPCAP="libpcap-0.9.4" +LIBPCAP="libpcap-1.0.0" LIBTOOL="libtool-2.2.6a" LIBSIGCPP="libsigc++-2.0.17" LIBOGG="libogg-1.1.4" @@ -260,17 +260,16 @@ LIBID3TAG="libid3tag-0.15.1b" LIBEXIF="libexif-0.6.16" LIBGSF="libgsf-1.14.5" LIBMAD="libmad-0.15.1b" -LIBJPEG="libjpeg-6b" -LIBPNG="libpng-1.2.35" -LIBTIFF="tiff-3.7.4" -LIBMNG="libmng-1.0.9" +LIBJPEG="libjpeg-7" +LIBOPENJPEG="libopenjpeg-1.2" +LIBPNG="libpng-1.2.39" +LIBMNG="libmng-1.0.10" LIBMUSICBRAINZ="libmusicbrainz-2.1.5" -LIBRSVG="librsvg-2.16.1" +LIBRSVG="librsvg-2.26.0" LIBSNDFILE="libsndfile-1.0.18pre18" LIBSOUP="libsoup-2.4.1" LIBXML2="libxml2-2.6.26" LIBXSLT="libxslt-1.1.12" -LIBXFT="libXft-2.1.12" LIBUSB="libusb-0.1.10a" LIBGPHOTO2="libgphoto2-2.1.99" LIBXKLAVIER="libxklavier-2.91" @@ -295,7 +294,7 @@ MILTER_SPF="smf-spf-2.0.1" MODULE_INIT_TOOLS="module-init-tools-3.11.1" MPFR="mpfr-2.4.1" MUTT="mutt-1.5.20" -MYSQL="mysql-5.0.22" +MYSQL="mysql-5.1.42" NANO="nano-2.2.1" NCURSES="ncurses-5.7" @@ -303,7 +302,7 @@ NEON="neon-0.29.1" NET_TOOLS="net-tools-1.60" NEWLIB="newlib-1.16.0" NFS_UTILS="nfs-utils-1.1.5" -NMAP="nmap-4.03" +NMAP="nmap-4.20" NSS="nss-3.12-with-nspr-4.7" OPENJADE="openjade-1.3.2" @@ -315,11 +314,11 @@ OPENSSL_ROOT_CERTS="BLFS-ca-bundle-20090409" PAM="Linux-PAM-1.1.0" PANGO="pango-1.20.5" -PARTED="parted-1.8.1" +PARTED="parted-1.9.0" PATCH_PACKAGE="patch-2.5.9" PCIUTILS="pciutils-3.1.4" PCMANFM="pcmanfm-0.5" -PCRE="pcre-7.2" +PCRE="pcre-8.00" PERL="perl-5.10.1" PERL_MOD_PDL="PDL-2.4.2" PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.94" @@ -342,7 +341,7 @@ PERL_MOD_NET_DNS="Net-DNS-0.61" PHP="php-5.2.6" PIXMAN="pixman-0.17.4" POLKIT="polkit-0.94" -POPPLER="poppler-0.12.2" +POPPLER="poppler-0.12.3" PKG_CONFIG="pkg-config-0.23" POPT="popt-1.15" PORTAUDIO="portaudio-v19_061121" @@ -352,7 +351,7 @@ PROCMAIL="procmail-3.22" PROCPS="procps-3.2.8" PSMISC="psmisc-22.9" PULSEAUDIO="pulseaudio-0.9.12" -PYTHON="Python-2.5.2" +PYTHON="Python-2.6.4" PYGOBJECT="pygobject-2.16.1" PYGTK="pygtk-2.14.1" @@ -383,7 +382,7 @@ SPLIX="splix-2.0.0" SQLITE="sqlite-3.6.22" SQUIRRELMAIL="squirrelmail-1.5.1" STARTUP_NOTIFICATION="startup-notification-0.8" -STRACE="strace-4.5.15" +STRACE="strace-4.5.19" SUBVERSION="subversion-1.6.6" SWEEP="sweep-svn-r586" SYLPHEED="sylpheed-2.7.1" @@ -396,7 +395,7 @@ T1LIB="t1lib-5.1.2" TANGO_ICON_THEME="tango-icon-theme-0.8.1" TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0" TAR_PACKAGE="tar-1.22" -TCPDUMP="tcpdump-3.9.4" +TCPDUMP="tcpdump-4.0.0" TCL="tcl8.5.7-src" TCPWRAPPERS="tcp_wrappers_7.6" TETEX_SRC="tetex-src-3.0" @@ -405,12 +404,14 @@ TETEX_TEXMFSRC="tetex-texmfsrc-3.0" TETEX_CM_SUPER="tetex-cm-super" TEXINFO="texinfo-4.13a" TFTP_HPA="tftp-hpa-0.49" -TK="tk8.4.11" +TIFF="tiff-3.8.2" +TK="tk8.5.7" TRANSMISSION="transmission-1.34" UDEV="udev-149" UDEV_CONFIG="udev-config-20090925" UML_UTILITIES="uml_utilities_20070815" +UNRAR="unrar-3.7.8" UNZIP="unzip-5.52" UPSTART="upstart-0.6.3" UTIL_LINUX_NG="util-linux-ng-2.16.1" @@ -432,5 +433,6 @@ XZ_UTILS="xz-4.999.9beta" YELP="yelp-2.28.0" -ZIP="zip-2.32" +ZIP="zip-3.0" + ZLIB="zlib-1.2.3" diff --git a/stage3/cis-cups b/stage3/cis-cups index b56b7e7..a6cba6a 100755 --- a/stage3/cis-cups +++ b/stage3/cis-cups @@ -1,4 +1,6 @@ #!/bin/sh +set -o errexit + # First argument of this script is the package name # Reading system configuration informations, functions and package versions. @@ -6,25 +8,23 @@ source ../sysinfos source ../functions source ../packages-list -CUR_DIR=$(pwd) - # Applying patches (if any) -apply_patches ${1} && +apply_patches ${1} -cd ${LFS_TMP}/${1} && +cd ${LFS_TMP}/${1} # When using Linux-PAM, some files need to be modified so CUPS # can find needed headers. sed -i -e "s@pam/pam@security/pam@g" \ - {config-scripts/cups-pam.m4,scheduler/auth.c,configure} && + {config-scripts/cups-pam.m4,scheduler/auth.c,configure} -./configure && -make && -make install && +./configure +make +make install # For a remote CUPS print server if [ -n "${CUPS_SERVER}" ]; then - cat > /etc/cups/client.conf << "EOF" && + cat > /etc/cups/client.conf << "EOF" ######################################################################## # # # This is the CUPS client configuration file. This file is used to # @@ -42,16 +42,14 @@ if [ -n "${CUPS_SERVER}" ]; then # EOF echo "ServerName ${CUPS_SERVER}" >> /etc/cups/client.conf - evaluate_retval fi # Modification to allow access from all hosts in internal LAN (192.168.0.x) -sed -i -e "s!\(Allow From 127\.0\.0\.1\)!\1\nAllow From 192\.168\.0\.0/24!g" /etc/cups/cupsd.conf && +sed -i -e "s!\(Allow From 127\.0\.0\.1\)!\1\nAllow From 192\.168\.0\.0/24!g" /etc/cups/cupsd.conf -install -v -m740 ${CUR_DIR}/bootscripts/cups /etc/rc.d/init.d && +install -v -m740 ${SCRDIR}/bootscripts/cups /etc/rc.d/init.d # script-name start stop bootscript_add_rc3 cups 40 50 -# Return last error exit $? diff --git a/stage3/cis-docbook-xsl b/stage3/cis-docbook-xsl index 0484f3f..495fadd 100755 --- a/stage3/cis-docbook-xsl +++ b/stage3/cis-docbook-xsl @@ -1,4 +1,6 @@ #!/bin/sh +set -o errexit + # First argument of this script is the package name # Reading system configuration informations, functions and package versions. @@ -7,42 +9,41 @@ source ../functions source ../packages-list # Applying patches (if any) -apply_patches ${1} && +apply_patches ${1} -cd ${LFS_TMP}/${1} && -install -d /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} && -chown -R root:root . && +cd ${LFS_TMP}/${1} +install -d /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} +chown -R root:root . cp -af INSTALL VERSION common eclipse extensions fo html htmlhelp \ images javahelp lib manpages params profiling template xhtml \ - /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} && -install -d /usr/share/doc/xml && -cp -af doc/* /usr/share/doc/xml && -cd /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} && + /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} +install -d /usr/share/doc/xml +cp -af doc/* /usr/share/doc/xml +cd /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} sh INSTALL -evaluate_retval + if [ ! -f /etc/xml/catalog ]; then - mkdir -p /etc/xml || exit 1 - xmlcatalog --noout --create /etc/xml/catalog || exit 1 + mkdir -p /etc/xml + xmlcatalog --noout --create /etc/xml/catalog fi if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create /etc/xml/docbook || exit 1 + xmlcatalog --noout --create /etc/xml/docbook fi xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog && + "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog && + "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog xmlcatalog --noout --add "delegateSystem" \ "http://docbook.sourceforge.net/release/xsl/" \ - "file:///etc/xml/docbook" /etc/xml/catalog && + "file:///etc/xml/docbook" /etc/xml/catalog xmlcatalog --noout --add "delegateURI" \ "http://docbook.sourceforge.net/release/xsl/" \ - "file:///etc/xml/docbook" /etc/xml/catalog && + "file:///etc/xml/docbook" /etc/xml/catalog var_add_str "XML_CATALOG_FILES" /etc/profile \ - "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}/catalog.xml /etc/xml/catalog" && + "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}/catalog.xml /etc/xml/catalog" var_export "XML_CATALOG_FILES" /etc/profile -# Return last error exit $? diff --git a/stage3/cis-postinstall b/stage3/cis-postinstall index 70efd79..e76a0a7 100755 --- a/stage3/cis-postinstall +++ b/stage3/cis-postinstall @@ -1,4 +1,6 @@ #!/bin/sh +set -o errexit + # First argument of this script is the package name. # Reading system configuration informations, functions and package versions. @@ -27,7 +29,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then if [ "${SET_MYSQL_ROOT_PASS}" = "y" ]; then # Further configuration requires that the MySQL server be running: mysqld_safe --user=mysql 2>&1 >/dev/null & - evaluate_retval PASS_MATCH="no" @@ -44,12 +45,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then fi done - mysqladmin -u root password ${PASS1} || exit 1 + mysqladmin -u root password ${PASS1} echo "MySQL root password set." echo "Shutting down MySQL server:" # Configuration of the server is now finished. Shuting down the server. - mysqladmin -p shutdown || exit 1 + mysqladmin -p shutdown fi ######################################### @@ -70,7 +71,7 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then done if [ "${USE_SSL}" = "y" ]; then - /etc/apache/generate-ssl-certs || exit 1 + /etc/apache/generate-ssl-certs fi ######################################### @@ -91,10 +92,9 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then done if [ "${USE_SSL}" = "y" ]; then - /etc/mail/imap-ssl-certs || exit 1 + /etc/mail/imap-ssl-certs fi fi -# Return last error exit $? diff --git a/stage3/cis-samba b/stage3/cis-samba index 8c2a423..70dd737 100755 --- a/stage3/cis-samba +++ b/stage3/cis-samba @@ -1,4 +1,6 @@ #!/bin/sh +set -o errexit + # First argument of this script is the package name # Reading system configuration informations, functions and package versions. @@ -9,52 +11,50 @@ source ../packages-list CUR_DIR=$(pwd) # Applying patches (if any) -apply_patches ${1} && +apply_patches ${1} -install -d /var/cache/samba && +install -d /var/cache/samba -cd ${LFS_TMP}/${1}/source && +cd ${LFS_TMP}/${1}/source ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-piddir=/var/run \ --with-fhs \ - --with-smbmount && -make && -make install && -mv /usr/lib/samba/libsmbclient.so /usr/lib && -ln -sf ../libsmbclient.so /usr/lib/samba && + --with-smbmount +make +make install +mv /usr/lib/samba/libsmbclient.so /usr/lib +ln -sf ../libsmbclient.so /usr/lib/samba -mkdir -p /var/log/samba && +mkdir -p /var/log/samba # libsmbclient.a doesn't seem to be installed... -#chmod 644 /usr/include/libsmbclient.h /usr/lib/samba/libsmbclient.a && -chmod 644 /usr/include/libsmbclient.h && +#chmod 644 /usr/include/libsmbclient.h /usr/lib/samba/libsmbclient.a +chmod 644 /usr/include/libsmbclient.h -install -m755 nsswitch/libnss_win{s,bind}.so /lib && -ln -sf libnss_winbind.so /lib/libnss_winbind.so.2 && -ln -sf libnss_wins.so /lib/libnss_wins.so.2 && -cp ../examples/smb.conf.default /etc/samba && +install -m755 nsswitch/libnss_win{s,bind}.so /lib +ln -sf libnss_winbind.so /lib/libnss_winbind.so.2 +ln -sf libnss_wins.so /lib/libnss_wins.so.2 +cp ../examples/smb.conf.default /etc/samba install -m644 ../docs/*.pdf /usr/share/samba -evaluate_retval if [ -f nsswitch/pam_winbind.so ]; then - install -m755 nsswitch/pam_winbind.so /lib/security || exit 1 + install -m755 nsswitch/pam_winbind.so /lib/security fi -ldconfig && +ldconfig # Configuring SWAT -string_add "swat 901/tcp" /etc/services && -string_add "swat_tunnel 902/tcp" /etc/services && -string_add "swat stream tcp nowait.400 root /usr/sbin/swat swat" /etc/inetd.conf && +string_add "swat 901/tcp" /etc/services +string_add "swat_tunnel 902/tcp" /etc/services +string_add "swat stream tcp nowait.400 root /usr/sbin/swat swat" /etc/inetd.conf # Bootscript -install -v -m740 ${CUR_DIR}/bootscripts/samba /etc/rc.d/init.d && +install -v -m740 ${CUR_DIR}/bootscripts/samba /etc/rc.d/init.d # script-name start stop bootscript_add_rc3 samba 85 10 -# Return last error exit $? diff --git a/stage3/cis-sane-backends b/stage3/cis-sane-backends index 9f1b355..c1b8887 100755 --- a/stage3/cis-sane-backends +++ b/stage3/cis-sane-backends @@ -1,4 +1,6 @@ #!/bin/sh +set -o errexit + # First argument of this script is the package name # Reading system configuration informations, functions and package versions. @@ -7,7 +9,7 @@ source ../functions source ../packages-list # Applying patches (if any) -apply_patches ${1} && +apply_patches ${1} if [ x${INST_TYPE} = "xworkstation" ]; then USE_X_OPTION="yes" @@ -15,59 +17,57 @@ else USE_X_OPTION="no" fi -hv_groupadd saned && -hv_useradd -c saned -d /dev/null -g saned -s /bin/false saned && +hv_groupadd saned +hv_useradd -c saned -d /dev/null -g saned -s /bin/false saned # Problem with build directory -cd ${LFS_TMP}/${1} && +cd ${LFS_TMP}/${1} ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --with-x=${USE_X_OPTION} && + --with-x=${USE_X_OPTION} # If the 'SANE_DRIVER' variable is defined in the 'sysinfos' file, then # we build that driver and the 'net' driver only. Otherwise, only the 'net' # driver is built. We do so by modifying the 'PRELOADABLE_BACKENDS' variable # in 'backend/Makefile'. -cp backend/Makefile backend/Makefile.bak && +cp backend/Makefile backend/Makefile.bak cat backend/Makefile.bak \ | sed "s/\(PRELOADABLE_BACKENDS =\).*/\1 ${SANE_DRIVER} net/" \ - > backend/Makefile && + > backend/Makefile # Removing the program umax_pp, since it depends on some umax driver. -cp tools/Makefile tools/Makefile.bak && +cp tools/Makefile tools/Makefile.bak cat tools/Makefile.bak \ - | sed "s/\(DESTINATIONS =.*\)umax_pp\(.*\)/\1\2/" > tools/Makefile && + | sed "s/\(DESTINATIONS =.*\)umax_pp\(.*\)/\1\2/" > tools/Makefile -make && -make install && -ldconfig && +make +make install +ldconfig # Addition to /etc/services (for both the client and server) string_add "sane 6566/tcp saned # SANE Network Scanner Daemon" \ - /etc/services && + /etc/services # Creating '/etc/sane.d/dll.conf' and adding entry 'net' echo "net" > /etc/sane.d/dll.conf -evaluate_retval if [ -z "${SANE_SERVER}" ]; then # If 'SANE_SERVER' is not defined, then we automatically configure for # the SANE Network Daemon. # Adding entry to '/etc/sane.d/dll.conf' - echo "${SANE_DRIVER}" >> /etc/sane.d/dll.conf || exit 1 + echo "${SANE_DRIVER}" >> /etc/sane.d/dll.conf # Creating '/etc/sane.d/saned.conf' - echo "${LAN_NETWORK_MASK}" > /etc/sane.d/saned.conf || exit 1 + echo "${LAN_NETWORK_MASK}" > /etc/sane.d/saned.conf # Addition to /etc/inetd.conf string_add "sane stream tcp nowait saned /usr/sbin/tcpd saned" \ - /etc/inetd.conf || exit 1 + /etc/inetd.conf else # If 'SANE_SERVER' is defined, then we must specify the address of the # remote SANE server to use. - echo "${SANE_SERVER}" > /etc/sane.d/net.conf || exit 1 + echo "${SANE_SERVER}" > /etc/sane.d/net.conf fi -# Return last error exit $? diff --git a/stage3/cis-sendmail b/stage3/cis-sendmail index ed770c2..e4089e4 100755 --- a/stage3/cis-sendmail +++ b/stage3/cis-sendmail @@ -1,4 +1,6 @@ #!/bin/sh +set -o errexit + # First argument of this script is the package name # Reading system configuration informations, functions and package versions. @@ -9,16 +11,16 @@ source ../packages-list CUR_DIR=$(pwd) # Applying patches (if any) -apply_patches ${1} && +apply_patches ${1} -hv_groupadd smmsp && -hv_groupadd mail && -hv_useradd -g smmsp -G mail smmsp && -chmod 1777 /var/mail && -mkdir -p /var/spool/mqueue && -mkdir -p /etc/mail && +hv_groupadd smmsp +hv_groupadd mail +hv_useradd -g smmsp -G mail smmsp +chmod 1777 /var/mail +mkdir -p /var/spool/mqueue +mkdir -p /etc/mail -cd ${LFS_TMP}/${1} && +cd ${LFS_TMP}/${1} cat > devtools/Site/site.config.m4 << "EOF" define(`confMANGRP',`root') define(`confMANOWN',`root') @@ -26,11 +28,10 @@ define(`confSBINGRP',`root') define(`confUBINGRP',`root') define(`confUBINOWN',`root') EOF -evaluate_retval if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then # Adding support for SASL2 and MILTER - cat >> devtools/Site/site.config.m4 << "EOF" && + cat >> devtools/Site/site.config.m4 << "EOF" APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL=2') APPENDDEF(`conf_sendmail_LIBS', `-lsasl2') APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER') @@ -40,25 +41,22 @@ EOF echo "pwcheck_method: saslauthd" /usr/lib/sasl2/Sendmail.conf || exit 1 fi -cd sendmail && -sh Build && +cd sendmail +sh Build cd ../ -evaluate_retval if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - cd libmilter && - sh Build install && + cd libmilter + sh Build install cd ../ - evaluate_retval fi -cd cf/cf && -cp generic-linux.mc sendmail.mc && -sh Build sendmail.mc && -sh Build install-cf && -cd ../../ && +cd cf/cf +cp generic-linux.mc sendmail.mc +sh Build sendmail.mc +sh Build install-cf +cd ../../ sh Build install -evaluate_retval if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then # Configuration Information @@ -126,15 +124,14 @@ dnl INPUT_MAIL_FILTER(`greylist',`S=local:/var/run/milter-greylist/milter-greyli MAILER(smtp) EOF - sed -i -e "s!_HOSTNAME_!${MACHINE_NAME}\.${DOMAIN}!g" /etc/mail/sendmail.mc && + sed -i -e "s!_HOSTNAME_!${MACHINE_NAME}\.${DOMAIN}!g" /etc/mail/sendmail.mc sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /etc/mail/sendmail.mc - evaluate_retval if [ -n "${SENDMAIL_INCOMING_PORT}" ]; then # Uncommenting the alternate port line - sed -i -e "s!\(dnl \)\(.*_ALTERNATE_PORT_NUMBER_.*\)!\2!g" /etc/mail/sendmail.mc || exit 1 + sed -i -e "s!\(dnl \)\(.*_ALTERNATE_PORT_NUMBER_.*\)!\2!g" /etc/mail/sendmail.mc # Replacing the port number - sed -i -e "s!_ALTERNATE_PORT_NUMBER_!${SENDMAIL_INCOMING_PORT}!g" /etc/mail/sendmail.mc || exit 1 + sed -i -e "s!_ALTERNATE_PORT_NUMBER_!${SENDMAIL_INCOMING_PORT}!g" /etc/mail/sendmail.mc fi # We must put the domain name, and not the hostname in local-host-names @@ -156,41 +153,41 @@ EOF Connect:192.168.0 RELAY EOF - cd /etc/mail && - cp -R ${LFS_TMP}/${1}/cf/* . && + cd /etc/mail + cp -R ${LFS_TMP}/${1}/cf/* . cat > /etc/mail/submit.mc << "EOF" dnl include(`./m4/cf.m4')dnl dnl EOF - cat ${LFS_TMP}/${1}/cf/cf/submit.mc >> /etc/mail/submit.mc && - sed -i "s!\(^FEATURE.*\)127.0.0.1\(.*\)!\1${MACHINE_NAME}\.${DOMAIN}\2!" /etc/mail/submit.mc && - newaliases -v && + cat ${LFS_TMP}/${1}/cf/cf/submit.mc >> /etc/mail/submit.mc + sed -i "s!\(^FEATURE.*\)127.0.0.1\(.*\)!\1${MACHINE_NAME}\.${DOMAIN}\2!" /etc/mail/submit.mc + newaliases -v - cat > /etc/mail/virtusertable << "EOF" && + cat > /etc/mail/virtusertable << "EOF" # MAKE SURE ALL ENTRIES ARE SEPARATED WITH # EOF if [ -n "${SENDMAIL_ALT_MAILER}" ]; then - echo ". ${SENDMAIL_ALT_MAILER}" > /etc/mail/mailertable || exit 1 + echo ". ${SENDMAIL_ALT_MAILER}" > /etc/mail/mailertable else - echo "# Define alternate mailer in this file" > /etc/mail/mailertable || exit 1 + echo "# Define alternate mailer in this file" > /etc/mail/mailertable fi - cat > /etc/mail/configure << "EOF" && + cat > /etc/mail/configure << "EOF" #!/bin/sh PID_FILE="/var/run/sendmail.pid" -cd /etc/mail && +cd /etc/mail -m4 sendmail.mc > sendmail.cf && -m4 submit.mc > submit.cf && -newaliases && -makemap hash access.db < access && -makemap hash virtusertable < virtusertable && +m4 sendmail.mc > sendmail.cf +m4 submit.mc > submit.cf +newaliases +makemap hash access.db < access +makemap hash virtusertable < virtusertable makemap hash mailertable.db < mailertable || exit 1 # Restarting sendmail @@ -202,15 +199,15 @@ fi exit $? EOF - chmod 740 /etc/mail/configure && + chmod 740 /etc/mail/configure # Bootscript - install -v -m740 ${CUR_DIR}/bootscripts/sendmail /etc/rc.d/init.d && + install -v -m740 ${CUR_DIR}/bootscripts/sendmail /etc/rc.d/init.d # script-name start stop - bootscript_add_rc3 sendmail 65 25 && + bootscript_add_rc3 sendmail 65 25 - cat > /usr/local/bin/mail-if-fail << "EOF" && + cat > /usr/local/bin/mail-if-fail << "EOF" #!/bin/sh # This script is used to run a command. If the command failed, @@ -247,15 +244,14 @@ rm -f ${LOGFILE} exit ${ERROR_CODE} EOF - sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /usr/local/bin/mail-if-fail && - chmod 755 /usr/local/bin/mail-if-fail && + sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /usr/local/bin/mail-if-fail + chmod 755 /usr/local/bin/mail-if-fail - cp ${CUR_DIR}/resources/mail-files.sh /usr/local/bin && - chmod 755 /usr/local/bin/mail-files.sh && + cp ${CUR_DIR}/resources/mail-files.sh /usr/local/bin + chmod 755 /usr/local/bin/mail-files.sh # Executing configure script. /etc/mail/configure fi -# Return last error exit $? diff --git a/stage3/cis-tetex b/stage3/cis-tetex index 79362ea..d52df49 100755 --- a/stage3/cis-tetex +++ b/stage3/cis-tetex @@ -26,6 +26,9 @@ cd ${LFS_TMP}/${1}-build && --without-texinfo \ --with-system-ncurses \ --with-system-zlib \ + --with-system-t1lib \ + --with-system-pnglib \ + --with-system-gd \ --disable-a4 && make all && make install && diff --git a/stage3/cis-unrar b/stage3/cis-unrar new file mode 100755 index 0000000..6c007e3 --- /dev/null +++ b/stage3/cis-unrar @@ -0,0 +1,23 @@ +#!/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} +make -f makefile.unix +install -v -m755 unrar /usr/bin + +exit $? diff --git a/stage3/packages-update b/stage3/packages-update index 892b6a2..f89e0be 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -6,51 +6,73 @@ USE_BLFS_PATCHES=1 USE_HV_PATCHES=1 # Reading system configuration informations, functions and package versions. +source ../sysinfos source ../functions source ../functions-update source ../packages-list +# Execute a return statement instead of exit, to be able to continue with +# downloading other packages +export RCMD_NO_EXIT=1 + update_packages_init -# Begin +# These packages were already downloaded for stage2: +lpkg 2 ${INETUTILS} +lpkg 2 ${EMACS} +# These packages are only for stage3 +fpkg_sf ${PCRE} +fpkg_sf ${STRACE} fpkg_sf ${DDCLIENT} -lpkg 2 ${INETUTILS} fpkg ${LIBPCAP} "http://www.tcpdump.org/release" fpkg ${TCPDUMP} "http://www.tcpdump.org/release" fpkg ${NMAP} "http://download.insecure.org/nmap/dist" -fpkg_hv ${BIND} +ARCH_EXT=tar.gz fpkg ${BIND} "http://gd.tuwien.ac.at/infosys/servers/isc/bind9/$(get_pkg_ver ${BIND})" fpkg ${IPTABLES} "http://www.netfilter.org/projects/iptables/files" -fpkg ${MYSQL} "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-5.0" - - -fpkg_mis ${UNZIP} "unzip552" "ftp://ftp.info-zip.org/pub/infozip/src" -fpkg_mis ${ZIP} "zip232" "ftp://ftp.info-zip.org/pub/infozip/src" +fpkg ${MYSQL} "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-$(get_pkg_ver_base ${MYSQL})" +fpkg_mis ${ZIP} "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')" ${SOURCEFORGE_URL}/infozip +fpkg_mis ${UNZIP} "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" ${SOURCEFORGE_URL}/infozip +fpkg_mis ${UNRAR} "unrarsrc-$(get_pkg_ver ${UNRAR})" "http://www.rarlab.com/rar" fpkg_gnu ${CPIO} -fpkg ${CVS_PACKAGE} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS_PACKAGE})" fpkg_gnu ${PARTED} -fpkg_hv ${LIBJPEG} +fpkg ${CURL} "http://curl.haxx.se/download" +fpkg ${RSYNC} "http://samba.org/ftp/rsync/src" +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 ${GIT} "http://www.kernel.org/pub/software/scm/git" +fpkg ${GIT_MANPAGES} "http://www.kernel.org/pub/software/scm/git" +fpkg_mis ${LIBJPEG} "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" "http://www.ijg.org/files" +fpkg_mis ${LIBOPENJPEG} "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" "http://www.openjpeg.org" fpkg_sf ${LIBPNG} -fpkg_mis ${LIBTIFF} "tiff-$(get_pkg_ver ${LIBTIFF})" "ftp://ftp.remotesensing.org/pub/libtiff/old" -fpkg_sf ${GIFLIB} "libungif" -fpkg ${LCMS} "http://www.littlecms.com" -fpkg_sf ${LIBMNG} -fpkg_sf ${LIBEXIF} fpkg_gnome ${LIBART} +fpkg_sf ${LIBEXIF} fpkg ${FRIBIDI} "http://fribidi.org/download" - fpkg_sf ${FREETYPE} fpkg ${FONTCONFIG} "http://fontconfig.org/release" + +###fpkg_hv ${XFREE86} + fpkg ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" -fpkg_hv ${XFREE86} -fpkg ${LIBXFT} "http://xorg.freedesktop.org/releases/individual/lib" +fpkg_mis ${TK} "${TK}-src" ${SOURCEFORGE_URL}/tcl -fpkg ${WINDOWMAKER} "ftp://windowmaker.org/pub/source/release" -fpkg ${WINDOWMAKER_EXTRA} "ftp://windowmaker.org/pub/source/release" +fpkg ${TIFF} "http://libtiff.maptools.org/dl" +fpkg_sf ${GIFLIB} +fpkg ${LCMS} "http://www.littlecms.com" +fpkg_sf ${LIBMNG} + +fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release" +fpkg ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release" fpkg_sf ${LESSTIF} -lpkg 2 ${EMACS} -fpkg_mis ${TK} "${TK}-src" ${SOURCEFORGE_URL}/tcl +exit 1 + + + + fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})" fpkg ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES" @@ -121,7 +143,6 @@ fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver_base ${GIMP})" fpkg_sf ${GUTENPRINT} fpkg_hv ${INKSCAPE} -fpkg_gnu ${BC} fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord" fpkg ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools" @@ -137,7 +158,7 @@ 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_gnu ${ED} + 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" @@ -244,7 +265,7 @@ fpkg ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap" fpkg ${HTTPD} "http://www.apache.org/dist/httpd" -fpkg ${CURL} "http://curl.haxx.se/download" + fpkg_sf ${MAILMAN} @@ -252,11 +273,8 @@ fpkg ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions" fpkg ${PHP} "http://us2.php.net/distributions" -fpkg_sf ${STRACE} lpkg 2 ${SUBVERSION} fpkg_gnu ${INDENT} -fpkg ${GIT} "http://www.kernel.org/pub/software/scm/git" -fpkg_hv ${GIT_MANPAGES} fpkg ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils" fpkg ${TFTP_HPA} "http://www.kernel.org/pub/software/network/tftp" @@ -280,10 +298,8 @@ fpkg_gnu ${HELP2MAN} fpkg ${LIBDVDCSS} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" fpkg ${LIBDVDREAD} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" -fpkg_sf ${FUSE} fpkg ${DVDFS} "http://jspenguin.org:81/dvdfs" -fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools" fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi" @@ -293,6 +309,6 @@ fpkg ${POLKIT} "http://hal.freedesktop.org/releases" fpkg ${GNUPG} "ftp://ftp.gnupg.org/gcrypt/gnupg" -fpkg ${RSYNC} "http://samba.org/ftp/rsync/src" + exit $? diff --git a/stage3/stage3-install b/stage3/stage3-install index ada115a..73083fa 100755 --- a/stage3/stage3-install +++ b/stage3/stage3-install @@ -1,7 +1,9 @@ #!/bin/sh -export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage3" -export LFS_LOG_DIR=/var/log/hvlinux-install/stage3 +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 @@ -18,62 +20,72 @@ fi init_log_file -# For updating dynamic DNS entries. -if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then - ipkg_cust ${DDCLIENT} cis-ddclient -fi +ipkg_ac ${PCRE} \ + --docdir=/usr/share/doc/pcre \ + --enable-utf8 \ + --enable-unicode-properties \ + --enable-pcregrep-libz \ + --enable-pcregrep-libbz2 +ipkg_ac ${STRACE} # Networking ipkg_cust ${INETUTILS} cis-inetutils - -# Network/debugging tools +if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then + # For updating dynamic DNS entries. + ipkg_cust ${DDCLIENT} cis-ddclient +fi ipkg_ac ${LIBPCAP} "--enable-yydebug" ipkg_ac ${TCPDUMP} ipkg_ac_nb ${NMAP} -ipkg_ac ${STRACE} - -# Bind server -ipkg_cust ${BIND} cis-bind +ipkg_cust ${BIND} cis-bind +ipkg_cust ${IPTABLES} cis-iptables if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg_cust ${IPTABLES} cis-iptables ipkg_cust ${MYSQL} cis-mysql fi -ipkg_cust ${UNZIP} cis-unzip ipkg_cust ${ZIP} cis-zip +ipkg_cust ${UNZIP} cis-unzip +ipkg_cust ${UNRAR} cis-unrar ipkg_ac ${CPIO} - -# Installing only CVS client. -ipkg_ac ${CVS_PACKAGE} "--disable-server" - ipkg_ac ${PARTED} - +ipkg_ac ${CURL} ipkg_ac ${RSYNC} +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_ac_nb ${GIT} +ipkg_cust ${GIT_MANPAGES} cis-git-manpages -# Graphic libraries +# Graphic libraries without X-Window dependencies ipkg_ac ${LIBJPEG} "--enable-static --enable-shared" +ipkg_cust ${LIBOPENJPEG} ipkg_ac ${LIBPNG} -ipkg_ac ${LIBTIFF} -ipkg_ac ${GIFLIB} -ipkg_ac_nb ${LCMS} -ipkg_cust ${LIBMNG} cis-libmng -ipkg_ac ${LIBEXIF} ipkg_ac ${LIBART} +ipkg_ac ${LIBEXIF} ipkg_ac ${FRIBIDI} -# X +# X-Window if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg_ac ${FREETYPE} ipkg_cust ${FONTCONFIG} cis-fontconfig - ipkg_cust ${T1LIB} cis-t1lib ipkg_cust ${XFREE86} cis-xfree86 source /etc/profile - # Some packages (Gnome control center) require a more - # recent version of libxft than the one installed by XFree86. - ipkg_ac ${LIBXFT} "--prefix=/usr/X11R6" + ipkg_cust ${T1LIB} cis-t1lib + ipkg_cust ${TK} cis-tk +fi + +# Graphic libraries with optional X-Window dependencies +ipkg_ac ${LIBTIFF} +ipkg_ac ${GIFLIB} +ipkg_ac_nb ${LCMS} +ipkg_cust ${LIBMNG} cis-libmng +if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg_cust ${WINDOWMAKER} cis-windowmaker ipkg_ac ${WINDOWMAKER_EXTRA} @@ -83,11 +95,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_cust ${EMACS} cis-emacs fi -ipkg_cust ${TK} cis-tk - -ipkg_ac ${PYTHON} "--enable-shared" - -ipkg_cust${LIBBOOST} cis-boost +ipkg_ac ${PYTHON} "--enable-shared" +ipkg_cust ${LIBBOOST} cis-boost if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then # DocBook @@ -140,11 +149,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${CAIRO} "--enable-glitz" ipkg_ac ${PANGO} ipkg_ac ${ATK} - ipkg_ac ${GTK2} "--without-libjasper" + ipkg_ac ${GTK} "--without-libjasper" ipkg_ac ${GTK_ENGINES} ipkg_ac ${PYGOBJECT} ipkg_ac ${PYGTK} - ipkg_ac ${LIBSIGCPP} ipkg_ac ${GC} ipkg_ac ${GLIBMM} @@ -166,6 +174,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${LIBIDL} fi +ipkg_ac ${HELP2MAN} ipkg_ac ${INTLTOOL} ipkg_ac ${GSL} ipkg_cust ${CUPS} cis-cups @@ -185,12 +194,13 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\"" fi -ipkg_ac ${BC} "--with-readline" ipkg_cust ${CDRTOOLS} cis-cdrtools ipkg_cust ${DVDRWTOOLS} cis-dvd-rw-tools +ipkg_ac ${LIBDVDCSS} +ipkg_ac ${LIBDVDREAD} "--with-libdvdcss" +ipkg_cust ${DVDFS} cis-dvdfs if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg_ac ${ED} ipkg_cust ${TETEX_SRC} cis-tetex ipkg_cust ${JADETEX} cis-jadetex fi @@ -300,7 +310,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then # Apache ipkg_cust ${HTTPD} cis-apache - ipkg_ac ${CURL} ipkg_cust ${PHP} cis-php ipkg_cust ${SQUIRRELMAIL} cis-squirrelmail @@ -313,9 +322,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg_ac ${INDENT} fi - ipkg_ac_nb ${GIT} - ipkg_cust ${GIT_MANPAGES} cis-git-manpages - if [ "x${USE_SAMBA}" = "xyes" ]; then ipkg_cust ${SAMBA} cis-samba fi @@ -336,23 +342,12 @@ ipkg_cust ${CKERMIT} cis-ckermit # BitTorrent client ipkg_ac ${TRANSMISSION} "--disable-daemon" -# For bitbake -ipkg_ac ${HELP2MAN} - -ipkg_ac ${LIBDVDCSS} -ipkg_ac ${LIBDVDREAD} "--with-libdvdcss" -INIT_D_PATH=/etc/rc.d/init.d \ - ipkg_ac_nb ${FUSE} -ipkg_cust ${DVDFS} cis-dvdfs - -ipkg_cust ${DOSFSTOOLS} cis-dosfstools - ipkg_ac ${LIBFFI} ipkg_ac ${GOBJECT_INSTROSPECTION} ipkg_cust ${POLKIT} cis-polkit ipkg_ac ${GNUPG} "--libexecdir=/usr/lib" -./cis-postinstall +rscr mult "Performing post-install" cis-post-install exit $? diff --git a/stage4/packages-update b/stage4/packages-update index 3e70466..203366d 100644 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -92,7 +92,6 @@ fpkg ${GNOME_MOUNT} "http://people.freedesktop.org/~david/dist" fpkg_gnome ${RHYTHMBOX} fpkg_gnome ${LIBGSF} -fpkg ${PCRE} "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre" # Needed by goffice fpkg_gnome ${GOFFICE} fpkg_gnome ${GNUMERIC} fpkg_sf ${WV} diff --git a/stage4/stage4-install b/stage4/stage4-install index 1afc07e..c19b315 100755 --- a/stage4/stage4-install +++ b/stage4/stage4-install @@ -105,7 +105,6 @@ ipkg_cust ${GNOME_MOUNT} cis-gnome-nobuild ipkg_ac ${RHYTHMBOX} "--disable-python" ipkg_ac ${LIBGSF} -ipkg_ac ${PCRE} "--docdir=/usr/share/doc/pcre --enable-utf8" ipkg_ac_nb ${GOFFICE} ipkg_cust ${GNUMERIC} cis-gnumeric ipkg_ac ${WV} diff --git a/sysinfos b/sysinfos index dd902db..82fcf3d 100644 --- a/sysinfos +++ b/sysinfos @@ -15,7 +15,7 @@ INST_TYPE="server" REGUSER="hugo" # Destination path where to install new Linux-HV system -LFS="/mnt/hvlinux-x86" +LFS="/" # Destination partition where to install new Linux-HV system LFS_PARTITION="/dev/sda8" -- 2.20.1