prepare mes5.2

4 files changed, 112 insertions, 177 deletions

diff --git a/lists/basesystem_common b/lists/basesystem_common
index 374c12c..be18267 100644
--- a/lists/basesystem_common
+++ b/lists/basesystem_common
@@ -18,6 +18,7 @@ losetup
 udev
 iputils
 gnupg
+cpuset
 
 kernel-desktop586-latest
 kernel-desktop-latest
diff --git a/lists/exclude_main_corpo b/lists/exclude_main_corpo
index 0e1a1ee..7d810d1 100644
--- a/lists/exclude_main_corpo
+++ b/lists/exclude_main_corpo
@@ -10,7 +10,8 @@ firefox-mn
 firefox-oc
 firefox-sr
 heimdal-login
-openoffice.org-help-fi
+openoffice.org-help
+openoffice.org64-help
 openoffice.org-l10n-fi
 openoffice.org-voikko
 telnet-client-krb5
@@ -19,6 +20,7 @@ telnet-server-krb5
 akonadi-devel
 kdebase4-workspace-devel
 libkocorehelper4
+lib64kocorehelper4
 pidgin-mono
 python-vtk-devel
 squirrelmail-en
@@ -26,189 +28,40 @@ squirrelmail-bn
 tcl-vtk-devel
 x11-font-util
 liblirc-devel
+lib64lirc-devel
 ftp-client-krb5
 ftp-server-krb5
 libxulrunner-unstable-devel
+lib64xulrunner-unstable-devel
+iptables-devel
+
+*2.6.27.21*
+*2.6.27.24*
+*2.6.27.37*
+*2.6.27.39*
+*2.6.27.45*
 
-drm-experimental-kernel-2.6.27.37-desktop-1mnb
-drm-experimental-kernel-2.6.27.37-desktop586-1mnb
-drm-experimental-kernel-2.6.27.37-server-1mnb
-drm-experimental-kernel-2.6.27.39-desktop-1mnb
-drm-experimental-kernel-2.6.27.39-desktop586-1mnb
-drm-experimental-kernel-2.6.27.39-server-1mnb
-drm-experimental-kernel-2.6.27.45-desktop-1mnb
-drm-experimental-kernel-2.6.27.45-desktop586-1mnb
-drm-experimental-kernel-2.6.27.45-server-1mnb
-fglrx-kernel-2.6.27.24-desktop-1mnb
-fglrx-kernel-2.6.27.24-desktop586-1mnb
-fglrx-kernel-2.6.27.24-server-1mnb
-fglrx-kernel-2.6.27.37-desktop-1mnb
-fglrx-kernel-2.6.27.37-desktop586-1mnb
-fglrx-kernel-2.6.27.37-server-1mnb
-fglrx-kernel-2.6.27.39-desktop-1mnb
-fglrx-kernel-2.6.27.39-desktop586-1mnb
-fglrx-kernel-2.6.27.39-server-1mnb
-fglrx-kernel-2.6.27.45-desktop-1mnb
-fglrx-kernel-2.6.27.45-desktop586-1mnb
-fglrx-kernel-2.6.27.45-server-1mnb
-iscsitarget-kernel-2.6.27.24-desktop-1mnb
-iscsitarget-kernel-2.6.27.24-desktop586-1mnb
-iscsitarget-kernel-2.6.27.24-server-1mnb
-iscsitarget-kernel-2.6.27.37-desktop-1mnb
-iscsitarget-kernel-2.6.27.37-desktop586-1mnb
-iscsitarget-kernel-2.6.27.37-server-1mnb
-iscsitarget-kernel-2.6.27.39-desktop-1mnb
-iscsitarget-kernel-2.6.27.39-desktop586-1mnb
-iscsitarget-kernel-2.6.27.39-server-1mnb
-iscsitarget-kernel-2.6.27.45-desktop-1mnb
-iscsitarget-kernel-2.6.27.45-desktop586-1mnb
-iscsitarget-kernel-2.6.27.45-server-1mnb
-kernel-2.6.27.24-1mnb
-kernel-2.6.27.24-2mnb
-kernel-2.6.27.37-1mnb
-kernel-2.6.27.39-1mnb
-kernel-2.6.27.45-1mnb
-kqemu-kernel-2.6.27.24-desktop-1mnb
-kqemu-kernel-2.6.27.24-desktop586-1mnb
-kqemu-kernel-2.6.27.24-server-1mnb
-kqemu-kernel-2.6.27.37-desktop-1mnb
-kqemu-kernel-2.6.27.37-desktop586-1mnb
-kqemu-kernel-2.6.27.37-server-1mnb
-kqemu-kernel-2.6.27.39-desktop-1mnb
-kqemu-kernel-2.6.27.39-desktop586-1mnb
-kqemu-kernel-2.6.27.39-server-1mnb
-kqemu-kernel-2.6.27.45-desktop-1mnb
-kqemu-kernel-2.6.27.45-desktop586-1mnb
-kqemu-kernel-2.6.27.45-server-1mnb
-libafs-kernel-2.6.27.37-desktop-1mnb
-libafs-kernel-2.6.27.37-desktop586-1mnb
-libafs-kernel-2.6.27.37-server-1mnb
-libafs-kernel-2.6.27.39-desktop-1mnb
-libafs-kernel-2.6.27.39-desktop586-1mnb
-libafs-kernel-2.6.27.39-server-1mnb
-libafs-kernel-2.6.27.45-desktop-1mnb
-libafs-kernel-2.6.27.45-desktop586-1mnb
-libafs-kernel-2.6.27.45-server-1mnb
-lzma-kernel-2.6.27.24-desktop-1mnb
-lzma-kernel-2.6.27.24-desktop586-1mnb
-lzma-kernel-2.6.27.24-server-1mnb
 lzma-kernel-desktop-latest
 lzma-kernel-desktop586-latest
 lzma-kernel-server-latest
