Merge branch 'master' of git://git.mageia.org/software/build-system/bcd

9 files changed, 80 insertions, 61 deletions

diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm
index 197d201..f410e2d 100644
--- a/BCD/Genisoimage.pm
+++ b/BCD/Genisoimage.pm
@@ -83,19 +83,28 @@ sub create_idx {
 
 sub create_iso {
 	# build the ISO with all args
+	# use -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot for EFI
 	print_color("$LOG Building the ISO", $color);
+
+        my $boot ="";
+	if ($nameid eq "Mageia" && $arch eq "x86_64") {
+        	$boot = "-boot-info-table -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot";
+	} else {
+        	$boot = "-boot-info-table";
+	}
+
 	my $cmd = "genisoimage $isoconf->{iso}{genisoimage}{options} \\
--A '$isoconf->{iso}{header}{applicationid}' \\
--publisher '$isoconf->{iso}{header}{publisherid}' \\
--sysid '$isoconf->{iso}{header}{systemid}' \\
--p '$isoconf->{iso}{header}{datapreparer}' \\
--volset '$isoconf->{iso}{header}{volumesetid}' \\
--V '$isoconf->{iso}{header}{volumeid}' \\
--o '$isodir/$isoname.iso' \\
--b isolinux/isolinux.bin \\
--boot-info-table \\
-$builddir/../
-";
+	-A '$isoconf->{iso}{header}{applicationid}' \\
+	-publisher '$isoconf->{iso}{header}{publisherid}' \\
+	-sysid '$isoconf->{iso}{header}{systemid}' \\
+	-p '$isoconf->{iso}{header}{datapreparer}' \\
+	-volset '$isoconf->{iso}{header}{volumesetid}' \\
+	-V '$isoconf->{iso}{header}{volumeid}' \\
+	-o '$isodir/$isoname.iso' \\
+	-b isolinux/isolinux.bin \\
+	$boot \\
+	$builddir/../
+	";
 #-quiet \\
 	print_color("\n------------\n $cmd", $color);
 	system($cmd);
diff --git a/BCD/Media.pm b/BCD/Media.pm
index dfbc5f1..c39652b 100644
--- a/BCD/Media.pm
+++ b/BCD/Media.pm
@@ -92,8 +92,8 @@ sub use_gendistrib {
 	    system("rm -vf $builddir/media/$destmedia/media_info/MD5SUM");
 	}
 	undef $destmedia;
-    	print_color("$LOG gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir", $color);
-	my $cmd = "gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir";
+    	print_color("$LOG gendistrib --nobadrpm --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir", $color);
+	my $cmd = "gendistrib --nobadrpm --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir";
     	system($cmd) == 0 or die "$LOG system $cmd failed: $?\n";
 	if ($isoconf->{based_on} lt "2009.1" || $isoconf->{based_on} eq "mes5") {
 		foreach my $media (@{$isoconf->{media}{list}}) {
diff --git a/create_dual.sh b/create_dual.sh
index 849fa11..c8bfd6a 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -3,7 +3,7 @@
 DISTRIB=Mageia
 TREE=cauldron
 TAG=vanda
-VERSION=4-beta2
+VERSION=4
 SUPPORT=dual-DVD
 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 - 4 beta 2"
+AGENISO="$DISTRIB - 4"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
diff --git a/create_dvd.sh b/create_dvd.sh
index adbde84..fe59961 100755
--- a/create_dvd.sh
+++ b/create_dvd.sh
@@ -2,7 +2,7 @@
 
 arch=$1
 distrib=Mageia
-version=4-beta2
+version=4
 homebcd=/home/bcd/build_bcd
 bin=$homebcd/bcd
 pieces=$homebcd/pieces/iso
@@ -17,5 +17,13 @@ cp -r $pieces/images/$arch $build/isolinux
 
 rm -f $build/$arch/install/images/*nonfree*
 
+if [ "$arch" = "x86_64" ]
+then	
+	cd $build
+	tar -xvJf $pieces/DVD-efi.tar.xz
+	cd -
+	rm -f $homebcd/build/$distrib-$version-$arch/$arch/install/images/boot.iso
+fi
+
 $bin/bcd.pl dvd_free-$arch.xml iso
 date > $homebcd/iso/$distrib-$version-$arch/DATE.txt
diff --git a/dual.xml b/dual.xml
index 8dc7a11..1140e08 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>cauldron</based_on>
+	<based_on>4</based_on>
 	<checktool>rpmcheck</checktool>
 	<arch>i586</arch>
 	<repo desc="Where is the repositery of the distribution">
@@ -17,18 +17,19 @@
         <chroot_media>Core</chroot_media>
 	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
-		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath> 
+		<fullpath>/home/bcd/build_bcd/pieces/4/i586/isolinux</fullpath> 
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="core media">
-			<bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/4/i586/isolinux/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>
                <tocopy name="pcimap">
-		       <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/modules.pcimap</file>
+		       <file>/home/bcd/build_bcd/pieces/4/i586/isolinux/modules.pcimap</file>
                 </tocopy>
                 <tocopy name="ids">
 			<file>/usr/share/pci.ids</file>
@@ -82,7 +83,7 @@
 			<destmedia>core</destmedia>
 			<pubkey>release/media_info/pubkey</pubkey>
 			<release>yes</release>
-			<updates>no</updates>
+			<updates>yes</updates>
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
@@ -118,7 +119,7 @@
                         -->
                         <pubkey>release/media_info/pubkey</pubkey>
                         <release>yes</release>
-                        <updates>no</updates>
+                        <updates>yes</updates>
                         <backport>no</backport>
                         <testing>no</testing>
                 </list>	
@@ -128,9 +129,9 @@
 
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>4-beta2</version>
+	        <version>4</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>
+		<fullpath>/home/bcd/build_bcd/pieces/4/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -153,7 +154,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>mageia-dual</product>
-		<branch>Devel</branch>
+		<branch>Official</branch>
 		<type>basic</type>
 		<!-- dual aRCh not yet supported -->
 		<dualarch>yes</dualarch>
@@ -165,11 +166,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 4 beta 2</volumeid>
-			<volumesetid>Mageia - 4 beta 2 - dual</volumesetid>
+			<volumeid>Mageia - mageia dual 4 </volumeid>
+			<volumesetid>Mageia - 4 - dual</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>mageia-dual - 4 beta 2</applicationid>
+			<applicationid>mageia-dual - 4</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
 		<isohybrid>
diff --git a/dual64.xml b/dual64.xml
index c54698d..f09d0bd 100644
--- a/dual64.xml
+++ b/dual64.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>cauldron</based_on>
+	<based_on>4</based_on>
 	<!-- -->
 	<arch>x86_64</arch>
 	<repo desc="Where is the repositery of the distribution">
@@ -17,10 +17,10 @@
         <chroot_media>Core</chroot_media>
         <chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
-		<fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/4/x86_64/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Core media">
-			<bin>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/4/x86_64/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules=modules.pci</append>
@@ -28,7 +28,7 @@
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
                <tocopy name="pcimap">
-		       <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/modules.pcimap</file>
+		       <file>/home/bcd/build_bcd/pieces/4/x86_64/isolinux/modules.pcimap</file>
                 </tocopy>
                 <tocopy name="ids">
                         <file>/usr/share/pci.ids</file>
@@ -118,7 +118,7 @@
                         -->
                         <pubkey>release/media_info/pubkey</pubkey>
                         <release>yes</release>
-                        <updates>no</updates>
+                        <updates>yes</updates>
                         <backport>no</backport>
                         <testing>no</testing>
                 </list>
@@ -128,9 +128,9 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>4-beta2</version>
+	        <version>4</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>
+                <fullpath>/home/bcd/build_bcd/pieces/4/x86_64/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -153,7 +153,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>mageia-dual</product>
-		<branch>Devel</branch>
+		<branch>Official</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -165,11 +165,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 4 beta 2</volumeid>
-			<volumesetid>Mageia - 4 beta 2</volumesetid>
+			<volumeid>Mageia - mageia dual 4</volumeid>
+			<volumesetid>Mageia - 4</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>mageia-dual - 4 beta 2</applicationid>
+			<applicationid>mageia-dual - 4</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml
index 8095faa..ca88af0 100644
--- a/dvd_free-i586.xml
+++ b/dvd_free-i586.xml
@@ -4,7 +4,7 @@
 	<nameid>Mageia</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>cauldron</based_on>
+	<based_on>4</based_on>
 	<!-- -->
 	<support>DVD</support>
 	<arch>i586</arch>
@@ -19,10 +19,10 @@
 	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
 		<!--<defaultpath>isolinux</defaultpath>-->
-		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/4/i586/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Main media">
-			<bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/4/i586/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules_alias=modules.ali</append>
@@ -142,9 +142,9 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>4-beta2</version>
+	        <version>4</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>
+		<fullpath>/home/bcd/build_bcd/pieces/4/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -166,7 +166,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>Free</product>
-		<branch>Devel</branch>
+		<branch>Official</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -178,11 +178,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia-4-beta2-i586</volumeid>
-			<volumesetid>Mageia 4 beta 2 - i586 DVD</volumesetid>
+			<volumeid>Mageia-4-i586</volumeid>
+			<volumesetid>Mageia 4 - i586 DVD</volumesetid>
 			<publisherid>Mageia</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>Mageia 4 beta 2 </applicationid>
+			<applicationid>Mageia 4</applicationid>
 			<copyrightid>Mageia</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml
index edf6da1..65a7488 100644
--- a/dvd_free-x86_64.xml
+++ b/dvd_free-x86_64.xml
@@ -4,7 +4,7 @@
 	<nameid>Mageia</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>cauldron</based_on>
+	<based_on>4</based_on>
 	<!-- -->
 	<support>DVD</support>
 	<arch>x86_64</arch>
@@ -19,10 +19,10 @@
 	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
 		<!--<defaultpath>isolinux</defaultpath>-->
-		<fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/4/x86_64/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Main media">
-			<bin>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/4/x86_64/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules=modules.pci</append>
@@ -30,7 +30,7 @@
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
 		<tocopy name="pcimap">
-			<file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux//modules.pcimap</file>
+			<file>/home/bcd/build_bcd/pieces/4/x86_64/isolinux//modules.pcimap</file>
 		</tocopy>
 		<tocopy name="ids">
 			<file>/usr/share/pci.ids</file>	
@@ -114,8 +114,8 @@
                         <exclude name="exclude">
                                 <file>lists/exclude</file>
                         </exclude>
-                        <exclude name="exclude_free">
-                                <file>lists/exclude_free</file>
+                        <exclude name="exclude_nonfree">
+                                <file>lists/exclude_nonfree</file>
                         </exclude>
                         <exclude name="exclude">
                                 <file>lists/exclude_tofix</file>
@@ -143,9 +143,9 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>4-beta2</version>
+	        <version>4</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>
+		<fullpath>/home/bcd/build_bcd/pieces/4/x86_64/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -167,7 +167,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>Free</product>
-		<branch>Devel</branch>
+		<branch>Official</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -179,18 +179,18 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia-4-beta2-x86_64</volumeid>
-			<volumesetid>Mageia 4 beta 2 - x86_64 DVD</volumesetid>
+			<volumeid>Mageia-4-x86_64</volumeid>
+			<volumesetid>Mageia 4 - x86_64 DVD</volumesetid>
 			<publisherid>Mageia</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>Mageia 4 beta 2</applicationid>
+			<applicationid>Mageia 4</applicationid>
 			<copyrightid>Mageia</copyrightid>
 		</header>
                 <isohybrid>
                         <options>-o 1</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>
+			<options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4</options>
 			<bootcat>isolinux/boot.cat</bootcat>
 			<!-- builddir and destdir will always use the workdir -->
 			<builddir>build</builddir>
diff --git a/lists/input_cat b/lists/input_cat
index 0aba48d..fa28006 100644
--- a/lists/input_cat
+++ b/lists/input_cat
@@ -77,6 +77,7 @@ task-kde4
 task-lxde
 task-cinnamon-minimal
 task-mate-minimal 
+task-razorqt
 lxde-common
 lxde-settings-daemon
 task-printing