update for final release

6 files changed, 75 insertions, 40 deletions

diff --git a/create_dual.sh b/create_dual.sh
index 7cc344a..d017575 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -3,7 +3,7 @@
 DISTRIB=Mageia
 TREE=cauldron
 TAG=vanda
-VERSION=3-beta3
+VERSION=3
 SUPPORT=dual-CD
 VV=1
 MEDIAMAIN=media/core
@@ -13,7 +13,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT"
 BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT"
 
 # genisoimage options
-AGENISO="$DISTRIB - 3 beta 3"
+AGENISO="$DISTRIB - 3 RC"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
@@ -41,7 +41,12 @@ do
 	cp -f $PIECES/iso/dual/compssUsers.pl $PIECES/iso/dual/rpmsrate $BUILDPATH/$i/media/media_info
 done
 sync
-cp -r $PIECES/iso/dual/isolinux $BUILDPATH
+cp -r $PIECES/iso/dual/syslinux $BUILDPATH
+
+for i in i586 x86_64
+do
+	perl -pi -e 's/Core media/Core Release/g' $BUILDPATH/$i/media/media_info/media.cfg
+done
 
 # use symbolic links on noarch
 cd $BUILDPATH/x86_64/$MEDIAMAIN
@@ -67,11 +72,6 @@ do
 	cp $PIECES/$TREE/i586/index.html $BUILDPATH/$i
 done
 
-# rename isolinux strings
-mv $BUILDPATH/isolinux $BUILDPATH/syslinux
-mv $BUILDPATH/syslinux/isolinux.cfg $BUILDPATH/syslinux/syslinux.cfg
-mv $BUILDPATH/syslinux/isolinux.bin $BUILDPATH/syslinux/syslinux.bin
-
 # build iso
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
 	-A "$AGENISO" \
diff --git a/create_dvd.sh b/create_dvd.sh
index e6136d5..74b6be3 100755
--- a/create_dvd.sh
+++ b/create_dvd.sh
@@ -2,7 +2,7 @@
 
 arch=$1
 distrib=Mageia
-version=3-beta3
+version=3
 homebcd=/home/bcd/build_bcd
 bin=$homebcd/bcd
 pieces=$homebcd/pieces/iso
@@ -11,8 +11,9 @@ build=$homebcd/build/$distrib-$version-$arch
 $bin/bcd.pl dvd_free-$arch.xml all noiso
 
 cp -af $pieces/hdt.c32 $build/$arch/isolinux
-cp -af $pieces/message $build/$arch/isolinux/bootlogo
+cp -af $pieces/bootlogo $build/$arch/isolinux
 cp -af $homebcd/pieces/$version/$arch/isolinux/isolinux-$arch.bin $build/$arch/isolinux