-madwifi-kernel-2.6.27.37-desktop-1mnb
-madwifi-kernel-2.6.27.37-desktop586-1mnb
-madwifi-kernel-2.6.27.37-server-1mnb
-madwifi-kernel-2.6.27.39-desktop-1mnb
-madwifi-kernel-2.6.27.39-desktop586-1mnb
-madwifi-kernel-2.6.27.39-server-1mnb
-madwifi-kernel-2.6.27.45-desktop-1mnb
-madwifi-kernel-2.6.27.45-desktop586-1mnb
-madwifi-kernel-2.6.27.45-server-1mnb
-nvidia-current-kernel-2.6.27.24-desktop-1mnb
-nvidia-current-kernel-2.6.27.24-desktop586-1mnb
-nvidia-current-kernel-2.6.27.24-server-1mnb
-nvidia-current-kernel-2.6.27.37-desktop-1mnb
-nvidia-current-kernel-2.6.27.37-desktop586-1mnb
-nvidia-current-kernel-2.6.27.37-server-1mnb
-nvidia-current-kernel-2.6.27.39-desktop-1mnb
-nvidia-current-kernel-2.6.27.39-desktop586-1mnb
-nvidia-current-kernel-2.6.27.39-server-1mnb
-nvidia-current-kernel-2.6.27.45-desktop-1mnb
-nvidia-current-kernel-2.6.27.45-desktop586-1mnb
-nvidia-current-kernel-2.6.27.45-server-1mnb
-nvidia173-kernel-2.6.27.24-desktop-1mnb
-nvidia173-kernel-2.6.27.24-desktop586-1mnb
-nvidia173-kernel-2.6.27.37-desktop-1mnb
-nvidia173-kernel-2.6.27.37-desktop586-1mnb
-nvidia173-kernel-2.6.27.39-desktop-1mnb
-nvidia173-kernel-2.6.27.39-desktop586-1mnb
-nvidia173-kernel-2.6.27.45-desktop-1mnb
-nvidia173-kernel-2.6.27.45-desktop586-1mnb
-nvidia71xx-kernel-2.6.27.24-desktop-1mnb
-nvidia71xx-kernel-2.6.27.24-desktop586-1mnb
-nvidia71xx-kernel-2.6.27.24-server-1mnb
-nvidia71xx-kernel-2.6.27.37-desktop-1mnb
-nvidia71xx-kernel-2.6.27.37-desktop586-1mnb
-nvidia71xx-kernel-2.6.27.37-server-1mnb
-nvidia71xx-kernel-2.6.27.39-desktop-1mnb
-nvidia71xx-kernel-2.6.27.39-desktop586-1mnb
-nvidia71xx-kernel-2.6.27.39-server-1mnb
-nvidia71xx-kernel-2.6.27.45-desktop-1mnb
-nvidia71xx-kernel-2.6.27.45-desktop586-1mnb
-nvidia71xx-kernel-2.6.27.45-server-1mnb
-nvidia96xx-kernel-2.6.27.24-desktop-1mnb
-nvidia96xx-kernel-2.6.27.24-desktop586-1mnb
-nvidia96xx-kernel-2.6.27.24-server-1mnb
-nvidia96xx-kernel-2.6.27.37-desktop-1mnb
-nvidia96xx-kernel-2.6.27.37-desktop586-1mnb
-nvidia96xx-kernel-2.6.27.37-server-1mnb
-nvidia96xx-kernel-2.6.27.39-desktop-1mnb
-nvidia96xx-kernel-2.6.27.39-desktop586-1mnb
-nvidia96xx-kernel-2.6.27.39-server-1mnb
-nvidia96xx-kernel-2.6.27.45-desktop-1mnb
-nvidia96xx-kernel-2.6.27.45-desktop586-1mnb
-nvidia96xx-kernel-2.6.27.45-server-1mnb
-rt2860-kernel-2.6.27.24-desktop-1mnb
-rt2860-kernel-2.6.27.24-desktop586-1mnb
-rt2860-kernel-2.6.27.24-server-1mnb
 rt2860-kernel-desktop-latest
 rt2860-kernel-desktop586-latest
 rt2860-kernel-server-latest
