Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r2105 | ennael | 2011-10-29 13:51:03 +0100 (Sat, 29 Oct 2011) | 2 lines

import bcd files for trunk (Mageia 2 alpha 1)

------------------------------------------------------------------------

1 files changed, 40 insertions, 73 deletions

diff --git a/dvd_free32.xml b/dvd_free32.xml
index 4883d57..53207e8 100644
--- a/dvd_free32.xml
+++ b/dvd_free32.xml
@@ -1,27 +1,27 @@
 <?xml version='1.0'?>
 
-<productname desc="The Linux product">
-	<nameid>mandriva-linux-free</nameid>
+<productname desc="Mageia DVD 32">
+	<nameid>mageia</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>2010.1</based_on>
+	<based_on>cauldron</based_on>
 	<!-- -->
 	<arch>i586</arch>
 	<repo desc="Where is the repositery of the distribution">
-		<path>/home/plop/pieces</path>
+		<path>/home/bcd/build_bcd/pieces</path>
 	</repo>
 	<workdir desc="Where is my working dir">
-		<path>/home/plop/build_bcd</path>
+		<path>/home/bcd/build_bcd</path>
 	</workdir>
 	<tocopy_file>tocopy_plop</tocopy_file>
-	<chroot_media>Main,Main Updates</chroot_media>
-	<chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude>
+	<chroot_media>Core</chroot_media>
+	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
-		<defaultpath>isolinux</defaultpath>
-		<!--<fullpath></fullpath>-->
+		<!--<defaultpath>isolinux</defaultpath>-->
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Main media">
-			<bin>/usr/lib/syslinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules=modules.pci</append>
@@ -29,7 +29,7 @@
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
 		<tocopy name="pcimap">
-			<file>/lib/modules/2.6.33.4-server-1mnb/modules.pcimap</file>
+			<file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux//modules.pcimap</file>
 		</tocopy>
 		<tocopy name="ids">
 			<file>/usr/share/pci.ids</file>	
@@ -47,17 +47,18 @@
 
 	<!-- theme must be available to path altx/all.rdz files -->
 	<theme name="mandriva-release-Free">
-		<theme>mandriva-theme-Free</theme>
-		<bootsplash>Mandriva-Free</bootsplash>
-		<bootsplash_path>/usr/share/plymouth</bootsplash_path>
-		<gfxboot_path>/usr/share/gfxboot</gfxboot_path>
+		<theme>mageia-theme-Default</theme>
+		<bootsplash>Default</bootsplash>
+		<bootsplash_path>/home/bcd/build_bcd/pieces/iso/plymouth</bootsplash_path>
+		<gfxboot_path>/home/bcd/build_bcd/pieces/iso/gfxboot</gfxboot_path>
 	</theme>
 
 	<media desc="media to take into account to build the ISO">
                <!-- name of the first media wich contains basesystem and kernels -->
-                <first_media>Main</first_media>
-                <update_prefix>Updates</update_prefix>
-		<list name="Main" desc="Main media">
+                <first_media>core</first_media>
+		<!--                <update_prefix>Updates</update_prefix> -->
+		<update_prefix>Updates</update_prefix>
+		<list name="core" desc="core media">
 			<!-- MANDATORY list of wanted packages on the iso -->
 			<input name="theme">
 				<file>lists/theme-free</file>
@@ -65,9 +66,9 @@
 			<input name="base">
 				<file>lists/input_cat</file>
 			</input>
-			<input>
-				<file>lists/input_main_ooo3</file>
-			</input>
+			<!-- <input>
+				<file>lists/input_main_lo</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">
@@ -85,8 +86,8 @@
 			<!-- nosuggests options should be yes or no -->
 			<nosuggests>yes</nosuggests>
 			<!-- will be taken in {repo}{version}{arch}/media -->
-			<mediadir>main</mediadir>
-			<destmedia>main</destmedia>
+			<mediadir>core</mediadir>
+			<destmedia>core</destmedia>
 			<!--
 			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
 			-->
@@ -96,56 +97,19 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
-		<list name="Contrib" desc="Contrib media">
-			<input name="base">
-				<file>lists/input_cat</file>
-			</input>
-			<!-- to create an array you must keep this even if it is empty -->
-			<input name="contrib32">
-				<file>lists/input_contrib32</file>
-			</input>
-			<input>
-				<file>lists/input_contrib</file>
-			</input>
-			<!-- MANDATORY list of unwanted packages on the iso -->
-			<exclude name="exclude">
-				<file>lists/exclude</file>
-			</exclude>
-			<exclude name="exclude">
-				<file>lists/exclude_free</file>
-			</exclude>
-			<exclude name="exclude">
-				<file>lists/exclude_tofix</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>contrib</mediadir>
-			<destmedia>contrib</destmedia>
-			<!--	
-			<fullpath_mediadir>/home/plop/build/2009.1/100/i586/media/contrib</fullpath_mediadir> 
-			-->
-			<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>2010-spring</version>
+	        <version>2</version>
 		<!-- set fullpath if you want to use an files in a non MDV repositery -->
-                <fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
-		<filedeps>file-deps32</filedeps>
+		<filedeps>file-deps</filedeps>
                 <filter>lists/no-filter</filter>
 		<urpmi_option>-a</urpmi_option>
 		<askmedia desc="add for other media ?">
@@ -159,11 +123,11 @@
 		</xmlinfo>
 	</mediainfo>
 	<iso>
-		<tag>farman</tag>
+		<tag>autumnm</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>Free</product>
-		<branch>Official</branch>
+		<branch>Devel</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -174,14 +138,17 @@
 		<hdlist>yes</hdlist>
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
-			<systemid>Mandriva Linux</systemid>
-			<volumeid>FREE-2010S-i586</volumeid>
-			<volumesetid>Mandriva Linux - 2010 Spring (Free) - i586 DVD</volumesetid>
-			<publisherid>Mandriva</publisherid>
-			<datapreparer>Mandriva-Linux BCD</datapreparer>
-			<applicationid>Mandriva Linux - 2010 Spring (Free)</applicationid>
-			<copyrightid>Mandriva Linux</copyrightid>
+			<systemid>Mageia</systemid>
+			<volumeid>FREE-2-i586-alpha1</volumeid>
+			<volumesetid>Mageia 2 - Alpha 1 - i586 DVD</volumesetid>
+			<publisherid>Mageia</publisherid>
+			<datapreparer>Mageia BCD</datapreparer>
+			<applicationid>Mageia 2 - Alpha 1</applicationid>
+			<copyrightid>Mageia</copyrightid>
 		</header>
+                <isohybrid>
+                        <options>--fatfirst</options>
+                </isohybrid>
 		<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>