+cp -af $pieces/gfxboot.* $build/$arch/isolinux
 
 rm -f $build/$arch/install/images/*nonfree*
 
diff --git a/dual.xml b/dual.xml
index 3081423..126719c 100644
--- a/dual.xml
+++ b/dual.xml
@@ -5,8 +5,7 @@
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
 	<based_on>cauldron</based_on>
-	<!-- 
-	<checktool>rpmcheck</checktool>-->
+	<checktool>rpmcheck</checktool>
 	<arch>i586</arch>
 	<repo desc="Where is the repositery of the distribution">
 		<path>/home/bcd/build_bcd/pieces</path>
@@ -63,7 +62,7 @@
 				<file>lists/basesystem_mini</file>
 			</input>
 			<input name="kernel">
-				<file>lists/kernel32</file>
+				<file>lists/kernel32_mini</file>
 			</input>
 			<!-- to create an array you must keep this even if it is empty -->
 			<input name="lang">
@@ -78,19 +77,19 @@
                         </exclude>
 			<!-- nosuggests options should be yes or no -->
 			<nosuggests>yes</nosuggests>
-			<!-- will be taken in {repo}{version}{arch}/media -->
+			<!-- will be taken in {repo}{version}{aRCh}/media -->
 			<mediadir>core</mediadir>
 			<destmedia>core</destmedia>
 			<pubkey>release/media_info/pubkey</pubkey>
 			<release>yes</release>
-			<updates>yes</updates>
+			<updates>no</updates>
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
-	                <list name="nonfree" desc="nonfree media">
+	                <list name="nonfree" desc="Nonfree Release">
                         <!-- MANDATORY list of wanted packages on the iso -->
                         <input name="base">
-                                <file>lists/input_cat</file>
+                                <file>lists/basesystem_mini</file>
                         </input>
                         <input>
                                 <file>lists/nonfree_mini</file>
@@ -111,7 +110,7 @@
                         </exclude>
                         <!-- nosuggests options should be yes or no -->
                         <nosuggests>yes</nosuggests>
-                        <!-- will be taken in {repo}{version}{arch}/media -->
+                        <!-- will be taken in {repo}{version}{aRCh}/media -->
                         <mediadir>nonfree</mediadir>
                         <destmedia>nonfree</destmedia>
                         <!--
@@ -119,7 +118,7 @@
                         -->
                         <pubkey>release/media_info/pubkey</pubkey>
                         <release>yes</release>
-                        <updates>yes</updates>
+                        <updates>no</updates>
                         <backport>no</backport>
                         <testing>no</testing>
                 </list>	
@@ -129,7 +128,7 @@
 
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3-beta3</version>
+	        <version>3</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
 		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
@@ -156,21 +155,21 @@
 		<product>mageia-dual</product>
 		<branch>Devel</branch>
 		<type>basic</type>
-		<!-- dual arch not yet supported -->
+		<!-- dual aRCh not yet supported -->
 		<dualarch>yes</dualarch>
 		<!-- SIZE is not YET USED !!! -->
 		<size>700</size>
-		<!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{arch} -->
+		<!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{aRCh} -->
 		<mediacfg>media/media_info/media.cfg</mediacfg>
 		<hdlist>yes</hdlist>
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 3 beta 3</volumeid>
-			<volumesetid>Mageia - 3 beta3 - dual</volumesetid>
+			<volumeid>Mageia - mageia dual 3</volumeid>
+			<volumesetid>Mageia - 3 - dual</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>mageia-dual - 3 beta3</applicationid>
+			<applicationid>mageia-dual - 3</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
 		<isohybrid>
diff --git a/dual64.xml b/dual64.xml
index 753f510..61bdad5 100644
--- a/dual64.xml
+++ b/dual64.xml
@@ -62,7 +62,7 @@
 				<file>lists/basesystem_mini</file>
 			</input>
 			<input name="kernel">
-				<file>lists/kernel64</file>
+				<file>lists/kernel64_mini</file>
 			</input>
 			<!-- to create an array you must keep this even if it is empty -->
 			<input name="lang">
@@ -86,14 +86,49 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
-                <!-- keep this entry to create an array ref -->
-                <list></list>
+                        <list name="Nonfree" desc="Nonfree Release">
+                        <!-- MANDATORY list of wanted packages on the iso -->
+                        <input name="base">
+                                <file>lists/basesystem_mini</file>
+                        </input>
+                        <input>
+                                <file>lists/nonfree_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</file>
+                        </exclude>
+                        <exclude name="exclude_free">
+                                <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>yes</nosuggests>
+                        <!-- will be taken in {repo}{version}{arch}/media -->
+                        <mediadir>nonfree</mediadir>
+                        <destmedia>nonfree</destmedia>
+                        <!--
+                        <fullpath_mediadir>/home/plop/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>
+
 		<!-- keep this entry to create an array ref -->
 		<list></list>
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3-beta3</version>
+	        <version>3</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
                 <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
@@ -130,11 +165,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 3 beta 3</volumeid>
-			<volumesetid>Mageia - 3 beta 3</volumesetid>
+			<volumeid>Mageia - mageia dual 3</volumeid>
+			<volumesetid>Mageia - 3</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>mageia-dual - 3 beta 3</applicationid>
+			<applicationid>mageia-dual - 3</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml
index 0d5edd3..6b5bce0 100644
--- a/dvd_free-i586.xml
+++ b/dvd_free-i586.xml
@@ -142,7 +142,7 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3-beta3</version>
+	        <version>3</version>
 		<!-- set fullpath if you want to use an files in a non MDV repositery -->
 		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
@@ -178,11 +178,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia-3 beta3-i586</volumeid>
-			<volumesetid>Mageia 3 beta 3 - i586 DVD</volumesetid>
+			<volumeid>Mageia-3-i586</volumeid>
+			<volumesetid>Mageia 3 - i586 DVD</volumesetid>
 			<publisherid>Mageia</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>Mageia 3 beta 3</applicationid>
+			<applicationid>Mageia 3</applicationid>
 			<copyrightid>Mageia</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml
index 70e7dd3..4b5ec9a 100644
--- a/dvd_free-x86_64.xml
+++ b/dvd_free-x86_64.xml
@@ -143,7 +143,7 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3-beta3</version>
+	        <version>3</version>
 		<!-- set fullpath if you want to use an files in a non MDV repositery -->
 		<fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
@@ -179,11 +179,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia-3 beta3-x86_64</volumeid>
-			<volumesetid>Mageia 3 beta3 - x86_64 DVD</volumesetid>
+			<volumeid>Mageia-3-x86_64</volumeid>
+			<volumesetid>Mageia 3 - x86_64 DVD</volumesetid>
 			<publisherid>Mageia</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>Mageia 3 beta3</applicationid>
+			<applicationid>Mageia 3</applicationid>
 			<copyrightid>Mageia</copyrightid>
 		</header>
                 <isohybrid>