mes5.2

15 files changed, 110 insertions, 60 deletions

diff --git a/create_dual.sh b/create_dual.sh
index 51020a8..94829b1 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -11,8 +11,8 @@ rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images/boot.iso
 rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/install/images/boot.iso
 rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/isolinux/alt1
 rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/isolinux/alt1
-rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images/hd*.img
-rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/install/images/hd*.img
+rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images
+rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/install/images
 rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images/alternatives
 rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images/*2.6.33*
 rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/install/images/alternatives
@@ -24,8 +24,8 @@ du -sh $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586
 du -sh $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64
 
 echo "ENTER twice to continue"
-read
-read
+#read
+#read
 
 rm -rf $HOME/build_bcd/build/$NAMER-$TAGS
 rm -rvf $HOME/build_bcd/iso/$NAMER-$TAGS
@@ -68,10 +68,10 @@ genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-loa
 	$HOME/build_bcd/build/$NAMER-$TAGS/
 
 cd $HOME/build_bcd/iso/$NAMER-$TAGS/
-md5sum $NAMER-$TAGS.iso > $NAMER-$TAGS.iso.md5
-sha1sum $NAMER-$TAGS.iso > $NAMER-$TAGS.iso.sha1
-cat $HOME/build_bcd/build/$NAMER-$TAGS/i586/pkg-*.idx > $HOME/build_bcd/iso/$NAMER-$TAGS/$NAMER-$TAGS.idx
-cat $HOME/build_bcd/build/$NAMER-$TAGS/x86_64/pkg-*.idx >> $HOME/build_bcd/iso/$NAMER-$TAGS/$NAMER-$TAGS.idx
+md5sum *.iso > $NAMER.iso.md5
+sha1sum *.iso > $NAMER.iso.sha1
+cat $HOME/build_bcd/build/$NAMER-$TAGS/i586/pkg-*.idx > $HOME/build_bcd/iso/$NAMER-$TAGS/$NAMER.idx
+cat $HOME/build_bcd/build/$NAMER-$TAGS/x86_64/pkg-*.idx >> $HOME/build_bcd/iso/$NAMER-$TAGS/$NAMER.idx
 }
 
 du -shL $HOME/build_bcd/build/$NAMER-$TAGS/
diff --git a/dual.xml b/dual.xml
index 1ad3270..969ed5b 100644
--- a/dual.xml
+++ b/dual.xml
@@ -121,7 +121,9 @@
 			<exclude name="exclude_free">
 				<file>lists/exclude_mini</file>
 			</exclude>
-
+			<exclude name="exclude_free">
+                                <file>lists/exclude_mini32</file>
+                        </exclude>
 			<exclude>
 			</exclude>
 			<nosuggests>no</nosuggests>
@@ -145,8 +147,8 @@
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
 		<fullpath>/home/builduser/PIECES/meta-task</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
-		<rpmsrate>rpmsrate</rpmsrate>
-		<compssusers>compssUsers.pl</compssusers>
+		<rpmsrate>rpmsrate_dual</rpmsrate>
+		<compssusers>compssUsers_dual.pl</compssusers>
 		<filedeps>file-deps</filedeps>
                 <filter>lists/extra-filter</filter>
                 <urpmi_option>-a</urpmi_option>
diff --git a/dual64.xml b/dual64.xml
index 3642c51..445224c 100644
--- a/dual64.xml
+++ b/dual64.xml
@@ -135,8 +135,8 @@
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
 		<fullpath>/home/builduser/PIECES/meta-task</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
-		<rpmsrate>rpmsrate</rpmsrate>
-		<compssusers>compssUsers.pl</compssusers>
+		<rpmsrate>rpmsrate_dual</rpmsrate>
+		<compssusers>compssUsers_dual.pl</compssusers>
 		<filedeps>file-deps</filedeps>
                 <filter>lists/extra-filter</filter>
                 <urpmi_option>-a</urpmi_option>
diff --git a/lists/basesystem_test b/lists/basesystem_test
index b665ce4..84c65b0 100644
--- a/lists/basesystem_test
+++ b/lists/basesystem_test
@@ -18,21 +18,38 @@ udev
 #msec
 #wpa_supplicant
 ldetect-0.11
+openldap-clients-2.4.11-3.3
 ldetect-lst
 pciids
-pciutils
+pciutils-3.1
 hal
 parted
 lib64edit0
 libedit0
 lib64event2
 libevent2
+linux-userspace-headers
+gdm
+mmc-wizard
+mmc-agent
+mmc-check-password
+mmc-web-base
+mmc-web-bulkimport
+mmc-web-mail
+mmc-web-network
+mmc-web-ppolicy
+mmc-web-proxy
+mmc-web-samba
+mmc-web-sshlpk
+mmc-web-userquota
+postfix
 
 #mandriva-theme-Free
 #mandriva-gfxboot-theme
 mandriva-release-common
 #mandriva-lxde-config-Free
 mandriva-release-Free
+mandriva-theme-Corporate
 #polkit-gnome
 INSTALL 1
 
@@ -54,14 +71,15 @@ lsof
 tcpdump
 gnupg
 file
-#xterm
+xterm
 #monitor-edid
 vim-enhanced
 vim-common
 urpmi
 #aria2
 #locales-(en|fr|es|pt_BR|pl|de|ru|bg|ja|hu|mk)
-#samba-client
+samba-client
+samba-common
 iputils
 lftp
 cpio
@@ -77,12 +95,9 @@ vlan-utils
 reiserfsprogs
 xfsprogs
 #alsa-utils
-#task-x11
-#task-lxde
-#lxtask
-#lxpanel
+task-x11
 #xarchiver
-#icewm
+icewm-gnome
 pptp-linux
 #ppp-
 nfs-utils-clients
@@ -100,12 +115,11 @@ zcip
 #synaptics
 #linuxwacom
 setserial
-#x11-driver-input
-#x11-driver-video
-#x11-server-xvfb
+x11-driver-input
+x11-driver-video
+x11-server-xvfb
 #drakxtools
 drakx-kbd-mouse-x11
-openldap-clients
 drakx-net
 drakx-net-text
 #drakconf
@@ -133,7 +147,6 @@ x11-driver-video-vboxvideo
 #rpmdrake
 lvm2
 #drakfirsttime
-#firefox
 ntfs-3g
 dkms-minimal
 #dkms
@@ -146,3 +159,4 @@ mdadm
 #msec-gui
 #mdkonline
 #task-pulseaudio
+cronie-anacron
diff --git a/lists/exclude_main_corpo b/lists/exclude_main_corpo
index 37b397f..19ab53c 100644
--- a/lists/exclude_main_corpo
+++ b/lists/exclude_main_corpo
@@ -18,6 +18,7 @@ openoffice.org-voikko
 telnet-client-krb5
 telnet-server-krb5
 openoffice.org64
+#*parted1.8_8
 
 akonadi-devel
 kdebase4-workspace-devel
@@ -56,10 +57,13 @@ kernel-2.6.27.21*
 *2.6.27.39*
 *2.6.27.45*
 *2.6.27.53-1mnb*
-#*2.6.27.56-1mnb*
-*2.6.27.56-*1mnb
+*2.6.27.56-*1mnb-1-*
+*2.6.27.56-server-1mnb-
+*2.6.27.56-desktop-1mnb-
+*2.6.27.56-desktop586-1mnb-
 gcc-c++-4.3.2-3mnb2
-bacula-dir-sqlite3-3.0.1-2mdv
+bacula-dir-*-3.0.1-2mdv
+*-debug*
 
 lzma-kernel-desktop-latest
 lzma-kernel-desktop586-latest
@@ -128,3 +132,18 @@ vpnclient-kernel-2.6.27.53-desktop-1mnb
 vpnclient-kernel-2.6.27.53-desktop586-1mnb
 vpnclient-kernel-2.6.27.53-server-1mnb
 mkinitrd-devel
+
+# dont know why this failed....
+#*xulrunner1.9-1.9
+#*xulrunner1.9.2.3
+#*xulrunner1.9.2.4
+#*xulrunner1.9.2.6
+#*xulrunner1.9.2.8
+#*xulrunner1.9.2.9
+#*xulrunner1.9.2.10
+#*xulrunner1.9.2.11
+#*xulrunner1.9.2.12
+#*xulrunner1.9.2.13
+#*xulrunner1.9.2.14
+anacron-
+vixie-cron
diff --git a/lists/exclude_mini b/lists/exclude_mini
index 4e1110f..1b732f3 100644
--- a/lists/exclude_mini
+++ b/lists/exclude_mini
@@ -26,6 +26,7 @@ kernel-rt
 kernel-tmb
 kernel-vserver
 kernel-server-latest
+kernel-2.6.33-desktop
 rsbac-admin
 apache-mod_rsbac
 apache-mpm-rsbac
@@ -58,3 +59,12 @@ gutenprint-ijs
 sane-backends
 sane-backends
 saned
+*2.6.27*
+mandriva-theme-Corporate-screensaver
+epsoneplijs
+ghostscript
+ghostscript-common
+ghostscript-fonts-
+pbm2l2030-
+pbm2lwxl-
+pbmtozjs-
diff --git a/lists/exclude_mini32 b/lists/exclude_mini32
index f94ccc8..6372f3d 100644
--- a/lists/exclude_mini32
+++ b/lists/exclude_mini32
@@ -1 +1 @@
-kesalo
+kernel-2.6.33-desktop-2.6.33.7
diff --git a/lists/extra-filter b/lists/extra-filter
index cb5729a..b5b4cdc 100644
--- a/lists/extra-filter
+++ b/lists/extra-filter
@@ -7,3 +7,5 @@
 libgnomecups
 lib64gnomecups
 glibc-devel
+libxulrunner1.9
+lib64xulrunner1.9
diff --git a/lists/kernel32 b/lists/kernel32
index e6f458f..19e1e82 100644
--- a/lists/kernel32
+++ b/lists/kernel32
@@ -1,3 +1,3 @@
-kernel-2.6.33-desktop586-latest
-kernel-2.6.33-desktop586-devel
+kernel-2.6.33-server-latest
+kernel-2.6.33-server-devel
 #vboxadditions-kernel-desktop586-latest
diff --git a/lists/kernel64 b/lists/kernel64
index c6f49a5..6393c8d 100644
--- a/lists/kernel64
+++ b/lists/kernel64
@@ -1,3 +1,3 @@
-kernel-2.6.33-desktop-latest
-kernel-2.6.33-desktop-devel-latest
+kernel-2.6.33-server-latest
+kernel-2.6.33-server-devel-latest
 #vboxadditions-kernel-desktop-latest
diff --git a/lists/main2 b/lists/main2
index 082197b..df8a37d 100644
--- a/lists/main2
+++ b/lists/main2
@@ -11,26 +11,23 @@ mandriva-release-common
 mandriva-release-Server
 drakxtools-curses
 drakxtools-backend
-drakxtools-11.71.12-1.2mdv
-harddrake-ui-11.71.12-1.2
-harddrake-11.71.12-1.2
-uClibc-libopenssl0.9.30.1
-uClibc-libopenssl0.9.30.1-devel
-uClibc-libopenssl0.9.30.1-static-devel
+drakxtools-11.72.1
+harddrake-ui-11.72.1
+harddrake-11.72.1
+uClibc-libopenssl0.9.30
 uClibc-devel
 #uClibc-openssl
 uClibc-static-devel
 #uClibc-zlib1
 #uClibc-zlib1-devel
 pciids
-pciutils
+pciutils-3.1
 pciutils-devel
 python-virtinst
-qemu-0.12.3
-qemu-img-0.12.3
 rpmcheck
 squashfs-tools
 squashfs3-tools
 virt-manager
 xz
 cpuset
+nash
diff --git a/lists/server_cs5 b/lists/server_cs5
index acc3919..6d64c2c 100644
--- a/lists/server_cs5
+++ b/lists/server_cs5
@@ -525,7 +525,6 @@ bootsplash
 desktop-common-data
 
 ############
-pciutils
 rgrep
 
 
diff --git a/lists/server_cs52 b/lists/server_cs52
index 77fe655..3f626fc 100644
--- a/lists/server_cs52
+++ b/lists/server_cs52
@@ -109,11 +109,9 @@ autologin
 avahi
 awstats
 backuppc
-bacula-common
 bacula-console
 bacula-console-gnome
 bacula-console-wx
-bacula-dir-common
 bacula-dir-mysql
 bacula-dir-pgsql
 bacula-dir-sqlite
@@ -772,6 +770,18 @@ xmessage
 xorg-x11-75dpi-fonts
 xrandr
 xterm
+lib64xulrunner1.9.2.15
+libxulrunner1.9.2.15
+lib64xulrunner1.9-1.9.0.18-0
+libxulrunner1.9-1.9.0.18-0
+libOpenSP-devel
+tetex-afm
+tetex-context
+tetex-doc
+libwnck-devel
+libneon-static-devel
+libffi-devel
+aiksaurusgtk-devel
 xulrunner
 yelp
 ypserv
diff --git a/mes5_X86_32.xml b/mes5_X86_32.xml
index e635556..f8b589b 100644
--- a/mes5_X86_32.xml
+++ b/mes5_X86_32.xml
@@ -63,7 +63,7 @@
 		<!-- futur feature will provide a way to specify another name for the basic repo of an MDV distribution -->
 		<list name="Main" desc="Main media">
 			<!-- MANDATORY list of wanted packages on the iso -->
-			<!--			<input name="base">
+			<!-- <input name="base">
 				<file>lists/server_cs5</file>
 			</input>
 			<input name="base">
@@ -103,14 +103,13 @@
 			<testing>no</testing>
 		</list>
 		<list name="bck" desc="Main2 media">
-			<input name="base">
+			<input name="base2">
 				<file>lists/server_cs52</file>
 			</input>
-			<input name="base2">
+			<input name="main2">
 				<file>lists/main2</file>
 			</input>
-
-			<input name="base">
+			<input name="all">
 				<file>lists/all</file>
 			</input>
 			<input name="base">
@@ -124,7 +123,7 @@
 			<exclude>
 			</exclude>
 			<nosuggests>no</nosuggests>
-			<mediadir>main</mediadir>
+			<mediadir>main2</mediadir>
 			<destmedia>main</destmedia>
 			<external name="bck">
 				<fullpath_mediadir>/home/builduser/PIECES/i586/release</fullpath_mediadir>
@@ -186,7 +185,7 @@
 	</mediainfo>
 	
 	<iso>
-		<tag>echo</tag>
+		<tag>mes5.2</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>MES5</product>
diff --git a/mes5_X86_64.xml b/mes5_X86_64.xml
index 72468c6..bf1701a 100644
--- a/mes5_X86_64.xml
+++ b/mes5_X86_64.xml
@@ -63,17 +63,15 @@
 		<!-- futur feature will provide a way to specify another name for the basic repo of an MDV distribution -->
 		<list name="Main" desc="Main media">
 			<!-- MANDATORY list of wanted packages on the iso -->
-	<!--
-			<input name="base">
+			<!-- <input name="base">
 				<file>lists/server_cs5</file>
 			</input>
-		     <input name="base">
-			<file>lists/all</file>
+		        <input name="base">
+				<file>lists/all</file>
 			</input>
 			<input name="base">
 				<file>lists/basesystem_common</file>
-			</input>
-			-->
+			</input>-->
 			<input></input>
 			<input></input>
 			<!-- to create an array you must keep this even if it is empty -->
@@ -184,7 +182,7 @@
 	</mediainfo>
 	
 	<iso>
-		<tag>rc4</tag>
+		<tag>rc5</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>MES5</product>