[Erp5-report] r9244 - /umigumi/trunk/config/erp5_cd.py

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Aug 17 16:50:29 CEST 2006


Author: kevin
Date: Thu Aug 17 16:50:22 2006
New Revision: 9244

URL: http://svn.erp5.org?rev=9244&view=rev
Log:
Update build version.
Use latest mandriva kernel with NTFS R/W enabled.
Use Apache on port 8080 instead of thttpd to serve ERP5 live CD wizard.
Add mkinitrd, htop, wireshark, mechanize and gtk-galaxy theme.
Replace cervisia by kdesvn.
Install OpenOffice 2.0.3.
Do not install OpenOffice l10n.
Do not start squid by default.

Modified:
    umigumi/trunk/config/erp5_cd.py

Modified: umigumi/trunk/config/erp5_cd.py
URL: http://svn.erp5.org/umigumi/trunk/config/erp5_cd.py?rev=9244&r1=9243&r2=9244&view=diff
==============================================================================
--- umigumi/trunk/config/erp5_cd.py (original)
+++ umigumi/trunk/config/erp5_cd.py Thu Aug 17 16:50:22 2006
@@ -1,4 +1,4 @@
-##################################h############################################
+##############################################################################
 #
 # Copyright (C) 2003-2006 Nexedi SARL
 #                         Yoshinori OKUJI <yo at nexedi.com>
@@ -25,7 +25,7 @@
 # Metadatas
 description = """ERP5 LiveCD demonstrates the power of the Open Source ERP Software, ERP5."""
 canonical_name = 'ERP5 LiveCD'
-version = '1.0rc11-build01'
+version = '1.0rc11-build06'
 
 ### Kernels
 # Use 'smp' kernel flavour for servers
@@ -37,7 +37,8 @@
 # Use 'i586-up-1GB' kernel flavour for laptop based on Celeron
 # This is the nexedi version of the Mandriva official kernel-i586-up-1GB-2.6.12.15mdk,
 #   patched to support NTFS Read/Write
-kernel = 'i586-up-1GB-2.6.12.18nxd'
+
+kernel = 'i586-up-1GB-2.6.12.24nxd'
 
 # Global variables (allow to customize ERP5)
 remove_file = 1                         # If set to 1, remove files
@@ -48,7 +49,7 @@
 # The directory for building images.
 build_dir = 'mdk-erp5_cd'
 
-#The boot logo, obtained by ppmtolss16
+# The boot logo, obtained by ppmtolss16
 boot_img = 'erp5_bootlogo.lss'
 
 # The directory which holds custom files to be copied.
@@ -97,8 +98,11 @@
   , 'sed -i -e "s/^Country=.*/Country=us/" -e "s/^Language=.*/Language=en_US:en/" -e "s/^Charset=.*/Charset=iso10646-1/" /etc/kde/kdeglobals'
   , 'sed -i -e "s/^id:3:initdefault:/id:5:initdefault:/" /etc/inittab'
 
-  # disable apache on port 80
-  , 'sed -i -e "s/Listen 80/#Listen 80 # Disabled in ERP5 LiveCD/" /etc/httpsd/conf/httpsd.conf'
+  # Let apache listen port 8080 to serve ERP5 Live CD wizard
+  , 'sed -i -e "s/Listen 80/Listen 8080/" /etc/httpsd/conf/httpsd.conf'
+  , 'chmod -R 0755 /var/lib/httpsd/cgi-bin/*'
+  , 'chown -R apassl:apassl /var/lib/httpsd/cgi-bin/*'
+#  , 'rm -rf /var/lib/httpsd'
 
   # Add XFree symbolic link
   , 'ln -sf /usr/X11R6/bin/Xorg /etc/X11/X'
@@ -131,7 +135,7 @@
   , 'find / -name ".svn" | xargs rm -rf'
 
   # Remove bad home entry