-rt2870-kernel-2.6.27.24-desktop-1mnb
-rt2870-kernel-2.6.27.24-desktop586-1mnb
-rt2870-kernel-2.6.27.24-server-1mnb
 rt2870-kernel-desktop-latest
 rt2870-kernel-desktop586-latest
 rt2870-kernel-server-latest
-rtl8187se-kernel-2.6.27.24-desktop-1mnb
-rtl8187se-kernel-2.6.27.24-desktop586-1mnb
-rtl8187se-kernel-2.6.27.24-server-1mnb
 rtl8187se-kernel-desktop-latest
 rtl8187se-kernel-desktop586-latest
 rtl8187se-kernel-server-latest
-squashfs-lzma-kernel-2.6.27.24-desktop-1mnb
-squashfs-lzma-kernel-2.6.27.24-desktop586-1mnb
-squashfs-lzma-kernel-2.6.27.24-server-1mnb
 squashfs-lzma-kernel-desktop-latest
 squashfs-lzma-kernel-desktop586-latest
 squashfs-lzma-kernel-server-latest
-vboxadd-kernel-2.6.27.24-desktop-1mnb
-vboxadd-kernel-2.6.27.24-desktop586-1mnb
-vboxadd-kernel-2.6.27.24-server-1mnb
-vboxadd-kernel-2.6.27.45-desktop-1mnb
-vboxadd-kernel-2.6.27.45-desktop586-1mnb
-vboxadd-kernel-2.6.27.45-server-1mnb
 vboxadd-kernel-desktop-latest
 vboxadd-kernel-desktop586-latest
 vboxadd-kernel-server-latest
-vboxvfs-kernel-2.6.27.24-desktop-1mnb
-vboxvfs-kernel-2.6.27.24-desktop586-1mnb
-vboxvfs-kernel-2.6.27.24-server-1mnb
-vboxvfs-kernel-2.6.27.45-desktop-1mnb
-vboxvfs-kernel-2.6.27.45-desktop586-1mnb
-vboxvfs-kernel-2.6.27.45-server-1mnb
 vboxvfs-kernel-desktop-latest
 vboxvfs-kernel-desktop586-latest
 vboxvfs-kernel-server-latest
-virtualbox-kernel-2.6.27.24-desktop-1mnb
-virtualbox-kernel-2.6.27.24-desktop586-1mnb
-virtualbox-kernel-2.6.27.24-server-1mnb
-virtualbox-kernel-2.6.27.45-desktop-1mnb
-virtualbox-kernel-2.6.27.45-desktop586-1mnb
-virtualbox-kernel-2.6.27.45-server-1mnb
 virtualbox-kernel-desktop-latest
 virtualbox-kernel-desktop586-latest
 virtualbox-kernel-server-latest
