From d9b6d06a1d66ad40d61192ef241a1c41f83a8047 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Feb 2010 16:29:19 +0000 Subject: [PATCH] =?utf8?q?Revenu=20=C3=A0=20ancienne=20m=C3=A9thode=20pour?= =?utf8?q?=20afficher=20les=20checkbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- stage3/stage3-install | 211 +++++++++++++++++++++--------------------- stage4/stage4-install | 24 ++--- 2 files changed, 118 insertions(+), 117 deletions(-) diff --git a/stage3/stage3-install b/stage3/stage3-install index 1d6d3dd..fcc27fb 100755 --- a/stage3/stage3-install +++ b/stage3/stage3-install @@ -20,11 +20,11 @@ init_log_file # For updating dynamic DNS entries. if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then - ipkg ${DDCLIENT} cis-ddclient + ipkg_cust ${DDCLIENT} cis-ddclient fi # Networking -ipkg ${INETUTILS} cis-inetutils +ipkg_cust ${INETUTILS} cis-inetutils # Network/debugging tools ipkg_ac ${LIBPCAP} "--enable-yydebug" @@ -33,15 +33,15 @@ ipkg_ac_nb ${NMAP} ipkg_ac ${STRACE} # Bind server -ipkg ${BIND} cis-bind +ipkg_cust ${BIND} cis-bind if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${IPTABLES} cis-iptables - ipkg ${MYSQL} cis-mysql + ipkg_cust ${IPTABLES} cis-iptables + ipkg_cust ${MYSQL} cis-mysql fi -ipkg ${UNZIP} cis-unzip -ipkg ${ZIP} cis-zip +ipkg_cust ${UNZIP} cis-unzip +ipkg_cust ${ZIP} cis-zip ipkg_ac ${CPIO} # Installing only CVS client. @@ -55,54 +55,54 @@ ipkg_ac ${LIBPNG} ipkg_ac ${LIBTIFF} ipkg_ac ${GIFLIB} ipkg_ac_nb ${LCMS} -ipkg ${LIBMNG} cis-libmng +ipkg_cust ${LIBMNG} cis-libmng ipkg_ac ${LIBEXIF} ipkg_ac ${LIBART} ipkg_ac ${FRIBIDI} # X if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg_ac ${FREETYPE} - ipkg ${FONTCONFIG} cis-fontconfig - ipkg ${T1LIB} cis-t1lib - ipkg ${XFREE86} cis-xfree86 + 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_ac ${LIBXFT} "--prefix=/usr/X11R6" - ipkg ${WINDOWMAKER} cis-windowmaker - ipkg_ac ${WINDOWMAKER_EXTRA} + ipkg_cust ${WINDOWMAKER} cis-windowmaker + ipkg_ac ${WINDOWMAKER_EXTRA} # Open Source version of OSF/Motif - ipkg_ac ${LESSTIF} "--disable-debug --enable-production --with-xdnd --disable-build-tests" + ipkg_ac ${LESSTIF} "--disable-debug --enable-production --with-xdnd --disable-build-tests" # Re-installing emacs now that X is present (it was installed in stage 2) - ipkg ${EMACS} cis-emacs + ipkg_cust ${EMACS} cis-emacs fi -ipkg ${TK} cis-tk +ipkg_cust ${TK} cis-tk ipkg_ac ${PYTHON} "--enable-shared" -ipkg ${LIBBOOST} cis-boost +ipkg_cust${LIBBOOST} cis-boost if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then # DocBook - ipkg ${SGML_COMMON} cis-sgml-common - ipkg ${SGML_DTD3} cis-sgml-dtd3 - ipkg ${SGML_DTD4} cis-sgml-dtd4 - ipkg ${OPENSP} cis-opensp - ipkg ${OPENJADE} cis-openjade - ipkg ${DOCBOOK_DSSSL} cis-docbook-dsssl - ipkg ${DOCBOOK_UTILS} cis-docbook-utils - ipkg_ac_nb ${LIBXML2} - ipkg_ac_nb ${LIBXSLT} - ipkg ${DOCBOOK_XML} cis-docbook-xml - ipkg ${DOCBOOK_XSL} cis-docbook-xsl - ipkg ${SGML_SPM} cis-sgml-spm - - ipkg ${XMLTOMAN} cis-xmltoman + 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 ${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 ${SGML_SPM} cis-sgml-spm + + ipkg_cust ${XMLTOMAN} cis-xmltoman # Perl modules ipkg_pm ${PERL_MOD_PDL} @@ -121,7 +121,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_pm ${PERL_MOD_DIGEST_SHA1} ipkg_pm ${PERL_MOD_URI} ipkg_pm ${PERL_MOD_LWP} - ipkg ${PERL_MOD_NET_DNS} cis-pm-net-dns + ipkg_cust ${PERL_MOD_NET_DNS} cis-pm-net-dns # Needed by OpenOffice ??? ipkg_pm ${PERL_MOD_ARCHIVE_ZIP} @@ -164,14 +164,14 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${LIBIDL} fi -ipkg_ac ${INTLTOOL} -ipkg_ac ${GSL} -ipkg ${CUPS} cis-cups -ipkg ${SPLIX} cis-splix # Drivers Samsung pour CUPS -ipkg ${ESPGS} cis-espgs +ipkg_ac ${INTLTOOL} +ipkg_ac ${GSL} +ipkg_cust ${CUPS} cis-cups +ipkg_cust ${SPLIX} cis-splix # Drivers Samsung pour CUPS +ipkg_cust ${ESPGS} cis-espgs if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${LIBUSB} cis-libusb + ipkg_cust ${LIBUSB} cis-libusb ipkg_ac ${LIBGPHOTO2} ipkg_ac ${IMAGE_MAGICK} "--with-modules" ipkg_ac ${POPPLER} "--enable-xpdf-headers --enable-zlib" @@ -183,19 +183,19 @@ 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 ${CDRTOOLS} cis-cdrtools -ipkg ${DVDRWTOOLS} cis-dvd-rw-tools +ipkg_ac ${BC} "--with-readline" +ipkg_cust ${CDRTOOLS} cis-cdrtools +ipkg_cust ${DVDRWTOOLS} cis-dvd-rw-tools if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg_ac ${ED} - ipkg ${TETEX_SRC} cis-tetex - ipkg ${JADETEX} cis-jadetex + ipkg_ac ${ED} + ipkg_cust ${TETEX_SRC} cis-tetex + ipkg_cust ${JADETEX} cis-jadetex fi if [ "x${SANE_SUPPORT}" = "xyes" ]; then - ipkg ${SANE_BACKENDS} cis-sane-backends - ipkg ${XSANE} cis-xsane + ipkg_cust ${SANE_BACKENDS} cis-sane-backends + ipkg_cust ${XSANE} cis-xsane fi ipkg_ac ${ICON_NAMING_UTILS} @@ -209,8 +209,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${LIBOIL} # ALSA - ipkg ${ALSA_LIB} cis-alsa-lib - ipkg ${ALSA_UTILS} cis-alsa-utils + ipkg_cust ${ALSA_LIB} cis-alsa-lib + ipkg_cust ${ALSA_UTILS} cis-alsa-utils ipkg_ac ${ALSA_OSS} # Audio raw utilities @@ -222,13 +222,13 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac_nb ${FLAC} ipkg_ac ${LAME} ipkg_ac ${LIBA52} "--enable-shared" - ipkg ${LIBID3TAG} cis-libid3tag - ipkg ${LIBMAD} cis-libmad + ipkg_cust ${LIBID3TAG} cis-libid3tag + ipkg_cust ${LIBMAD} cis-libmad ipkg_ac_nb ${LIBFAAC} ipkg_ac_nb ${LIBFAAD2} ipkg_ac ${LIBTHEORA} - ipkg ${XVIDCORE} cis-xvidcore + ipkg_cust ${XVIDCORE} cis-xvidcore # Audio libraries ipkg_ac_nb ${AUDIOFILE} @@ -236,10 +236,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${LIBSNDFILE} # Audio servers - ipkg_ac ${ESOUND} - ipkg_ac ${SPEEX} - ipkg ${PULSEAUDIO} cis-pulseaudio - ipkg_ac ${JACK} "--disable-portaudio" + ipkg_ac ${ESOUND} + ipkg_ac ${SPEEX} + ipkg_cust ${PULSEAUDIO} cis-pulseaudio + ipkg_ac ${JACK} "--disable-portaudio" ipkg_ac ${ALSA_PLUGINS} # Depends on pulseaudio ipkg_ac ${VORBIS_TOOLS} @@ -257,98 +257,99 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the fi ipkg_ac ${SYLPHEED} "--enable-ssl --enable-ldap" - ipkg ${NSS} cis-nss - ipkg ${FIREFOX} cis-firefox + ipkg_cust ${NSS} cis-nss + ipkg_cust ${FIREFOX} cis-firefox # Plugins for Opera and Firefox - ipkg ${JAVA} cis-java - ipkg ${AGG} cis-agg - ipkg ${GNASH} cis-gnash + ipkg_cust ${JAVA} cis-java + ipkg_cust ${AGG} cis-agg + ipkg_cust ${GNASH} cis-gnash fi -ipkg ${DBUS} cis-dbus -ipkg_ac ${DBUS_GLIB} "--disable-tests --disable-dependency-tracking --disable-xml-docs --disable-doxygen-docs" -ipkg_ac ${EGGDBUS} -ipkg ${HAL} cis-hal +ipkg_cust ${DBUS} cis-dbus +ipkg_ac ${DBUS_GLIB} "--disable-tests --disable-dependency-tracking --disable-xml-docs --disable-doxygen-docs" +ipkg_ac ${EGGDBUS} +ipkg_cust ${HAL} cis-hal ipkg_ac ${LIBGAMIN} "--libexecdir=/usr/sbin" ipkg_ac ${PCMANFM} # Mail -ipkg ${SASL2} cis-sasl2 -ipkg ${OPENLDAP} cis-openldap -ipkg ${KERBEROS5} cis-krb5 -ipkg ${SENDMAIL} cis-sendmail +ipkg_cust ${SASL2} cis-sasl2 +ipkg_cust ${OPENLDAP} cis-openldap +ipkg_cust ${KERBEROS5} cis-krb5 +ipkg_cust ${SENDMAIL} cis-sendmail if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${PROCMAIL} cis-procmail - ipkg_ac ${LIBSPF2} - ipkg ${MILTER_SPF} cis-milter-spf - ipkg ${MILTER_GREYLIST} cis-milter-greylist + ipkg_cust ${PROCMAIL} cis-procmail + ipkg_ac ${LIBSPF2} + ipkg_cust ${MILTER_SPF} cis-milter-spf + ipkg_cust ${MILTER_GREYLIST} cis-milter-greylist fi # fcron needs sendmail installed. -ipkg ${FCRON} cis-fcron -ipkg ${GETDATE} cis-getdate +ipkg_cust ${FCRON} cis-fcron +ipkg_cust ${GETDATE} cis-getdate if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${CLAMAV} cis-clamav - ipkg ${SPAMASSASSIN} cis-spamassassin - ipkg ${UW_IMAP} cis-uw-imap + ipkg_cust ${CLAMAV} cis-clamav + ipkg_cust ${SPAMASSASSIN} cis-spamassassin + ipkg_cust ${UW_IMAP} cis-uw-imap # Apache - ipkg ${HTTPD} cis-apache - ipkg_ac ${CURL} - ipkg ${PHP} cis-php + ipkg_cust ${HTTPD} cis-apache + ipkg_ac ${CURL} + ipkg_cust ${PHP} cis-php - ipkg ${SQUIRRELMAIL} cis-squirrelmail - ipkg ${MAILMAN} cis-mailman - ipkg_ac ${FETCHMAIL} "--with-ssl" - ipkg_ac ${MUTT} "--enable-imap --with-ssl" + ipkg_cust ${SQUIRRELMAIL} cis-squirrelmail + ipkg_cust ${MAILMAN} cis-mailman + ipkg_ac ${FETCHMAIL} "--with-ssl" + ipkg_ac ${MUTT} "--enable-imap --with-ssl" # Subversion server (client was already installed in stage2) - ipkg ${SUBVERSION} cis-subversion - ipkg_ac ${INDENT} + ipkg_cust ${SUBVERSION} cis-subversion + ipkg_ac ${INDENT} fi ipkg_ac_nb ${GIT} - ipkg ${GIT_MANPAGES} cis-git-manpages + ipkg_cust ${GIT_MANPAGES} cis-git-manpages if [ "x${USE_SAMBA}" = "xyes" ]; then - ipkg ${SAMBA} cis-samba + ipkg_cust ${SAMBA} cis-samba fi if [ "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${TFTP_HPA} cis-tftp-hpa - ipkg ${LTSP_UTILS} cis-ltsp-utils + ipkg_cust ${TFTP_HPA} cis-tftp-hpa + ipkg_cust ${LTSP_UTILS} cis-ltsp-utils fi ipkg_ac_nb ${KVM} ipkg_ac_nb ${BRIDGE_UTILS} -ipkg ${UML_UTILITIES} cis-uml-utilities +ipkg_cust ${UML_UTILITIES} cis-uml-utilities -ipkg ${GUILE} cis-guile +ipkg_cust ${GUILE} cis-guile -ipkg ${CKERMIT} cis-ckermit +ipkg_cust ${CKERMIT} cis-ckermit # BitTorrent client ipkg_ac ${TRANSMISSION} "--disable-daemon" # For bitbake -ipkg_ac ${HELP2MAN} +ipkg_ac ${HELP2MAN} -ipkg_ac ${LIBDVDCSS} -ipkg_ac ${LIBDVDREAD} "--with-libdvdcss" -INIT_D_PATH=/etc/rc.d/init.d ipkg_ac_nb ${FUSE} -ipkg ${DVDFS} cis-dvdfs +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 ${DOSFSTOOLS} cis-dosfstools +ipkg_cust ${DOSFSTOOLS} cis-dosfstools -ipkg_ac ${LIBFFI} -ipkg_ac ${GOBJECT_INSTROSPECTION} +ipkg_ac ${LIBFFI} +ipkg_ac ${GOBJECT_INSTROSPECTION} -ipkg ${POLKIT} cis-polkit -ipkg_ac ${GNUPG} "--libexecdir=/usr/lib" +ipkg_cust ${POLKIT} cis-polkit +ipkg_ac ${GNUPG} "--libexecdir=/usr/lib" ./cis-postinstall diff --git a/stage4/stage4-install b/stage4/stage4-install index 6dbd59b..1afc07e 100755 --- a/stage4/stage4-install +++ b/stage4/stage4-install @@ -25,9 +25,9 @@ action_checkbox "Reloading /etc/profile" source /etc/profile # Gnome 2 core packages ipkg_gnome ${ORBIT2} ipkg_gnome ${LIBBONOBO} -ipkg ${GCONF} cis-gconf +ipkg_cust ${GCONF} cis-gconf ipkg_gnome ${GNOME_MIME_DATA} -####ipkg ${GNOME_VFS} cis-gnome-nb +####ipkg_cust ${GNOME_VFS} cis-gnome-nb ####ipkg_gnome ${GNOME_VFS_MONIKERS} ipkg_gnome ${LIBGNOME} ipkg_gnome ${LIBGNOMECANVAS} @@ -54,11 +54,11 @@ ipkg_gnome ${GNOME_TERMINAL} ipkg_gnome ${LIBGTOP} ipkg_gnome ${LIBGNOMEKBD} ipkg_gnome ${LIBGAIL_GNOME} -ipkg ${GNOME_APPLETS} cis-gnome-applets +ipkg_cust ${GNOME_APPLETS} cis-gnome-applets ipkg_gnome ${EEL} ipkg_gnome ${NAUTILUS} ipkg_gnome ${YELP} -ipkg ${METACITY} cis-metacity +ipkg_cust ${METACITY} cis-metacity ipkg_gnome ${GNOME_CONTROL_CENTER} ipkg_gnome ${GNOME_SESSION} @@ -72,8 +72,8 @@ action_checkbox "Updating the MIME-type application database" update-desktop-dat ipkg_gnome ${GTKHTML} ipkg_gnome ${EVOLUTION_DATA_SERVER} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr" ipkg_gnome ${GTKSOURCEVIEW} -ipkg ${SYSTEM_TOOLS_BACKENDS} cis-gnome-nobuild -ipkg ${GNOME_AUDIO} cis-gnome-audio +ipkg_cust ${SYSTEM_TOOLS_BACKENDS} cis-gnome-nobuild +ipkg_cust ${GNOME_AUDIO} cis-gnome-audio # Gnome 2 additional packages - Utilities ipkg_gnome ${GEDIT} "--disable-spell" @@ -86,7 +86,7 @@ ipkg_gnome ${GNOME_SYSTEM_MONITOR} ipkg_gnome ${NAUTILUS_CD_BURNER} ipkg_gnome ${GNOME_MEDIA} ipkg_gnome ${GNOME_NETSTATUS} -ipkg ${GCALCTOOL} cis-gnome-nobuild +ipkg_cust ${GCALCTOOL} cis-gnome-nobuild ipkg_gnome ${GUCHARMAP} ipkg_gnome ${ZENITY} ipkg_gnome ${GNOME_KEYRING_MANAGER} @@ -94,20 +94,20 @@ ipkg_gnome ${GNOME_KEYRING_MANAGER} # Needs hal, which needs D-BUS... ipkg_gnome ${GNOME_VOLUME_MANAGER} -ipkg ${LIBMUSICBRAINZ} cis-libmusicbrainz +ipkg_cust ${LIBMUSICBRAINZ} cis-libmusicbrainz ipkg_gnome ${GNOME_SOUND_JUICER} -ipkg ${ISO_CODES} cis-iso-codes +ipkg_cust ${ISO_CODES} cis-iso-codes ipkg_gnome ${GNOME_TOTEM} -ipkg ${GDM} cis-gdm +ipkg_cust ${GDM} cis-gdm ipkg_ac ${LIBNOTIFY} -ipkg ${GNOME_MOUNT} cis-gnome-nobuild +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 ${GNUMERIC} cis-gnumeric +ipkg_cust ${GNUMERIC} cis-gnumeric ipkg_ac ${WV} ipkg_ac ${ABIWORD} "--disable-spellcheck" ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr" -- 2.20.1