-  # I don't know why but umigumi it create a /home/kevin/rpm/tmp folder
+  # I don't know why but umigumi create a /home/kevin/rpm/tmp folder
   , 'rm -rf /home/kevin'
 
   # Install the KDE Desktop configuration for the default user
@@ -154,8 +158,9 @@
 # A list of installed packages.
 # To debug this, list remove --auto option in urpmi.
 common_package_list = (
+  'mkinitrd'
 # System
-  'sudo'
+, 'sudo'
 , 'mc'
 , 'screen'
 , 'xterm'
@@ -163,6 +168,7 @@
 , 'hotplug'
 , 'rsync'
 , 'perl'
+, 'htop'
 # Hardware
 , 'hdparm'
 , 'lshw'
@@ -180,6 +186,7 @@
 , 'postfix'
 , 'rfbdrake'
 , 'openssh-clients', 'openssh-server'
+, 'wireshark'
 , 'ntp'
 , 'balance'
 , 'openvpn'
@@ -203,6 +210,7 @@
 , 'mandrakelinux-theme'
 , 'galaxy-kde-kwin'
 , 'galaxy-kde'
+, 'galaxy-gnome'
 # Samba / Netatalk
 # , 'samba-client'
 # , 'samba-doc'
@@ -232,7 +240,7 @@
 # Software Development
 , 'patch'
 , 'cvs', 'subversion'
-, 'kdesdk', 'kdesdk-cervisia'
+, 'kdesdk', 'kdesvn'
 , 'pysvn'
 , 'python-devel'
 # , 'kdevelop', 'PyQt-devel', 'glibc-devel', 'docbook-utils'
@@ -244,12 +252,44 @@
 , 'kate'
 , 'vim-enhanced'
 # Office
-, 'OpenOffice.org'
+#, 'OpenOffice.org'
+, 'openoffice.org-base-2.0.3'
+, 'openoffice.org-calc-2.0.3'
+, 'openoffice.org-writer-2.0.3'
+, 'openoffice.org-draw-2.0.3'
+, 'openoffice.org-impress-2.0.3'
+, 'openoffice.org-math-2.0.3'
+, 'openoffice.org-emailmerge-2.0.3'
+, 'openoffice.org-graphicfilter-2.0.3'
+, 'openoffice.org-javafilter-2.0.3'
+, 'openoffice.org-xsltfilter-2.0.3'
+, 'openoffice.org-pyuno-2.0.3'
+# , 'openoffice.org-testtool-2.0.3'
+# , 'openoffice.org-core01-2.0.3'
+# , 'openoffice.org-core02-2.0.3'
+# , 'openoffice.org-core03-2.0.3'
+# , 'openoffice.org-core03u-2.0.3'
+# , 'openoffice.org-core04-2.0.3'
+# , 'openoffice.org-core04u-2.0.3'
+# , 'openoffice.org-core05-2.0.3'
+# , 'openoffice.org-core05u-2.0.3'
+# , 'openoffice.org-core06-2.0.3'
+# , 'openoffice.org-core07-2.0.3'
+# , 'openoffice.org-core08-2.0.3'
+# , 'openoffice.org-core09-2.0.3'
+# , 'openoffice.org-core10-2.0.3'
+, 'openoffice.org-freedesktop-menus-2.0.3'
+, 'openoffice.org-mandriva-menus-2.0.3'
+# , 'openoffice.org-gnome-integration-2.0.3'
+# , 'openoffice.org-redhat-menus-2.0.3'
+# , 'openoffice.org-suse-menus-2.0.3'
+# , 'openoffice.org-debian-menus_2.0.3'
+, 'OOoDocument_server'
 # Fonts
 , 'urw-fonts', 'ghostscript-fonts', 'fonts-bitmap-tscii', 'fonts-ttf-decoratives'
 , 'fonts-ttf-vera', 'fonts-ttf-latex'
 # Graphics
-, 'gimp', 'gimp-data-extras', 'gimp-python'
+, 'gimp', 'gimp-python', 'gimp-data-extras'
 , 'scribus', 'kooka', 'dia', 'kdegraphics-kpdf', 'ImageMagick', 'kbarcode'
 # Printing
 , 'cups', 'cups-drivers', 'foomatic-db', 'foomatic-filters'
@@ -269,6 +309,7 @@
 , 'zope-LDAPMultiPlugins'
 , 'zope-Zelenium'
 , 'zope-ZopeTestCase'
+, 'python-mechanize-0.1.2'
 #, 'zope-VerboseSecurity'
 #, 'zope-VisualTraceback'
 # Web Frontends
@@ -301,7 +342,7 @@
                       , 'man-pages', 'bash-doc', 'grep-doc', 'rute', 'sag'
                       , 'mandriva-doc-Discovery-en', 'mandriva-doc-Command-Line-en'
                       , 'myspell-hyph-en', 'aspell-en'
-                      , 'OpenOffice.org-help-en', 'OpenOffice.org-help-en'
+#                      , 'OpenOffice.org-help-en', 'OpenOffice.org-help-en'
                         #'dictd-dicts-world95',
                         #XXX 'dictd-dicts-cze-eng', 'dictd-dicts-dan-eng', 'dictd-dicts-deu-eng',
                         #XXX 'dictd-dicts-eng-deu', 'dictd-dicts-eng-fra', 'dictd-dicts-eng-iri',
@@ -327,6 +368,7 @@
   , 'package_list'  : ( 'myspell-en_GB'
                       , 'kde-i18n-en_GB'
                       )
+
   },
   { 'language'      : 'en'
   , 'country'       : 'US'
@@ -343,7 +385,7 @@
                       , 'man-pages-fr'
                       , 'mandriva-doc-Command-Line-fr'
                       , 'myspell-hyph-fr', 'aspell-fr'
-                      , 'OpenOffice.org-l10n-fr', 'OpenOffice.org-help-fr'
+#                      , 'OpenOffice.org-l10n-fr', 'OpenOffice.org-help-fr'
                       , 'kde-i18n-fr'
                       , 'mozilla-firefox-fr'
                        #XXX 'dictd-dicts-deu-fra', 'dictd-dicts-eng-fra', 'dictd-dicts-fra-deu',
@@ -377,7 +419,7 @@
   , 'package_list'  : ( 'locales-ja'
                       , 'fonts-ttf-japanese', 'fonts-ttf-kannada'
                       , 'man-pages-ja'
-                      , 'OpenOffice.org-l10n-ja', 'OpenOffice.org-help-ja'
+#                      , 'OpenOffice.org-l10n-ja', 'OpenOffice.org-help-ja'
                       , 'kde-i18n-ja'
                       , 'mozilla-firefox-ja'
                       )
@@ -386,7 +428,7 @@
   , 'country'       : None
   , 'package_list'  : ( 'man-pages-ko'
                       , 'fonts-ttf-korean'
-                      , 'OpenOffice.org-l10n-ko', 'OpenOffice.org-help-ko'
+#                      , 'OpenOffice.org-l10n-ko', 'OpenOffice.org-help-ko'
                       , 'kde-i18n-ko'
                       , 'mozilla-firefox-ko'
                       )
@@ -395,7 +437,7 @@
   , 'country'       : None
   , 'package_list'  : ( 'man-pages-ru'
                       , 'fonts-type1-cyrillic'
-                      , 'OpenOffice.org-l10n-ru', 'OpenOffice.org-help-ru'
+#                      , 'OpenOffice.org-l10n-ru', 'OpenOffice.org-help-ru'
                       , 'kde-i18n-ru'
                       , 'mozilla-firefox-ru'
                       )
@@ -470,6 +512,7 @@
   , 'postfix'
   , 'rsync'
   , 'sound'
+  , 'squid'
   , 'svnserve'
   , 'ultrabayd'
   , 'zope'




More information about the Erp5-report mailing list