-vpnclient-kernel-2.6.27.24-desktop-1mnb
-vpnclient-kernel-2.6.27.24-desktop586-1mnb
-vpnclient-kernel-2.6.27.24-server-1mnb
-vpnclient-kernel-2.6.27.37-desktop-1mnb
-vpnclient-kernel-2.6.27.37-desktop586-1mnb
-vpnclient-kernel-2.6.27.37-server-1mnb
-vpnclient-kernel-2.6.27.39-desktop-1mnb
-vpnclient-kernel-2.6.27.39-desktop586-1mnb
-vpnclient-kernel-2.6.27.39-server-1mnb
-vpnclient-kernel-2.6.27.45-desktop-1mnb
-vpnclient-kernel-2.6.27.45-desktop586-1mnb
-vpnclient-kernel-2.6.27.45-server-1mnb
-*2.6.27.53
diff --git a/mes5_X86_32.xml b/mes5_X86_32.xml
index b5f4dab..e46f015 100644
--- a/mes5_X86_32.xml
+++ b/mes5_X86_32.xml
@@ -2,11 +2,12 @@
 
 <productname desc="The Linux product">
 	<nameid>mandriva-linux-corporate</nameid>
-	<nb_fork>4</nb_fork>
+	<nb_fork>7</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
 	<based_on>mes5</based_on>
 	<!-- -->
 	<arch>i586</arch>
+	<urpmqlogs>/home/builduser/urpmqlogs</urpmqlogs>
 	<signature>/home/builduser/.signature.gpg</signature>
 	<rpmrc>/home/builduser/.rpmrc</rpmrc>
 	<repo desc="Where is the repositery of the distribution">
@@ -45,6 +46,7 @@
 			<defaultpath>advertising</defaultpath>
 			<!--<fullpath></fullpath> -->
 		</advertising>
+		<patch>/home/builduser/PIECES/meta-task/patch-oem.pl</patch>
 	</installer>
 
 	<!-- theme must be available to path altx/all.rdz files -->
@@ -99,26 +101,20 @@
 			<testing>no</testing>
 		</list>
 		<list name="bck" desc="Main2 media">
-			<!-- MANDATORY list of wanted packages on the iso -->
 			<input name="base2">
 				<file>lists/main2</file>
 			</input>
 			<input name="base">
 			</input>
-			<!-- to create an array you must keep this even if it is empty -->
-			<!-- MANDATORY list of unwanted packages on the iso -->
 			<exclude name="exclude">
 				<file>lists/exclude-theme-corpo</file>
 			</exclude>
 			<exclude name="exclude_free">
 				<file>lists/exclude_main_corpo</file>
 			</exclude>
-			<!-- to create an array you must keep this even if it is empty -->
 			<exclude>
 			</exclude>
-			<!-- nosuggests options should be yes or no -->
 			<nosuggests>no</nosuggests>
-			<!-- will be taken in {repo}{version}{arch}/media -->
 			<mediadir>main2</mediadir>
 			<destmedia>main</destmedia>
 			<external name="bck">
@@ -130,6 +126,30 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
+		<list name="nonfree" desc="nonfree media">
+			<input name="base">
+				<file>lists/input_nonfree</file>
+			</input>
+			<input name="base">
+			</input>
+			<exclude name="exclude">
+				<file>lists/exclude-theme-corpo</file>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_main_corpo</file>
+			</exclude>
+			<exclude>
+			</exclude>
+			<nosuggests>no</nosuggests>
+			<mediadir>non-free</mediadir>
+			<destmedia>non-free</destmedia>
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>yes</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
+
 
 		<!-- keep this entry to create an array ref -->
 		<list></list>
@@ -138,7 +158,7 @@
 	<mediainfo desc="All files relatives to media_info dir">
 	        <version>mes5</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
-		<!--<fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>-->
+		<fullpath>/home/builduser/PIECES/meta-task</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -157,7 +177,7 @@
 	</mediainfo>
 	
 	<iso>
-		<tag>mes5</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 d412430..2f0320a 100644
--- a/mes5_X86_64.xml
+++ b/mes5_X86_64.xml
@@ -2,11 +2,14 @@
 
 <productname desc="The Linux product">
 	<nameid>mandriva-linux-corporate</nameid>
-	<nb_fork>10</nb_fork>
+	<nb_fork>7</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>corporate/5.0</based_on>
+	<based_on>mes5</based_on>
 	<!-- -->
 	<arch>x86_64</arch>
