prepare dual arch CD

2 files changed, 230 insertions, 129 deletions

diff --git a/dual.xml b/dual.xml
index 264fed2..631582e 100644
--- a/dual.xml
+++ b/dual.xml
@@ -1,41 +1,61 @@
 <?xml version='1.0'?>
 
 <productname desc="The Linux product">
-	<nameid>MES5-dual</nameid>
-	<nb_fork>10</nb_fork>
+	<nameid>mandriva-linux-corporate-DUAL</nameid>
+	<nb_fork>7</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>2009.0</based_on>
+	<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">
-		<path>/data</path>
+		<path>/mnt/BIG/official</path>
 	</repo>
 	<workdir desc="Where is my working dir">
-		<path>/home/installeur/mymkcd-cs5/build_bcd</path>
+		<path>/home/builduser/build_bcd</path>
 	</workdir>
 	<tocopy_file>tocopy_plop</tocopy_file>
 	<isolinux desc="isolinux info">
-                <defaultpath>isolinux</defaultpath>
-                <!--<fullpath></fullpath>-->
-                <!-- add hdt entry in syslinux.cfg -->
-                <entry>
-                </entry>
-                <!-- keep this entry to create an array ref -->
-                <entry></entry>
-        </isolinux>
-
+		<defaultpath>isolinux</defaultpath>
+		<fullpath>/home/builduser/export_i386/isolinux</fullpath>
+		<!-- add hdt entry in syslinux.cfg -->
+		<!--		<entry name="hdt" desc="Main media">
+			<bin>/usr/lib/syslinux/hdt.c32</bin>
+			<label>hdt</label>
+			<kernel>hdt.c32</kernel>
+			<append>modules=modules.pci</append>
+		</entry>
+		-->
+		<!-- keep this entry to create an array ref -->
+		<entry></entry>
+		<entry></entry>
+               <tocopy name="pcimap">
+		       <file>/lib/modules/2.6.27.53-server-1mnb/modules.pcimap</file>
+                </tocopy>
+                <tocopy name="ids">
+                        <file>/usr/share/pci.ids</file>
+                </tocopy>
+                <tocopy></tocopy>
+	</isolinux>
 	<installer desc="path to the Mandriva installer (stage1/stage2)">
 		<defaultpath>install</defaultpath>
-		<!--<fullpath></fullpath> -->
+		<fullpath>/home/builduser/export_i386</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 -->
-        <theme name="Mandriva-release-Server">
+	<theme name="mandriva-release-Server">
                 <theme>mandriva-theme-Corporate</theme>
-                <bootsplash>Mandriva-Corporate</bootsplash>
-                <bootsplash_path>/usr/share/bootsplash</bootsplash_path>
-                <gfxboot_path>/usr/share/gfxboot</gfxboot_path>
-        </theme>
+		<bootsplash>Mandriva-Corporate</bootsplash>
+		<bootsplash_path>/usr/share/bootsplash</bootsplash_path>
+		<gfxboot_path>/usr/share/gfxboot</gfxboot_path>
+	</theme>
 
 	<media desc="media to take into account to build the ISO">
 		<!-- WARNING this media must be named "Main" because main media is mandatory for all other media-->
@@ -43,28 +63,28 @@
 		<!-- 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="k32">
-                                <file>lists/kernel32</file>
-                        </input>
-                        <input name="basesystem_common">
-                                <file>lists/basesystem_mini</file>
-                        </input>
-                        <input name="lang">
-                                <file>lists/languages_mini</file>
-                        </input>
-                        <exclude name="theme-corpo">
-                                <file>lists/exclude-theme-corpo</file>
-                        </exclude>
-                        <exclude name="exclude">
-                                <file>lists/exclude_mini</file>
-                        </exclude>
-                        <exclude name="exclude32">
-                                <file>lists/exclude_mini32</file>
-                        </exclude>
+			<input name="kernel">
+				<file>lists/kernel32</file>
+			</input>
+			<input name="base">
+				<file>lists/basesystem_mini</file>
+			</input>
+			<input name="base">
+				<file>lists/languages_mini</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>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_mini</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>yes</nosuggests>
+			<nosuggests>no</nosuggests>
 			<!-- will be taken in {repo}{version}{arch}/media -->
 			<mediadir>main</mediadir>
 			<destmedia>main</destmedia>
