aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2014-06-18 22:44:14 +0200
committerAnne Nicolas <ennael@mageia.org>2014-06-18 22:44:14 +0200
commitad0200fc42edc3b5cbabda080ce801d8aa658e74 (patch)
treeda57511744b2504b991c3d96c5b4991c41b8376d
parentb23ae3bbd77d4a912c1584c4ae5dd0ed53993164 (diff)
downloadbcd-ad0200fc42edc3b5cbabda080ce801d8aa658e74.tar
bcd-ad0200fc42edc3b5cbabda080ce801d8aa658e74.tar.gz
bcd-ad0200fc42edc3b5cbabda080ce801d8aa658e74.tar.bz2
bcd-ad0200fc42edc3b5cbabda080ce801d8aa658e74.tar.xz
bcd-ad0200fc42edc3b5cbabda080ce801d8aa658e74.zip
Mageia 4 configuration files for isosdistro/mga4
-rw-r--r--dual.xml25
-rw-r--r--dual64.xml22
-rw-r--r--dvd_free-i586.xml18
-rw-r--r--dvd_free-x86_64.xml26
4 files changed, 46 insertions, 45 deletions
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>