From 3e58c1ee79532469f4e7d1b0084f5f791a31c7ca Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Mon, 31 Oct 2011 09:46:13 +0000
Subject: - update isos configuration files - switch to trunk version of bcd -
 update Media.pm

---
 dual.xml | 81 ++++++++++++++++++----------------------------------------------
 1 file changed, 23 insertions(+), 58 deletions(-)

(limited to 'dual.xml')

diff --git a/dual.xml b/dual.xml
index 8c9b2ec..5040fe0 100644
--- a/dual.xml
+++ b/dual.xml
@@ -4,7 +4,7 @@
 	<nameid>mageia-dual</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>1</based_on>
+	<based_on>cauldron</based_on>
 	<!-- -->
 	<arch>i586</arch>
 	<repo desc="Where is the repositery of the distribution">
@@ -15,13 +15,12 @@
 	</workdir>
 	<tocopy_file>tocopy_bcd</tocopy_file>
         <chroot_media>Core</chroot_media>
-	<chroot_media_exclude>Core Backports,Core Testing</chroot_media_exclude>
+	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
-		<defaultpath>isolinux</defaultpath>
-		<!-- <fullpath></fullpath> -->
+		<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>
+		<entry name="hdt" desc="core media">
+			<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,14 +28,14 @@
 		<!-- 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>
+			<file>/usr/share/pci.ids</file>
                 </tocopy>
                 <tocopy></tocopy>
 	</isolinux>
-	<installer desc="path to the Mandriva installer (stage1/stage2)">
+	<installer desc="path to the Mageia installer (stage1/stage2)">
 		<defaultpath>install</defaultpath>
 		<!--<fullpath></fullpath> -->
 		<advertising>
@@ -47,17 +46,17 @@
 
 	<!-- theme must be available to path altx/all.rdz files -->
 	<theme name="mageia-release-Default">
-		<theme>Mageia-Default</theme>
-		<bootsplash>Mageia-Default</bootsplash>
+		<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>Core</first_media>
+		<first_media>core</first_media>
 		<update_prefix>Updates</update_prefix>
-		<list name="Main" desc="Main media">
+		<list name="Core" desc="Core media">
 			<!-- MANDATORY list of wanted packages on the iso -->
 			<input name="base">
 				<file>lists/basesystem_mini</file>
@@ -80,42 +79,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>
-			<!--
-			<fullpath_mediadir>/home/bcd/iso/final/t/i586/media/main</fullpath_mediadir>
-			-->
-			<pubkey>release/media_info/pubkey</pubkey>
-			<release>yes</release>
-			<updates>no</updates>
-			<backport>no</backport>
-			<testing>no</testing>
-		</list>
-		<list name="Contrib" desc="Contrib media">
-			<!-- MANDATORY list of wanted packages on the iso -->
-			<drop>yes</drop>
-			<input name="base">
-				<file>lists/dual_contrib</file>
-			</input>
-			<!-- to create an array you must keep this even if it is empty -->
-			<input name="base">
-				<file>lists/dual_contrib32</file>
-			</input>
-			<input>
-				<file>lists/kernel32_contrib</file>
-			</input>
-			<!-- MANDATORY list of unwanted packages on the iso -->
-			<!-- to create an array you must keep this even if it is empty -->
-			<exclude>
-				<file>lists/exclude_mini</file>
-			</exclude>
-			<exclude>
-			</exclude>
-			<!-- nosuggests options should be yes or no -->
-			<nosuggests>yes</nosuggests>
-			<!-- will be taken in {repo}{version}{arch}/media -->
-			<mediadir>contrib</mediadir>
-			<destmedia>contrib</destmedia>
+			<mediadir>core</mediadir>
+			<destmedia>core</destmedia>
 			<pubkey>release/media_info/pubkey</pubkey>
 			<release>yes</release>
 			<updates>no</updates>
@@ -128,13 +93,13 @@
 
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>1</version>
+	        <version>2-alpha1</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
-		<!--<fullpath>/home/bcd/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> -p</urpmi_option>
 		<askmedia desc="add for other media ?">
@@ -149,11 +114,11 @@
 	</mediainfo>
 	
 	<iso>
-		<tag>valstar</tag>
+		<tag>autumn</tag>
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>mageia-dual</product>
-		<branch>Official</branch>
+		<branch>Devel</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>yes</dualarch>
@@ -165,11 +130,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 1</volumeid>
-			<volumesetid>Mageia - 1 - dual</volumesetid>
+			<volumeid>Mageia - mageia dual 2 - alpha1</volumeid>
+			<volumesetid>Mageia - 2 - dual - alpha1</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
-			<datapreparer>Mandriva-Linux BCD</datapreparer>
-			<applicationid>mageia-dual - 1</applicationid>
+			<datapreparer>Mageia BCD</datapreparer>
+			<applicationid>mageia-dual - 2 - alpha1</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
 		<isohybrid>
-- 
cgit v1.2.1