aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dvd_free-i586.xml27
-rw-r--r--dvd_free-x86_64.xml26
2 files changed, 27 insertions, 26 deletions
diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml
index 8e1d024..b1ceacc 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>5</based_on>
+ <based_on>cauldron</based_on>
<!-- -->
<support>DVD</support>
<arch>i586</arch>
@@ -19,22 +19,23 @@
<chroot_media_exclude>Updates Testing</chroot_media_exclude>
<isolinux desc="isolinux info">
<!--<defaultpath>isolinux</defaultpath>-->
- <fullpath>/home/bcd/build_bcd/pieces/5/i586/isolinux</fullpath>
+ <fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath>
<!-- add hdt entry in syslinux.cfg -->
<entry name="hdt" desc="Main media">
- <bin>/home/bcd/build_bcd/pieces/5/i586/isolinux/hdt.c32</bin>
+ <bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin>
<label>hdt</label>
<kernel>hdt.c32</kernel>
- <append>modules_alias=modules.ali</append>
+ <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/iso/dual/isolinux/modules.alias</file>
+ <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/modules.alias</file>
</tocopy>
<tocopy name="ids">
- <file>/home/bcd/build_bcd/pieces/5/i586/isolinux/pci.ids</file>
+ <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/pci.ids</file>
</tocopy>
+
<tocopy></tocopy>
</isolinux>
<installer desc="path to the Mandriva installer (stage1/stage2)">
@@ -94,7 +95,7 @@
-->
<pubkey>release/media_info/pubkey</pubkey>
<release>yes</release>
- <updates>yes</updates>
+ <updates>no</updates>
<backport>no</backport>
<testing>no</testing>
</list>
@@ -145,9 +146,9 @@
</media>
<mediainfo desc="All files relatives to media_info dir">
- <version>5</version>
+ <version>6-dev1</version>
<!-- set fullpath if you want to use an files in a non MDV repositery -->
- <fullpath>/home/bcd/build_bcd/pieces/5/i586/media/media_info</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>
@@ -169,7 +170,7 @@
<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>
@@ -181,11 +182,11 @@
<synthesis>yes</synthesis>
<header desc="Iso header info">
<systemid>Mageia</systemid>
- <volumeid>Mageia-5-i586</volumeid>
- <volumesetid>Mageia 5 - i586 DVD</volumesetid>
+ <volumeid>Mageia-6-dev1-i586</volumeid>
+ <volumesetid>Mageia 6 dev1 - i586 DVD</volumesetid>
<publisherid>Mageia</publisherid>
<datapreparer>Mageia BCD</datapreparer>
- <applicationid>Mageia 5</applicationid>
+ <applicationid>Mageia 6 dev1</applicationid>
<copyrightid>Mageia</copyrightid>
</header>
<isohybrid>
diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml
index 307f87a..3fc84ff 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>5</based_on>
+ <based_on>cauldron</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/5/x86_64/isolinux</fullpath>
+ <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux</fullpath>
<!-- add hdt entry in syslinux.cfg -->
<entry name="hdt" desc="Main media">
- <bin>/home/bcd/build_bcd/pieces/5/x86_64/isolinux/hdt.c32</bin>
+ <bin>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32</bin>
<label>hdt</label>
<kernel>hdt.c32</kernel>
<append>modules=modules.pci</append>
@@ -30,10 +30,10 @@
<!-- keep this entry to create an array ref -->
<entry></entry>
<tocopy name="pcimap">
- <file>/home/bcd/build_bcd/pieces/5/x86_64/isolinux//modules.pcimap</file>
+ <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux//modules.pcimap</file>
</tocopy>
<tocopy name="ids">
- <file>/home/bcd/build_bcd/pieces/5/x86_64/isolinux/pci.ids</file>
+ <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/pci.ids</file>
</tocopy>
<tocopy></tocopy>
</isolinux>
@@ -136,7 +136,7 @@
-->
<pubkey>release/media_info/pubkey</pubkey>
<release>yes</release>
- <updates>yes</updates>
+ <updates>no</updates>
<backport>no</backport>
<testing>no</testing>
</list>
@@ -146,9 +146,9 @@
</media>
<mediainfo desc="All files relatives to media_info dir">
- <version>5</version>
+ <version>6-dev1</version>
<!-- set fullpath if you want to use an files in a non MDV repositery -->
- <fullpath>/home/bcd/build_bcd/pieces/5/x86_64/media/media_info</fullpath>
+ <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath>
<mediainfo_dir>media/media_info</mediainfo_dir>
<rpmsrate>rpmsrate</rpmsrate>
<compssusers>compssUsers.pl</compssusers>
@@ -170,7 +170,7 @@
<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>
@@ -182,15 +182,15 @@
<synthesis>yes</synthesis>
<header desc="Iso header info">
<systemid>Mageia</systemid>
- <volumeid>Mageia-5-x86_64</volumeid>
- <volumesetid>Mageia 5 - x86_64 DVD</volumesetid>
+ <volumeid>Mageia-6-dev1-x86_64</volumeid>
+ <volumesetid>Mageia 6 dev1 - x86_64 DVD</volumesetid>
<publisherid>Mageia</publisherid>
<datapreparer>Mageia BCD</datapreparer>
- <applicationid>Mageia 5</applicationid>
+ <applicationid>Mageia 6 dev1</applicationid>
<copyrightid>Mageia</copyrightid>
</header>
<isohybrid>
- <options>-o 1</options>
+ <options>-u</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>