@@ -77,35 +97,66 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
+		<list name="bck" desc="Main2 media">
+			<input name="base2">
+				<file>lists/basesystem_mini</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 name="exclude_free">
+				<file>lists/exclude_mini</file>
+			</exclude>
+
+			<exclude>
+			</exclude>
+			<nosuggests>no</nosuggests>
+			<mediadir>main2</mediadir>
+			<destmedia>main</destmedia>
+			<external name="bck">
+				<fullpath_mediadir>/home/builduser/PIECES/i586/release</fullpath_mediadir>
+			</external>
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>no</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
 		<!-- keep this entry to create an array ref -->
 		<list></list>
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-                <version>5.1</version>
-                <mediainfo_dir>media/media_info</mediainfo_dir>
-                <rpmsrate>rpmsrate</rpmsrate>
-                <compssusers>compssUsers.pl</compssusers>
-                <filedeps>file-deps</filedeps>
+	        <version>mes5</version>
+		<!-- 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>
+		<filedeps>file-deps</filedeps>
                 <filter>lists/extra-filter</filter>
-                <restricted>no</restricted>
-                <urpmi_option>-p </urpmi_option>
-                <askmedia desc="add for other media ?">
-                        <todo>no</todo>
-                </askmedia>
-                <suppl desc="add an external media ?">
-                        <todo>no</todo>
-                </suppl>
-                <xmlinfo>
-                        <todo>no</todo>
-                </xmlinfo>
+                <urpmi_option>-a</urpmi_option>
+		<askmedia desc="add for other media ?">
+			<todo>no</todo>
+		</askmedia>
+		<suppl desc="add an external media ?">
+			<todo>no</todo>
+		</suppl>
+		<xmlinfo>
+			<todo>no</todo>
+		</xmlinfo>
 	</mediainfo>
 	
 	<iso>
-		<tag>Official</tag>
+		<tag>mes5.2</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
-		<product>Corporate</product>
+		<product>MES5</product>
 		<branch>Official</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
@@ -116,15 +167,15 @@
 		<mediacfg>media/media_info/media.cfg</mediacfg>
 		<hdlist>yes</hdlist>
 		<synthesis>yes</synthesis>
-                <header desc="Iso header info">
-                        <systemid>Mandriva Linux</systemid>
-                        <volumeid>MES5-Corporate-i586</volumeid>
-                        <volumesetid>Mandriva Linux - MES5 - i586</volumesetid>
-                        <publisherid>Mandriva</publisherid>
-                        <datapreparer>Mandriva-Linux BCD</datapreparer>
-                        <applicationid>Mandriva Linux - MES5</applicationid>
-                        <copyrightid>Mandriva Linux</copyrightid>
-                </header>
+		<header desc="Iso header info">
+			<systemid>Mandriva Linux</systemid>
+			<volumeid>MES5-DUAL</volumeid>
+			<volumesetid>Mandriva Linux - MES5 - DUAL DVD</volumesetid>
+			<publisherid>Mandriva</publisherid>
+			<datapreparer>Mandriva-Linux BCD</datapreparer>
+			<applicationid>Mandriva Linux - MES5</applicationid>
+			<copyrightid>Mandriva Linux</copyrightid>
+		</header>
 		<genisoimage desc="iso generation tool">
 			<options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 </options>
 			<bootcat>isolinux/boot.cat</bootcat>
diff --git a/dual64.xml b/dual64.xml
index 26809b4..ae0a89c 100644
--- a/dual64.xml
+++ b/dual64.xml
@@ -1,41 +1,61 @@
 <?xml version='1.0'?>
 
 <productname desc="The Linux product">
-	<nameid>MES5-dual</nameid>
-	<nb_fork>10</nb_fork>
+	<nameid>mandriva-linux-corporate-DUAL</nameid>
+	<nb_fork>7</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>2009.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>/data</path>
+		<path>/mnt/BIG/official</path>
 	</repo>
 	<workdir desc="Where is my working dir">
-		<path>/home/installeur/mymkcd-cs5/build_bcd</path>
+		<path>/home/builduser/build_bcd</path>
 	</workdir>
 	<tocopy_file>tocopy_plop</tocopy_file>
 	<isolinux desc="isolinux info">
-                <defaultpath>isolinux</defaultpath>
-                <!--<fullpath></fullpath>-->
-                <!-- add hdt entry in syslinux.cfg -->
-                <entry>
-                </entry>
-                <!-- keep this entry to create an array ref -->
-                <entry></entry>
-        </isolinux>
-
+		<defaultpath>isolinux</defaultpath>
+		<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>
+			<label>hdt</label>
+			<kernel>hdt.c32</kernel>
+			<append>modules=modules.pci</append>
+		</entry>
+		-->
+		<!-- keep this entry to create an array ref -->
+		<entry></entry>
+		<entry></entry>
+               <tocopy name="pcimap">
+		       <file>/lib/modules/2.6.27.53-server-1mnb/modules.pcimap</file>
+                </tocopy>
+                <tocopy name="ids">
+                        <file>/usr/share/pci.ids</file>
+                </tocopy>
+                <tocopy></tocopy>
+	</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 -->
-        <theme name="Mandriva-release-Server">
+	<theme name="mandriva-release-Server">
                 <theme>mandriva-theme-Corporate</theme>
