diff options
| -rwxr-xr-x | create_dual.sh | 69 | ||||
| -rw-r--r-- | dual.xml | 4 | ||||
| -rw-r--r-- | dual64.xml | 62 | ||||
| -rw-r--r-- | dvd_pwp32.xml | 63 | ||||
| -rw-r--r-- | dvd_pwp64.xml | 67 |
5 files changed, 179 insertions, 86 deletions
diff --git a/create_dual.sh b/create_dual.sh index 9797ed9..8d912b3 100755 --- a/create_dual.sh +++ b/create_dual.sh @@ -1,34 +1,37 @@ #!/bin/sh TAG=farman -VERSION=2010-spring +VERSION=2010.2 VV=2010.1 +BUILD_BCD=`pwd`/build_bcd/ +MIRROR=/mnt/BIG/official/2010.1/i586/ + ./bcd.pl dual.xml all copy noiso nodoble ./bcd.pl dual64.xml all copy noiso nodoble -rm -vf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/boot.iso -rm -rvf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/alternatives -rm -vf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/boot.iso -rm -vrf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/alternatives +rm -vf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/boot.iso +rm -rvf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/alternatives +rm -vf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/boot.iso +rm -vrf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/alternatives sync -du -sh $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586 -du -sh $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 +du -sh $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586 +du -sh $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 -rm -rf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION -rm -rvf $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION -mkdir -p $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION -mkdir -p $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION +rm -rf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION +rm -rvf $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION +mkdir -p $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION +mkdir -p $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION -cp -af $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586 $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION -cp -af $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION +cp -af $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586 $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION +cp -af $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION -cp -af /mnt/pieces/pieces/$VV/i586/dosutils $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/ -cp -af /mnt/pieces/pieces/$VV/i586/autorun.inf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/ +cp -af $MIRROR/dosutils $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/ +cp -af $MIRROR/autorun.inf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/ -cd $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/x86_64/media/main +cd $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/x86_64/media/main for i in *noarch.rpm do @@ -43,7 +46,7 @@ do fi done -cat >> $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/i586/isolinux/isolinux.cfg <<EOF +cat >> $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/i586/isolinux/isolinux.cfg <<EOF label harddisk64 localboot 0x80 label linux64 @@ -77,31 +80,31 @@ label memtest64 kernel memtest EOF -#cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/i586/media/media_info/compssUsers.pl -#cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/x86_64/media/media_info/compssUsers.pl -cat $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/pkg-$VERSION-$TAG.idx >> \ - $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx -cat $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/pkg-$VERSION-$TAG.idx >> \ - $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx +#cp -avf $HOME/bcd/compssUsers.pl $BUILD_BCD/build/mandriva-linux-free-dual-$TAG-$VERSION/i586/media/media_info/compssUsers.pl +#cp -avf $HOME/bcd/compssUsers.pl $BUILD_BCD/build/mandriva-linux-free-dual-$TAG-$VERSION/x86_64/media/media_info/compssUsers.pl +cat $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586/pkg-$VERSION-$TAG.idx >> \ + $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx +cat $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/pkg-$VERSION-$TAG.idx >> \ + $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 \ - -A 'Mandriva Linux - 2010 Spring (Free)' \ + -A 'Mandriva Linux - 2010.2 (Free)' \ -publisher 'Mandriva' \ -sysid 'Mandriva Linux' \ -p 'Mandriva-Linux BCD' \ - -volset 'Mandriva Linux - 2010 Spring (Free) - DUAL CD' \ - -V 'FREE-2010S-DUAL' \ - -o '/home/plop/build_bcd/iso/mandriva-linux-free-dual-2010-spring/mandriva-linux-free-2010-spring-dual.iso' \ + -volset 'Mandriva Linux - 2010.2 (Free) - DUAL CD' \ + -V 'FREE-20102-DUAL' \ + -o "$BUILD_BCD/iso/mandriva-linux-free-dual-2010.2/mandriva-linux-free-2010.2-dual.iso" \ -b i586/isolinux/isolinux.bin \ -boot-info-table \ -quiet \ - $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/ + $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/ -du -sh $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso -echo "$HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx" -cd $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/ -isohybrid -fatfirst $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso -cp $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx . +du -sh $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso +echo "$BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx" +cd $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION/ +isohybrid -fatfirst $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso +cp $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx . md5sum mandriva-linux-free-$VERSION-dual.iso > mandriva-linux-free-$VERSION-dual.iso.md5 sha1sum mandriva-linux-free-$VERSION-dual.iso > mandriva-linux-free-$VERSION-dual.iso.sha1 @@ -17,7 +17,7 @@ <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <!-- <fullpath></fullpath> --> - <fullpath>/home/bcd/2010.1/isolinux/</fullpath> + <fullpath>/home/bcd/2010.1/isolinux-i586/</fullpath> <!-- <tocopy name="gfxboot"> <file>/usr/share/gfxboot/themes/Mandriva/install/</file> @@ -42,7 +42,7 @@ </isolinux> <installer desc="path to the Mandriva installer (stage1/stage2)"> <defaultpath>install</defaultpath> - <fullpath>/usr/lib/drakx-installer-stage2/</fullpath> + <fullpath>/home/bcd/2010.1/installer/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath> --> @@ -8,15 +8,21 @@ <!-- --> <arch>x86_64</arch> <repo desc="Where is the repositery of the distribution"> - <path>/home/plop/pieces</path> + <path>/mnt/BIG/official</path> </repo> <workdir desc="Where is my working dir"> - <path>/home/plop/build_bcd</path> + <path>/home/images/bcd/bcd/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <!-- <fullpath></fullpath> --> + <fullpath>/home/bcd/2010.1/isolinux-x86_64/</fullpath> + <!-- + <tocopy name="gfxboot"> + <file>/usr/share/gfxboot/themes/Mandriva/install/</file> + </tocopy> + --> <!-- add hdt entry in syslinux.cfg --> <entry name="hdt" desc="Main media"> <bin>/usr/lib/syslinux/hdt.c32</bin> @@ -27,7 +33,7 @@ <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/lib/modules/2.6.33.4-server-1mnb/modules.pcimap</file> + <file>/lib/modules/2.6.33.7-desktop-2mnb/modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -36,7 +42,7 @@ </isolinux> <installer desc="path to the Mandriva installer (stage1/stage2)"> <defaultpath>install</defaultpath> - <!--<fullpath></fullpath> --> + <fullpath>/home/bcd/2010.1/installer/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath> --> @@ -45,7 +51,7 @@ <!-- theme must be available to path altx/all.rdz files --> <theme name="mandriva-release-Free"> - <theme>Mandriva-Free</theme> + <theme>Mandriva-Free</theme> <bootsplash>Mandriva-Free</bootsplash> <bootsplash_path>/usr/share/plymouth</bootsplash_path> <gfxboot_path>/usr/share/gfxboot</gfxboot_path> @@ -84,6 +90,35 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> + <updates>yes</updates> + <backport>no</backport> + <testing>no</testing> + </list> + <list name="2010.2" desc="2010.2 media"> + <input name="base"> + <file>lists/basesystem_mini</file> + </input> + <input name="kernel"> + </input> + <input name="lang"> + </input> + <exclude name="mini"> + <file>lists/exclude_mini</file> + </exclude> + <exclude name="exclude"> + <file>lists/exclude_mini32</file> + </exclude> + <!-- will be taken in {repo}{version}{arch}/media --> + <mediadir>main2</mediadir> + <destmedia>main</destmedia> + <!-- + <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> + --> + <external name="2010.2"> + <fullpath_mediadir>/home/images/bcd/2010.1/x86_64/release</fullpath_mediadir> + </external> + <pubkey>media_info/pubkey</pubkey> + <release>yes</release> <updates>no</updates> <backport>no</backport> <testing>no</testing> @@ -110,7 +145,7 @@ <destmedia>contrib</destmedia> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -120,14 +155,15 @@ <list></list> </media> + <mediainfo desc="All files relatives to media_info dir"> - <version>2010-spring</version> + <version>2010.2</version> <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath> + <!-- <fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath> --> <mediainfo_dir>media/media_info</mediainfo_dir> <rpmsrate>rpmsrate</rpmsrate> - <compssusers>compssUsers.pl-dual</compssusers> - <filedeps>file-deps64</filedeps> + <compssusers>compssUsers.pl</compssusers> + <filedeps>file-deps</filedeps> <filter>lists/extra-filter</filter> <urpmi_option> -p</urpmi_option> <askmedia desc="add for other media ?"> @@ -158,11 +194,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mandriva Linux</systemid> - <volumeid>FREE-2010Spring-DUAL</volumeid> - <volumesetid>Mandriva Linux - 2010 Springi (Free) - DUAL CD</volumesetid> + <volumeid>FREE-2010.2-DUAL</volumeid> + <volumesetid>Mandriva Linux - 2010.2 (Free) - DUAL CD</volumesetid> <publisherid>Mandriva</publisherid> <datapreparer>Mandriva-Linux BCD</datapreparer> - <applicationid>Mandriva Linux - 2010 Spring (Free)</applicationid> + <applicationid>Mandriva Linux - 2010.2 (Free)</applicationid> <copyrightid>Mandriva Linux</copyrightid> </header> <genisoimage desc="iso generation tool"> diff --git a/dvd_pwp32.xml b/dvd_pwp32.xml index 9ff676e..128e517 100644 --- a/dvd_pwp32.xml +++ b/dvd_pwp32.xml @@ -2,21 +2,22 @@ <productname desc="The Linux product"> <nameid>mandriva-linux-pwp</nameid> - <nb_fork>15</nb_fork> + <nb_fork>10</nb_fork> <!-- you must specify on wich distrib this iso will be built --> <based_on>2010.1</based_on> <!-- --> <arch>i586</arch> <repo desc="Where is the repositery of the distribution"> - <path>/home/plop/pieces</path> + <path>/mnt/BIG/official</path> </repo> <workdir desc="Where is my working dir"> - <path>/home/plop/build_bcd</path> + <path>/home/bcd/bcd/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <firmware>yes</firmware> + <fullpath>/home/bcd/2010.1/isolinux-i586-pwp/</fullpath> <!-- <fullpath></fullpath> --> <!-- add hdt entry in syslinux.cfg --> <entry name="hdt" desc="Main media"> @@ -28,7 +29,7 @@ <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/lib/modules/2.6.33.4-server-1mnb/modules.pcimap</file> + <file>/lib/modules/2.6.33.7-desktop-2mnb/modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -38,6 +39,7 @@ <installer desc="path to the Mandriva installer (stage1/stage2)"> <defaultpath>install</defaultpath> <!--<fullpath></fullpath> --> + <fullpath>/home/bcd/2010.1/installer/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath> --> @@ -46,7 +48,7 @@ <!-- theme must be available to path altx/all.rdz files --> <theme name="mandriva-release-Powerpack"> - <theme>mandriva-theme-Powerpack</theme> + <theme>Mandriva-Powerpack</theme> <bootsplash>Mandriva-Powerpack</bootsplash> <bootsplash_path>/usr/share/plymouth</bootsplash_path> <gfxboot_path>/usr/share/gfxboot</gfxboot_path> @@ -58,11 +60,14 @@ <!-- futur feature will provide a way to specify another name for the basic repo of an MDV distribution --> <list name="Main" desc="Main media"> <!-- MANDATORY list of wanted packages on the iso --> + <input name="theme"> + <file>lists/theme-pwp</file> + </input> <input name="base"> <file>lists/input_cat_pwp</file> </input> - <input name="base"> - <file>lists/theme-pwp</file> + <input> + <file>lists/input_main_ooo3</file> </input> <!-- to create an array you must keep this even if it is empty --> <!-- MANDATORY list of unwanted packages on the iso --> @@ -83,6 +88,29 @@ <destmedia>main</destmedia> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> + <updates>yes</updates> + <backport>no</backport> + <testing>no</testing> + </list> + <list name="2010.2" desc="2010.2 media"> + <input name="base"> + <file>lists/basesystem_mini</file> + </input> + <input name="kernel"> + </input> + <input name="lang"> + </input> + <!-- will be taken in {repo}{version}{arch}/media --> + <mediadir>main2</mediadir> + <destmedia>main</destmedia> + <!-- + <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> + --> + <external name="2010.2"> + <fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir> + </external> + <pubkey>media_info/pubkey</pubkey> + <release>yes</release> <updates>no</updates> <backport>no</backport> <testing>no</testing> @@ -118,7 +146,7 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -148,7 +176,7 @@ <destmedia>restricted</destmedia> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -174,7 +202,7 @@ <!--<fullpath_mediadir>/home/plop/pieces/cooker/x86_64/media/non-free/release</fullpath_mediadir>--> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -183,9 +211,9 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>2010-spring</version> - <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <!--<fullpath></fullpath> --> + <version>2010.2</version> + <!-- set fullpath if you want to use an files in a non MDV repositery --> + <!--<fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>--> <mediainfo_dir>media/media_info</mediainfo_dir> <rpmsrate>rpmsrate</rpmsrate> <compssusers>compssUsers.pl</compssusers> @@ -202,7 +230,6 @@ <todo>no</todo> </xmlinfo> </mediainfo> - <iso> <tag>farman</tag> <minor>1</minor> @@ -213,18 +240,18 @@ <!-- dual arch not yet supported --> <dualarch>no</dualarch> <!-- SIZE is not YET USED !!! --> - <size>700</size> + <size>4000</size> <!-- 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>Mandriva Linux</systemid> - <volumeid>PWP-2010S-i586</volumeid> - <volumesetid>Mandriva Linux - 2010 Spring (Powerpack) - i586 DVD</volumesetid> + <volumeid>PWP-2010.2-i586</volumeid> + <volumesetid>Mandriva Linux - 2010.2 (Powerpack) - i586 DVD</volumesetid> <publisherid>Mandriva</publisherid> <datapreparer>Mandriva-Linux BCD</datapreparer> - <applicationid>Mandriva Linux - 2010 Spring (Powerpack)</applicationid> + <applicationid>Mandriva Linux - 2010.2 (Powerpack)</applicationid> <copyrightid>Mandriva Linux</copyrightid> </header> <genisoimage desc="iso generation tool"> diff --git a/dvd_pwp64.xml b/dvd_pwp64.xml index 3dc2fb9..8c0ab53 100644 --- a/dvd_pwp64.xml +++ b/dvd_pwp64.xml @@ -8,15 +8,16 @@ <!-- --> <arch>x86_64</arch> <repo desc="Where is the repositery of the distribution"> - <path>/home/plop/pieces</path> + <path>/mnt/BIG/official</path> </repo> <workdir desc="Where is my working dir"> - <path>/home/plop/build_bcd</path> + <path>/home/bcd/bcd/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <firmware>yes</firmware> + <fullpath>/home/bcd/2010.1/isolinux-x86_64-pwp/</fullpath> <!-- <fullpath></fullpath> --> <!-- add hdt entry in syslinux.cfg --> <entry name="hdt" desc="Main media"> @@ -28,7 +29,7 @@ <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/lib/modules/2.6.33.4-server-1mnb/modules.pcimap</file> + <file>/lib/modules/2.6.33.7-desktop-2mnb/modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -38,6 +39,7 @@ <installer desc="path to the Mandriva installer (stage1/stage2)"> <defaultpath>install</defaultpath> <!--<fullpath></fullpath> --> + <fullpath>/home/bcd/2010.1/installer/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath> --> @@ -46,7 +48,7 @@ <!-- theme must be available to path altx/all.rdz files --> <theme name="mandriva-release-Powerpack"> - <theme>mandriva-theme-Powerpack</theme> + <theme>Mandriva-Powerpack</theme> <bootsplash>Mandriva-Powerpack</bootsplash> <bootsplash_path>/usr/share/plymouth</bootsplash_path> <gfxboot_path>/usr/share/gfxboot</gfxboot_path> @@ -58,11 +60,14 @@ <!-- futur feature will provide a way to specify another name for the basic repo of an MDV distribution --> <list name="Main" desc="Main media"> <!-- MANDATORY list of wanted packages on the iso --> + <input name="theme"> + <file>lists/theme-pwp</file> + </input> <input name="base"> <file>lists/input_cat_pwp</file> </input> - <input name="base"> - <file>lists/theme-pwp</file> + <input> + <file>lists/input_main_ooo3</file> </input> <!-- to create an array you must keep this even if it is empty --> <!-- MANDATORY list of unwanted packages on the iso --> @@ -80,6 +85,29 @@ <destmedia>main</destmedia> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> + <updates>yes</updates> + <backport>no</backport> + <testing>no</testing> + </list> + <list name="2010.2" desc="2010.2 media"> + <input name="base"> + <file>lists/basesystem_mini</file> + </input> + <input name="kernel"> + </input> + <input name="lang"> + </input> + <!-- will be taken in {repo}{version}{arch}/media --> + <mediadir>main2</mediadir> + <destmedia>main</destmedia> + <!-- + <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> + --> + <external name="2010.2"> + <fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir> + </external> + <pubkey>media_info/pubkey</pubkey> + <release>yes</release> <updates>no</updates> <backport>no</backport> <testing>no</testing> @@ -118,7 +146,7 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -147,7 +175,7 @@ <destmedia>restricted</destmedia> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -174,7 +202,7 @@ <!--<fullpath_mediadir>/home/plop/pieces/cooker/x86_64/media/non-free/release</fullpath_mediadir>--> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -209,7 +237,7 @@ </external> <pubkey>media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -239,7 +267,7 @@ --> <pubkey>media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -269,7 +297,7 @@ </external> <pubkey>media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -279,9 +307,9 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>2010-spring</version> - <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <!--<fullpath></fullpath> --> + <version>2010.2</version> + <!-- set fullpath if you want to use an files in a non MDV repositery --> + <!--<fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>--> <mediainfo_dir>media/media_info</mediainfo_dir> <rpmsrate>rpmsrate</rpmsrate> <compssusers>compssUsers.pl</compssusers> @@ -298,7 +326,6 @@ <todo>no</todo> </xmlinfo> </mediainfo> - <iso> <tag>farman</tag> <minor>1</minor> @@ -309,18 +336,18 @@ <!-- dual arch not yet supported --> <dualarch>no</dualarch> <!-- SIZE is not YET USED !!! --> - <size>700</size> + <size>4000</size> <!-- 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>Mandriva Linux</systemid> - <volumeid>PWP-2010S-x86_64</volumeid> - <volumesetid>Mandriva Linux - 2010 Spring (Powerpack) - x86_64 DVD</volumesetid> + <volumeid>PWP-2010.2-x86_64</volumeid> + <volumesetid>Mandriva Linux - 2010.2 (Powerpack) - x86_64 DVD</volumesetid> <publisherid>Mandriva</publisherid> <datapreparer>Mandriva-Linux BCD</datapreparer> - <applicationid>Mandriva Linux - 2010 Spring (Powerpack)</applicationid> + <applicationid>Mandriva Linux - 2010.2 (Powerpack)</applicationid> <copyrightid>Mandriva Linux</copyrightid> </header> <genisoimage desc="iso generation tool"> |