+	<urpmqlogs>/home/builduser/urpmqlogs</urpmqlogs>
+	<signature>/home/builduser/.signature.gpg</signature>
+	<rpmrc>/home/builduser/.rpmrc</rpmrc>
 	<repo desc="Where is the repositery of the distribution">
 		<path>/mnt/BIG/official</path>
 	</repo>
@@ -16,7 +19,7 @@
 	<tocopy_file>tocopy_plop</tocopy_file>
 	<isolinux desc="isolinux info">
 		<defaultpath>isolinux</defaultpath>
-		<!-- <fullpath></fullpath> -->
+		<fullpath>/home/builduser/export_x86_64/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<!--		<entry name="hdt" desc="Main media">
 			<bin>/usr/lib/syslinux/hdt.c32</bin>
@@ -38,11 +41,12 @@
 	</isolinux>
 	<installer desc="path to the Mandriva installer (stage1/stage2)">
 		<defaultpath>install</defaultpath>
-		<!--<fullpath></fullpath> -->
+		<fullpath>/home/builduser/export_x86_64</fullpath>
 		<advertising>
 			<defaultpath>advertising</defaultpath>
 			<!--<fullpath></fullpath> -->
 		</advertising>
+		<patch>/home/builduser/PIECES/meta-task/patch-oem.pl</patch>
 	</installer>
 
 	<!-- theme must be available to path altx/all.rdz files -->
@@ -62,13 +66,19 @@
 			<input name="base">
 				<file>lists/server_cs5</file>
 			</input>
+			<input name="base">
+				<file>lists/all</file>
+			</input>
+			<input name="base">
+				<file>lists/basesystem_common</file>
+			</input>
 			<input name="theme">
 				<file>lists/corpo</file>
 			</input>
 			<!-- to create an array you must keep this even if it is empty -->
 			<!-- MANDATORY list of unwanted packages on the iso -->
 			<exclude name="exclude">
-				<file>lists/exclude_theme_corpo</file>
+				<file>lists/exclude-theme-corpo</file>
 			</exclude>
 			<exclude name="exclude_free">
 				<file>lists/exclude_main_corpo</file>
@@ -90,6 +100,57 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
+		<list name="bck" desc="Main2 media">
+			<input name="base2">
+				<file>lists/main2</file>
+			</input>
+			<input name="base">
+			</input>
+			<exclude name="exclude">
+				<file>lists/exclude-theme-corpo</file>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_main_corpo</file>
+			</exclude>
+			<exclude>
+			</exclude>
+			<nosuggests>no</nosuggests>
+			<mediadir>main2</mediadir>
+			<destmedia>main</destmedia>
+			<external name="bck">
+				<fullpath_mediadir>/home/builduser/PIECES/x86_64/release</fullpath_mediadir>
+			</external>
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>no</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
+		<list name="nonfree" desc="nonfree media">
+			<input name="base">
+				<file>lists/input_nonfree</file>
+			</input>
+			<input name="base">
+			</input>
+			<exclude name="exclude">
+				<file>lists/exclude-theme-corpo</file>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_main_corpo</file>
+			</exclude>
+			<exclude>
+			</exclude>
+			<nosuggests>no</nosuggests>
+			<mediadir>non-free</mediadir>
+			<destmedia>non-free</destmedia>
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>yes</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
+
+
 		<!-- keep this entry to create an array ref -->
 		<list></list>
 	</media>
@@ -97,7 +158,7 @@
 	<mediainfo desc="All files relatives to media_info dir">
 	        <version>mes5</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
-		<!--<fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>-->
+		<fullpath>/home/builduser/PIECES/meta-task</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -105,10 +166,10 @@
                 <filter>lists/extra-filter</filter>
                 <urpmi_option>-a</urpmi_option>
 		<askmedia desc="add for other media ?">
-			<todo>yes</todo>
+			<todo>no</todo>
 		</askmedia>
 		<suppl desc="add an external media ?">
-			<todo>yes</todo>
+			<todo>no</todo>
 		</suppl>
 		<xmlinfo>
 			<todo>no</todo>
@@ -116,7 +177,7 @@
 	</mediainfo>
 	
 	<iso>
-		<tag>mes5</tag>
+		<tag>mes5.2</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>MES5</product>