From b51ceee0b72987ab3a9533c6560dd538b6332476 Mon Sep 17 00:00:00 2001 From: hugo Date: Tue, 13 Apr 2010 04:34:54 +0000 Subject: [PATCH] xsane ok --- dependencies | 5 +- functions | 82 +++++++++++++++----- functions-update | 2 +- packages-list | 8 +- {stage3 => stage5}/bootscripts/cups | 0 stage3/cis-dvdfs => stage5/cis-boost | 11 +-- {stage3 => stage5}/cis-cdrtools | 0 {stage3 => stage5}/cis-cups | 22 +++--- stage3/cis-splix => stage5/cis-cups-pdf | 14 ++-- {stage3 => stage5}/cis-dvd-rw-tools | 0 {stage3 => stage5}/cis-dvdfs | 0 stage5/cis-ghostscript | 52 ++++++++----- {stage3 => stage5}/cis-jadetex | 3 +- {stage3 => stage5}/cis-sane-backends | 22 ++---- {stage3 => stage5}/cis-splix | 2 + {stage3 => stage5}/cis-tetex | 0 {stage3 => stage5}/cis-xsane | 0 stage5/packages-update | 36 ++++----- {stage3 => stage5}/resources/mount.fusedvdfs | 0 stage5/stage5-install | 33 ++++---- stage6/stage6-install | 2 + sysinfos | 14 +++- 22 files changed, 180 insertions(+), 128 deletions(-) rename {stage3 => stage5}/bootscripts/cups (100%) copy stage3/cis-dvdfs => stage5/cis-boost (76%) rename {stage3 => stage5}/cis-cdrtools (100%) rename {stage3 => stage5}/cis-cups (75%) copy stage3/cis-splix => stage5/cis-cups-pdf (68%) rename {stage3 => stage5}/cis-dvd-rw-tools (100%) rename {stage3 => stage5}/cis-dvdfs (100%) rename {stage3 => stage5}/cis-jadetex (98%) rename {stage3 => stage5}/cis-sane-backends (68%) rename {stage3 => stage5}/cis-splix (95%) rename {stage3 => stage5}/cis-tetex (100%) rename {stage3 => stage5}/cis-xsane (100%) rename {stage3 => stage5}/resources/mount.fusedvdfs (100%) diff --git a/dependencies b/dependencies index a905320..b207109 100644 --- a/dependencies +++ b/dependencies @@ -1,7 +1,8 @@ #!/bin/sh ${INTLTOOL}: ${PERL_MOD_XML_PARSER} -${INKSCAPE}: ${BOOST} ${INTLTOOL} +${GTKMM}: ${PANGOMM} +${INKSCAPE}: ${POPPLER} ${BOOST} ${INTLTOOL} ${GTKMM} ${TETEX_SRC}: ${ED} ${PHP}: ${CURL} @@ -35,7 +36,7 @@ ${JASPER}: ${LIBJPEG} ${XORG} ${MESALIB} ${GHOSTSCRIPT}: ${LIBJPEG} ${LIBPNG} ${JASPER} ${GTK} ${XORG} ${POPPLER}: ${FONTCONFIG} ${LIBJPEG} ${CAIRO} ${GLIB} ${LIBOPENJPEG} -${EVINCE}: ${POPPLER} ${LIBGNOMEUI} ${GNOME_ICON_THEME} ${GNOME_DOC_UTILS} ${TETEX_SRC} ${GHOSTSCRIPT} ${T1LIB} +${EVINCE}: ${POPPLER} ${LIBGNOMEUI} ${GNOME_ICON_THEME} ${GNOME_DOC_UTILS} ${TETEX_SRC} ${GHOSTSCRIPT} ${T1LIB} ${LIBSPECTRE} ${DBUS}: ${EXPAT} ${LIBXML2} ${XORG_LIBS} ${GLIB}: ${PCRE} diff --git a/functions b/functions index 79a57e1..1107738 100644 --- a/functions +++ b/functions @@ -530,11 +530,34 @@ static_decompressed_dirname() { local PACKAGE=${1} - # Remove optional "./" leading component with sed - # and extract base directory name with awk. - local DIRNAME=$(tar ${TAR_OPTS} -tf ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 | head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}') + # List of default archive extensions to try + local MY_ARCH_EXT="tar.bz2 tar.gz tgz tar.Z zip" - echo ${DIRNAME} + for arch_ext in ${MY_ARCH_EXT}; do + if [ ! -f ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} ]; then + # Try next archive extension. + continue; + fi + + case ${arch_ext} in + tar.bz2|tar.gz|tgz|tar.Z) + # Remove optional "./" leading component with sed + # and extract base directory name with awk. + local DIRNAME=$(tar ${TAR_OPTS} -tf ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 | head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}') + echo ${DIRNAME} + ;; + zip) + # TODO + echo ${PACKAGE} + ;; + esac + + return $? + done + + # Failure or file not found + echo "${FUNCNAME}(): Missing source package for \"${PACKAGE}\"" > /dev/stderr + return ${EXIT_FAILURE} } # Applying patch @@ -614,21 +637,44 @@ decompress_package() local PACKAGE=${1} - if [ ! -f ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 ]; then - echo "${FUNCNAME}(): Missing source package: \"${PACKAGE}.tar.bz2\"" > /dev/stderr - return ${EXIT_FAILURE} - fi - - if [ -d ${TOPDIR}/${PACKAGE} ]; then - # Removing old source directory (if any) - rm -v -rf ${TOPDIR}/${PACKAGE} || exit 1 - fi + # List of default archive extensions to try + local MY_ARCH_EXT="tar.bz2 tar.gz tgz tar.Z zip" + + for arch_ext in ${MY_ARCH_EXT}; do + if [ ! -f ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} ]; then + # Try next archive extension. + continue; + fi + + if [ -d ${TOPDIR}/${PACKAGE} ]; then + # Removing old source directory (if any) + rm -v -rf ${TOPDIR}/${PACKAGE} || exit 1 + fi + + cd ${TOPDIR} + + # Decompressing package + case ${arch_ext} in + tar.bz2) + tar ${TAR_OPTS} -jxvf ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} || return 1 + ;; + tar.gz|tgz|tar.Z) + tar ${TAR_OPTS} -zxvf ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} || return 1 + ;; + zip) + echo ZIPZIPZIP + unzip ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} || return 1 + ;; + esac + + cd - 1> /dev/null 2>&1 + + return $? + done - # Decompressing package - # Option 'U' of tar is to remove each file prior to extracting over it - cd ${TOPDIR} && - tar ${TAR_OPTS} -jxvf ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 && - cd - 1> /dev/null 2>&1 + # Failure or file not found + echo "${FUNCNAME}(): Missing source package for \"${PACKAGE}\"" > /dev/stderr + return ${EXIT_FAILURE} } # Installation of a package diff --git a/functions-update b/functions-update index 33d9cf4..93ddb15 100644 --- a/functions-update +++ b/functions-update @@ -229,7 +229,7 @@ static_getpkg() # so we can safely remove any file prior to trying to download it. rm -f ${LFS_PKG_DIR}/${PACK}.${arch_ext} - echo "Tryng to fetch ${PACK}.${arch_ext}" + echo "Trying to fetch ${PACK}.${arch_ext}" ${WGETCMD} ${URL}/${PACK}.${arch_ext} wget_status=$? diff --git a/packages-list b/packages-list index 063b485..53ae236 100644 --- a/packages-list +++ b/packages-list @@ -42,6 +42,7 @@ CONSOLEKIT="ConsoleKit-0.4.1" COREUTILS="coreutils-7.6" CPIO="cpio-2.9" CUPS="cups-1.4.2" +CUPS_PDF="cups-pdf-2.5.0" CURL="curl-7.19.7" CVS="cvs-1.11.23" @@ -103,7 +104,7 @@ GEDA_GATTRIB="geda-gattrib-1.2.0" GEGL="gegl-0.1.2" GETDATE="getdate_rfc868-1.2" GETTEXT="gettext-0.17" -GHOSTSCRIPT="ghostscript-8.70" +GHOSTSCRIPT="ghostscript-8.71" GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11" GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0" GNASH=" gnash-0.8.5" @@ -320,6 +321,7 @@ OPENSSL_ROOT_CERTS="BLFS-ca-bundle-20090409" PAM="Linux-PAM-1.1.0" PANGO="pango-1.26.2" +PANGOMM="pangomm-2.26.0" PARTED="parted-1.9.0" PATCH_PACKAGE="patch-2.5.9" PCIUTILS="pciutils-3.1.4" @@ -363,8 +365,8 @@ RHYTHMBOX="rhythmbox-0.10.1" RSYNC="rsync-3.0.7" SAMBA="samba-3.0.21c" -SANE_BACKENDS="sane-backends-1.0.18" -XSANE="xsane-0.97" +SANE_BACKENDS="sane-backends-1.0.19" +XSANE="xsane-0.996" SASL2="cyrus-sasl-2.1.21" SED="sed-4.2.1" SENDMAIL="sendmail-8.13.6" diff --git a/stage3/bootscripts/cups b/stage5/bootscripts/cups similarity index 100% rename from stage3/bootscripts/cups rename to stage5/bootscripts/cups diff --git a/stage3/cis-dvdfs b/stage5/cis-boost similarity index 76% copy from stage3/cis-dvdfs copy to stage5/cis-boost index ef92029..cb215ad 100755 --- a/stage3/cis-dvdfs +++ b/stage5/cis-boost @@ -10,17 +10,14 @@ source ../functions source ../packages-list PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} # Applying patches (if any) apply_patches ${PACKAGE} cd ${LFS_TMP}/${PACKAGE} -make -make install - -# Mount script -install -v -m755 ${SCRDIR}/resources/mount.fusedvdfs /sbin +./bootstrap.sh +./bjam --prefix=/usr +./bjam install +ldconfig exit $? diff --git a/stage3/cis-cdrtools b/stage5/cis-cdrtools similarity index 100% rename from stage3/cis-cdrtools rename to stage5/cis-cdrtools diff --git a/stage3/cis-cups b/stage5/cis-cups similarity index 75% rename from stage3/cis-cups rename to stage5/cis-cups index a6cba6a..667abfe 100755 --- a/stage3/cis-cups +++ b/stage5/cis-cups @@ -8,22 +8,22 @@ source ../sysinfos source ../functions source ../packages-list -# Applying patches (if any) -apply_patches ${1} +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} -cd ${LFS_TMP}/${1} +# Applying patches (if any) +apply_patches ${PACKAGE} -# 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} +hv_useradd -c "Print_Service_User" -d /dev/null -g lp -s /bin/false -u 9 lp +cd ${LFS_TMP}/${PACKAGE} ./configure make make install -# For a remote CUPS print server if [ -n "${CUPS_SERVER}" ]; then + # Configuring for connection to a remote CUPS print server cat > /etc/cups/client.conf << "EOF" ######################################################################## # # @@ -42,11 +42,11 @@ if [ -n "${CUPS_SERVER}" ]; then # EOF echo "ServerName ${CUPS_SERVER}" >> /etc/cups/client.conf +else + # Configuring for a CUPS print server + sed -i -e 's@Listen localhost:631@Listen \*:631@' /etc/cups/cupsd.conf 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 - install -v -m740 ${SCRDIR}/bootscripts/cups /etc/rc.d/init.d # script-name start stop diff --git a/stage3/cis-splix b/stage5/cis-cups-pdf similarity index 68% copy from stage3/cis-splix copy to stage5/cis-cups-pdf index e125018..6a6bec3 100755 --- a/stage3/cis-splix +++ b/stage5/cis-cups-pdf @@ -13,17 +13,15 @@ PACKAGE=${1} shift CONFIGURE_OPTS=${*} -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - # Applying patches (if any) apply_patches ${PACKAGE} +cd ${LFS_TMP}/${PACKAGE}/src +gcc -O9 -s -o cups-pdf cups-pdf.c +install -m 0700 cups-pdf /usr/lib/cups/backend + cd ${LFS_TMP}/${PACKAGE} -make DISABLE_JBIG=1 -make install -ldconfig +cp extra/cups-pdf.conf /etc/cups +cp extra/CUPS-PDF.ppd /usr/share/cups/model exit $? diff --git a/stage3/cis-dvd-rw-tools b/stage5/cis-dvd-rw-tools similarity index 100% rename from stage3/cis-dvd-rw-tools rename to stage5/cis-dvd-rw-tools diff --git a/stage3/cis-dvdfs b/stage5/cis-dvdfs similarity index 100% rename from stage3/cis-dvdfs rename to stage5/cis-dvdfs diff --git a/stage5/cis-ghostscript b/stage5/cis-ghostscript index 2ae788b..bc26a6c 100755 --- a/stage5/cis-ghostscript +++ b/stage5/cis-ghostscript @@ -8,10 +8,40 @@ source ../sysinfos source ../functions source ../packages-list +GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript" + +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} + # Applying patches (if any) -apply_patches ${1} +apply_patches ${PACKAGE} -GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript" +cd ${LFS_TMP}/${PACKAGE} + +# To use the system-installed version of JasPer: +rm -rf jasper + +# To use the system-installed copies of libjpeg and libpng: +rm -rf jpeg +rm -rf libpng + +# To use the system-installed copy of libtiff: +rm -rf tiff + +./configure \ + --prefix=/usr \ + --enable-dynamic \ + --with-system-libtiff \ + --with-fontpath=${GS_FONTS_PATH} +make +make install docdir=/usr/share/doc/${PACKAGE} + +# To install the shared library libgs.so (needed by libspectre) +make so +make soinstall docdir=/usr/share/doc/${PACKAGE} +install -v -m644 base/*.h /usr/include/ghostscript +ln -v -s ghostscript /usr/include/ps # Unpack all the fonts to ${GS_FONTS_PATH} install -v -m755 -d ${GS_FONTS_PATH} @@ -21,24 +51,6 @@ mv ${LFS_TMP}/fonts/* ${GS_FONTS_PATH} rmdir ${LFS_TMP}/fonts chown -v -R root:root ${GS_FONTS_PATH} -cd ${LFS_TMP}/${1} -sed -i "s/bbox.dev$/x11.dev/" Makefile.in -./configure \ - --prefix=/usr \ - --enable-threads \ - --without-omni \ - --with-fontpath=${GS_FONTS_PATH} -make -make install - -#rmdir -v /usr/lib/ghostscript/$(get_pkg_ver_base ${1}) /usr/lib/ghostscript -ln -v -s ../ghostscript/$(get_pkg_ver_base ${1})/doc /usr/share/doc/${1} -for INSTFILE in `ls doc`; do - if [ ! -f /usr/share/doc/${1}/${INSTFILE} ]; then - install -v -m644 doc/${INSTFILE} /usr/share/doc/${1}/ - fi -done - if ! grep "${GS_FONTS_PATH}" /etc/fonts/local.conf 1> /dev/null 2>&1; then # Adding Ghostscript fonts directory to local configuration file sed -i -e "s!\(\)! ${GS_FONTS_PATH}\n\1!" /etc/fonts/local.conf diff --git a/stage3/cis-jadetex b/stage5/cis-jadetex similarity index 98% rename from stage3/cis-jadetex rename to stage5/cis-jadetex index 4bcb07c..b981a71 100755 --- a/stage3/cis-jadetex +++ b/stage5/cis-jadetex @@ -59,6 +59,7 @@ max_strings.pdfjadetex = 55000 EOF LATEX_FMT_DIR="$(kpsewhich -expand-var '$TEXMFSYSVAR')/web2c" + mv -v $(kpsewhich latex.fmt) $(kpsewhich latex.fmt).orig mv -v $LATEX_FMT_DIR/latex.log $LATEX_FMT_DIR/latex.log.orig fmtutil-sys --byfmt latex @@ -91,7 +92,7 @@ mktexlsr ln -v -sf etex /usr/bin/jadetex ln -v -sf pdfetex /usr/bin/pdfjadetex install -v -m644 -D index.html \ - /usr/share/doc/jadetex-3.13/index.html + /usr/share/doc/${1}/index.html install -v -m644 *.1 /usr/share/man/man1 ldconfig diff --git a/stage3/cis-sane-backends b/stage5/cis-sane-backends similarity index 68% rename from stage3/cis-sane-backends rename to stage5/cis-sane-backends index c1b8887..09bc97c 100755 --- a/stage3/cis-sane-backends +++ b/stage5/cis-sane-backends @@ -22,27 +22,17 @@ hv_useradd -c saned -d /dev/null -g saned -s /bin/false saned # Problem with build directory cd ${LFS_TMP}/${1} + +# Fixes an obsolete udev parameter: +sed -i 's/SYSFS/ATTRS/g' tools/sane-desc.c + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --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 -cat backend/Makefile.bak \ - | sed "s/\(PRELOADABLE_BACKENDS =\).*/\1 ${SANE_DRIVER} net/" \ - > backend/Makefile -# Removing the program umax_pp, since it depends on some umax driver. -cp tools/Makefile tools/Makefile.bak -cat tools/Makefile.bak \ - | sed "s/\(DESTINATIONS =.*\)umax_pp\(.*\)/\1\2/" > tools/Makefile - make make install -ldconfig +install -m 644 -v tools/udev/libsane.rules /etc/udev/rules.d/65-scanner.rules # Addition to /etc/services (for both the client and server) string_add "sane 6566/tcp saned # SANE Network Scanner Daemon" \ @@ -56,7 +46,7 @@ if [ -z "${SANE_SERVER}" ]; then # the SANE Network Daemon. # Adding entry to '/etc/sane.d/dll.conf' - echo "${SANE_DRIVER}" >> /etc/sane.d/dll.conf + #######echo "${SANE_DRIVER}" >> /etc/sane.d/dll.conf # Creating '/etc/sane.d/saned.conf' echo "${LAN_NETWORK_MASK}" > /etc/sane.d/saned.conf diff --git a/stage3/cis-splix b/stage5/cis-splix similarity index 95% rename from stage3/cis-splix rename to stage5/cis-splix index e125018..b1d18df 100755 --- a/stage3/cis-splix +++ b/stage5/cis-splix @@ -1,6 +1,8 @@ #!/bin/sh set -o errexit +# Drivers Samsung pour CUPS + # First argument of this script is the package name. # Remaining arguments are additional configure options. diff --git a/stage3/cis-tetex b/stage5/cis-tetex similarity index 100% rename from stage3/cis-tetex rename to stage5/cis-tetex diff --git a/stage3/cis-xsane b/stage5/cis-xsane similarity index 100% rename from stage3/cis-xsane rename to stage5/cis-xsane diff --git a/stage5/packages-update b/stage5/packages-update index 0e50c20..6dcddea 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -23,22 +23,22 @@ fi GNUPG_URL="ftp://ftp.gnupg.org/gcrypt" -# Gtk +fpkg_gnome ${LIBSIGCPP} +fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software" fpkg_gnome ${GTK_DOC} -fpkg ${GLITZ} "http://cairographics.org/snapshots" +fpkg_gnome ${GLIBMM} fpkg ${CAIRO} "http://cairographics.org/releases" fpkg ${CAIROMM} "http://cairographics.org/releases" fpkg_gnome ${PANGO} +fpkg_gnome ${PANGOMM} fpkg_gnome ${ATK} fpkg_gnome ${GTK} +fpkg_gnome ${GTKMM} fpkg_gnome ${GTK_ENGINES} fpkg_gnome ${PYGOBJECT} fpkg ${PYCAIRO} "http://cairographics.org/releases" fpkg_gnome ${PYGTK} -fpkg_gnome ${LIBSIGCPP} fpkg ${GC} " http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source" -fpkg_gnome ${GLIBMM} -fpkg_gnome ${GTKMM} fpkg_gnu ${EMACS} fpkg_hv ${HVCLOCK} @@ -63,13 +63,11 @@ fpkg ${LIBPROXY} "http://libproxy.googlecode.com/files" fpkg_gnome ${GNOME_KEYRING} fpkg_gnome ${LIBSOUP} - - fpkg_gnu ${HELP2MAN} fpkg_gnu ${GSL} fpkg -s "$(get_pkg_ver ${CUPS})" -f "${CUPS}-source" ${CUPS} "http://ftp.easysw.com/pub/cups" +fpkg -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" ${CUPS_PDF} http://www.cups-pdf.de/src fpkg_sf ${SPLIX} -fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software" fpkg_sf ${GHOSTSCRIPT} fpkg_sf ${GHOSTSCRIPT_FONTS_STD} "ghostscript" fpkg_sf ${GHOSTSCRIPT_FONTS_OTHER} "ghostscript" @@ -84,26 +82,24 @@ fpkg_sf ${GUTENPRINT} "gimp-print" fpkg_sf ${BOOST} "boost" fpkg_sf ${INKSCAPE} -exit 1 -exit 1 - - - fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord" fpkg ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools" -fpkg ${LIBDVDCSS} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" -fpkg ${LIBDVDREAD} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" +fpkg -s "$(get_pkg_ver ${LIBDVDCSS})" ${LIBDVDCSS} "http://www.videolan.org/pub/libdvdcss" +fpkg ${LIBDVDREAD} "http://www.dtek.chalmers.se/groups/dvd/dist" fpkg ${DVDFS} "http://jspenguin.org:81/dvdfs" -fpkg ${TETEX_SRC} "${TETEX_URL}/$(get_pkg_ver ${TETEX_SRC})/distrib" -fpkg ${TETEX_TEXMF} "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMF})/distrib" -fpkg ${TETEX_TEXMFSRC} "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMFSRC})/distrib" +fpkg_hv ${TETEX_SRC} +fpkg_hv ${TETEX_TEXMF} +fpkg_hv ${TETEX_TEXMFSRC} fpkg ${TETEX_CM_SUPER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/t" # For re-generating fontconfig documentation. fpkg_sf ${JADETEX} -fpkg ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane/${SANE_BACKENDS}" -fpkg ${XSANE} "ftp://ftp.sane-project.org/pub/sane/xsane" +fpkg -e tar.gz -s "${SANE_BACKENDS}" ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane" +fpkg -e tar.gz -s "xsane" ${XSANE} "ftp://ftp.sane-project.org/pub/sane" + +exit 1 +exit 1 fpkg ${PERL_MOD_XML_SIMPLE} "http://www.cpan.org/modules/by-module/XML" fpkg ${PERL_MOD_PARSE_REDESCENT} "http://www.cpan.org/modules/by-module/Parse" diff --git a/stage3/resources/mount.fusedvdfs b/stage5/resources/mount.fusedvdfs similarity index 100% rename from stage3/resources/mount.fusedvdfs rename to stage5/resources/mount.fusedvdfs diff --git a/stage5/stage5-install b/stage5/stage5-install index 0ecc3fa..8c41429 100755 --- a/stage5/stage5-install +++ b/stage5/stage5-install @@ -26,19 +26,21 @@ export SCRDIR=$(pwd) if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then # Gtk ipkg_ac ${LIBSIGCPP} + ipkg_ac ${JASPER} "--enable-shared" ipkg_ac ${GTK_DOC} + ipkg_ac ${GLIBMM} ipkg_ac ${CAIRO} ipkg_ac ${CAIROMM} ipkg_ac_nb ${PANGO} + ipkg_ac ${PANGOMM} ipkg_ac ${ATK} - ipkg_ac ${GTK} "--without-libjasper" + ipkg_ac ${GTK} + ipkg_ac ${GTKMM} ipkg_ac ${GTK_ENGINES} ipkg_ac ${PYGOBJECT} ipkg_ac ${PYCAIRO} ipkg_ac ${PYGTK} ipkg_ac ${GC} - ipkg_ac ${GLIBMM} -## ipkg_ac ${GTKMM} ipkg_cust ${EMACS} cis-emacs ipkg_ac ${HVCLOCK} @@ -72,22 +74,18 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${LIBPROXY} "--with-gnome" ipkg_gnome ${GNOME_KEYRING} ipkg_ac ${LIBSOUP} - fi ipkg_ac ${HELP2MAN} ipkg_ac ${GSL} - -exit 1 -exit 1 - ipkg_cust ${CUPS} cis-cups -ipkg_cust ${SPLIX} cis-splix # Drivers Samsung pour CUPS -ipkg_ac ${JASPER} "--enable-shared" +ipkg_cust ${CUPS_PDF} cis-cups-pdf +ipkg_cust ${SPLIX} cis-splix ipkg_cust ${GHOSTSCRIPT} cis-ghostscript if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg_ac ${IMAGE_MAGICK} "--with-modules" + ipkg_ac ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib" + # xpdf headers needed by inkscape ipkg_ac ${POPPLER} "--enable-xpdf-headers --enable-zlib" ipkg_ac ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin" ipkg_ac ${BABL} @@ -95,14 +93,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${GIMP} "--disable-print" ipkg_ac_nb ${GUTENPRINT} ipkg_cust ${BOOST} cis-boost - ipkg_ac ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\"" + # inkscape-0.47 has a problem with poppler >= 0.12.2 + ####ipkg_ac ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\"" fi -exit 1 -exit 1 - - - ipkg_cust ${CDRTOOLS} cis-cdrtools ipkg_cust ${DVDRWTOOLS} cis-dvd-rw-tools ipkg_ac ${LIBDVDCSS} @@ -111,6 +105,8 @@ ipkg_cust ${DVDFS} cis-dvdfs if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg_cust ${TETEX_SRC} cis-tetex + + # 'Five years old' bug --> Change the date to something in 2004 before installing. ipkg_cust ${JADETEX} cis-jadetex fi @@ -119,6 +115,9 @@ if [ "x${SANE_SUPPORT}" = "xyes" ]; then ipkg_cust ${XSANE} cis-xsane fi + +exit 1 + ipkg_pm ${PERL_MOD_XML_SIMPLE} ipkg_pm ${PERL_MOD_PARSE_REDESCENT} ipkg_ac ${ICON_NAMING_UTILS} diff --git a/stage6/stage6-install b/stage6/stage6-install index 91808f4..532fd67 100755 --- a/stage6/stage6-install +++ b/stage6/stage6-install @@ -77,6 +77,8 @@ ipkg_cust ${GNOME_AUDIO} cis-gnome-audio # Gnome 2 additional packages - Utilities ipkg_gnome ${GEDIT} "--disable-spell" ipkg_gnome ${EOG} + +ipkg_ac ${LIBSPECTRE} ipkg_gnome ${EVINCE} ipkg_gnome ${FILE_ROLLER} ipkg_gnome ${GCONF_EDITOR} diff --git a/sysinfos b/sysinfos index 94b7ed5..87a09d2 100644 --- a/sysinfos +++ b/sysinfos @@ -9,13 +9,13 @@ MAKEJOBS=1 # Installation type: server, ltsp-server or workstation. -INST_TYPE="server" +INST_TYPE="ltsp-server" # New user to create REGUSER="hugo" # Destination path where to install new Linux-HV system -LFS="/opt/toolchains/arm926ejs/clfs" +LFS="" # Destination partition where to install new Linux-HV system LFS_PARTITION="/dev/sda8" @@ -31,7 +31,7 @@ SWAP_PARTITION="/dev/sda2" # arm926t - ARM 926T little endian # x86 (i686) # x86_64 (AMD Athlon 64) -HVL_TARGET="arm926t" +HVL_TARGET="x86_64" # Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS MACHINE_ARCHITECTURE="" @@ -42,12 +42,18 @@ DEFAULT_EDITOR="emacs" KEYBOARD="us" # Sound card support: yes or no -SOUND_CARD="no" +SOUND_CARD="yes" # Removable media drives CDROM="/dev/hdc" DVD="/dev/hdc" +# Set to yes to have SANE support +SANE_SUPPORT="yes" +# If your scanner is located onto a remote computer, define the following +# variable to the IP address of that remote computer. +SANE_SERVER="" + # Define this if you want to use a remote CUPS print server #CUPS_SERVER="server.hugovil.com" -- 2.20.1