diff options
| -rwxr-xr-x | create_dual.sh | 4 | ||||
| -rwxr-xr-x | create_dvd.sh | 4 | ||||
| -rw-r--r-- | dual.xml | 20 | ||||
| -rw-r--r-- | dual64.xml | 20 | ||||
| -rw-r--r-- | dvd_free-i586.xml | 18 | ||||
| -rw-r--r-- | dvd_free-x86_64.xml | 18 |
6 files changed, 42 insertions, 42 deletions
diff --git a/create_dual.sh b/create_dual.sh index c8bfd6a..a625635 100755 --- a/create_dual.sh +++ b/create_dual.sh @@ -3,7 +3,7 @@ DISTRIB=Mageia TREE=cauldron TAG=vanda -VERSION=4 +VERSION=5-beta2 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" +AGENISO="$DISTRIB - 5" PUBLISHER="Mageia.Org" SYSID="$PUBLISHER" TOOL="$SYSID BCD" diff --git a/create_dvd.sh b/create_dvd.sh index fe59961..bc6a73d 100755 --- a/create_dvd.sh +++ b/create_dvd.sh @@ -2,7 +2,7 @@ arch=$1 distrib=Mageia -version=4 +version=5-beta2 homebcd=/home/bcd/build_bcd bin=$homebcd/bcd pieces=$homebcd/pieces/iso @@ -20,7 +20,7 @@ rm -f $build/$arch/install/images/*nonfree* if [ "$arch" = "x86_64" ] then cd $build - tar -xvJf $pieces/DVD-efi.tar.xz + tar -xvJf $pieces/DVD-EFI.tar.xz cd - rm -f $homebcd/build/$distrib-$version-$arch/$arch/install/images/boot.iso fi @@ -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>4</based_on> + <based_on>cauldron</based_on> <checktool>rpmcheck</checktool> <arch>i586</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/4/i586/isolinux</fullpath> + <fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath> <!-- add hdt entry in syslinux.cfg --> <entry name="hdt" desc="core media"> - <bin>/home/bcd/build_bcd/pieces/4/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=modules.pci</append> @@ -29,7 +29,7 @@ <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/home/bcd/build_bcd/pieces/4/i586/isolinux/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> @@ -129,9 +129,9 @@ <mediainfo desc="All files relatives to media_info dir"> - <version>4</version> + <version>5-beta2</version> <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <fullpath>/home/bcd/build_bcd/pieces/4/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> @@ -154,7 +154,7 @@ <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> @@ -166,11 +166,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia - mageia dual 4 </volumeid> - <volumesetid>Mageia - 4 - dual</volumesetid> + <volumeid>Mageia - mageia dual 5-beta2 </volumeid> + <volumesetid>Mageia - 5-beta2 - dual</volumesetid> <publisherid>Mageia.Org</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>mageia-dual - 4</applicationid> + <applicationid>mageia-dual - 5-beta2</applicationid> <copyrightid>Mageia.Org</copyrightid> </header> <isohybrid> @@ -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>4</based_on> + <based_on>cauldron</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/4/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="Core media"> - <bin>/home/bcd/build_bcd/pieces/4/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> @@ -28,7 +28,7 @@ <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/home/bcd/build_bcd/pieces/4/x86_64/isolinux/modules.pcimap</file> + <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -128,9 +128,9 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>4</version> + <version>5-beta2</version> <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <fullpath>/home/bcd/build_bcd/pieces/4/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> @@ -153,7 +153,7 @@ <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>no</dualarch> @@ -165,11 +165,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia - mageia dual 4</volumeid> - <volumesetid>Mageia - 4</volumesetid> + <volumeid>Mageia - mageia dual 5-beta2</volumeid> + <volumesetid>Mageia - 5-beta2</volumesetid> <publisherid>Mageia.Org</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>mageia-dual - 4</applicationid> + <applicationid>mageia-dual - 5-beta2</applicationid> <copyrightid>Mageia.Org</copyrightid> </header> <isohybrid> diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml index ca88af0..6663f7a 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>4</based_on> + <based_on>cauldron</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/4/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/4/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> @@ -142,9 +142,9 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>4</version> + <version>5-beta2</version> <!-- set fullpath if you want to use an files in a non MDV repositery --> - <fullpath>/home/bcd/build_bcd/pieces/4/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> @@ -166,7 +166,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> @@ -178,11 +178,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia-4-i586</volumeid> - <volumesetid>Mageia 4 - i586 DVD</volumesetid> + <volumeid>Mageia-5-beta2-i586</volumeid> + <volumesetid>Mageia 5-beta2 - i586 DVD</volumesetid> <publisherid>Mageia</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>Mageia 4</applicationid> + <applicationid>Mageia 5-beta2</applicationid> <copyrightid>Mageia</copyrightid> </header> <isohybrid> diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml index 65a7488..1907b57 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>4</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/4/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/4/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,7 +30,7 @@ <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/home/bcd/build_bcd/pieces/4/x86_64/isolinux//modules.pcimap</file> + <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux//modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -143,7 +143,7 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>4</version> + <version>5-beta2</version> <!-- set fullpath if you want to use an files in a non MDV repositery --> <fullpath>/home/bcd/build_bcd/pieces/4/x86_64/media/media_info</fullpath> <mediainfo_dir>media/media_info</mediainfo_dir> @@ -167,7 +167,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> @@ -179,11 +179,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia-4-x86_64</volumeid> - <volumesetid>Mageia 4 - x86_64 DVD</volumesetid> + <volumeid>Mageia-5beta2-x86_64</volumeid> + <volumesetid>Mageia 5beta2 - x86_64 DVD</volumesetid> <publisherid>Mageia</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>Mageia 4</applicationid> + <applicationid>Mageia 5beta2</applicationid> <copyrightid>Mageia</copyrightid> </header> <isohybrid> |