-                <bootsplash>Mandriva-Corporate</bootsplash>
-                <bootsplash_path>/usr/share/bootsplash</bootsplash_path>
-                <gfxboot_path>/usr/share/gfxboot</gfxboot_path>
-        </theme>
+		<bootsplash>Mandriva-Corporate</bootsplash>
+		<bootsplash_path>/usr/share/bootsplash</bootsplash_path>
+		<gfxboot_path>/usr/share/gfxboot</gfxboot_path>
+	</theme>
 
 	<media desc="media to take into account to build the ISO">
 		<!-- WARNING this media must be named "Main" because main media is mandatory for all other media-->
@@ -43,25 +63,28 @@
 		<!-- 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="k64">
-                                <file>lists/kernel64</file>
-                        </input>
-                        <input name="basesystem_common">
-                                <file>lists/basesystem_mini</file>
-                        </input>
-                        <input name="lang">
-                                <file>lists/languages_mini</file>
-                        </input>
-                        <exclude name="theme-corpo">
-                                <file>lists/exclude-theme-corpo</file>
-                        </exclude>
-                        <exclude name="exclude">
-                                <file>lists/exclude_mini</file>
-                        </exclude>
+			<input name="kernel">
+				<file>lists/kernel64</file>
+			</input>
+			<input name="base">
+				<file>lists/basesystem_mini</file>
+			</input>
+			<input name="base">
+				<file>lists/languages_mini</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>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_mini</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>yes</nosuggests>
+			<nosuggests>no</nosuggests>
 			<!-- will be taken in {repo}{version}{arch}/media -->
 			<mediadir>main</mediadir>
 			<destmedia>main</destmedia>
@@ -74,35 +97,62 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
+		<list name="bck" desc="Main2 media">
+			<input name="base2">
+				<file>lists/basesystem_mini</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/i586/release</fullpath_mediadir>
+			</external>
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>no</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
 		<!-- keep this entry to create an array ref -->
 		<list></list>
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-                <version>5.1</version>
-                <mediainfo_dir>media/media_info</mediainfo_dir>
-                <rpmsrate>rpmsrate</rpmsrate>
-                <compssusers>compssUsers.pl</compssusers>
-                <filedeps>file-deps</filedeps>
+	        <version>mes5</version>
+		<!-- 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>
+		<filedeps>file-deps</filedeps>
                 <filter>lists/extra-filter</filter>
-                <restricted>no</restricted>
-                <urpmi_option>-p  </urpmi_option>
-                <askmedia desc="add for other media ?">
-                        <todo>no</todo>
-                </askmedia>
-                <suppl desc="add an external media ?">
-                        <todo>no</todo>
-                </suppl>
-                <xmlinfo>
-                        <todo>no</todo>
-                </xmlinfo>
+                <urpmi_option>-a</urpmi_option>
+		<askmedia desc="add for other media ?">
+			<todo>no</todo>
+		</askmedia>
+		<suppl desc="add an external media ?">
+			<todo>no</todo>
+		</suppl>
+		<xmlinfo>
+			<todo>no</todo>
+		</xmlinfo>
 	</mediainfo>
 	
 	<iso>
-		<tag>Official</tag>
+		<tag>mes5.2</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
-		<product>Corporate</product>
+		<product>MES5</product>
 		<branch>Official</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
@@ -113,15 +163,15 @@
 		<mediacfg>media/media_info/media.cfg</mediacfg>
 		<hdlist>yes</hdlist>
 		<synthesis>yes</synthesis>
-                <header desc="Iso header info">
-                        <systemid>Mandriva Linux</systemid>
-                        <volumeid>MES5-Corporate-x86_64</volumeid>
-                        <volumesetid>Mandriva Linux - MES5 - x86_64</volumesetid>
-                        <publisherid>Mandriva</publisherid>
-                        <datapreparer>Mandriva-Linux BCD</datapreparer>
-                        <applicationid>Mandriva Linux - MES5</applicationid>
-                        <copyrightid>Mandriva Linux</copyrightid>
-                </header>
+		<header desc="Iso header info">
+			<systemid>Mandriva Linux</systemid>
+			<volumeid>MES5-DUAL</volumeid>
+			<volumesetid>Mandriva Linux - MES5 - DUAL DVD</volumesetid>
+			<publisherid>Mandriva</publisherid>
+			<datapreparer>Mandriva-Linux BCD</datapreparer>
+			<applicationid>Mandriva Linux - MES5</applicationid>
+			<copyrightid>Mandriva Linux</copyrightid>
+		</header>
 		<genisoimage desc="iso generation tool">
 			<options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 </options>
 			<bootcat>isolinux/boot.cat</bootcat>