diff options
| -rw-r--r-- | dual.xml | 62 | ||||
| -rw-r--r-- | dvd_free32.xml | 47 | ||||
| -rw-r--r-- | dvd_free64.xml | 51 | ||||
| -rw-r--r-- | lists/basesystem_mini | 1 | ||||
| -rw-r--r-- | lists/exclude_mini | 6 |
5 files changed, 128 insertions, 39 deletions
@@ -8,15 +8,21 @@ <!-- --> <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/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/</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>/usr/lib/drakx-installer-stage2/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath> --> @@ -72,6 +78,9 @@ <exclude name="mini"> <file>lists/exclude_mini</file> </exclude> + <exclude name="free"> + <file>lists/exclude_free</file> + </exclude> <exclude name="exclude"> <file>lists/exclude_mini32</file> </exclude> @@ -85,6 +94,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/i586/release</fullpath_mediadir> + </external> + <pubkey>media_info/pubkey</pubkey> + <release>yes</release> <updates>no</updates> <backport>no</backport> <testing>no</testing> @@ -116,7 +154,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> @@ -126,13 +164,13 @@ <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-deps32</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 ?"> @@ -163,11 +201,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mandriva Linux</systemid> - <volumeid>FREE-2010Spring-DUAL</volumeid> - <volumesetid>Mandriva Linux - 2010 Spring (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_free32.xml b/dvd_free32.xml index c142fb0..6dbbaa4 100644 --- a/dvd_free32.xml +++ b/dvd_free32.xml @@ -8,15 +8,16 @@ <!-- --> <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> <!--<fullpath></fullpath>--> + <fullpath>/home/bcd/2010.1/isolinux/</fullpath> <!-- add hdt entry in syslinux.cfg --> <entry name="hdt" desc="Main media"> <bin>/usr/lib/syslinux/hdt.c32</bin> @@ -27,7 +28,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> @@ -37,6 +38,7 @@ <installer desc="path to the Mandriva installer (stage1/stage2)"> <defaultpath>install</defaultpath> <!--<fullpath></fullpath>--> + <fullpath>/usr/lib/drakx-installer-stage2/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath>--> @@ -45,7 +47,7 @@ <!-- theme must be available to path altx/all.rdz files --> <theme name="mandriva-release-Free"> - <theme>mandriva-theme-Free</theme> + <theme>Mandriva-Free</theme> <bootsplash>Mandriva-Free</bootsplash> <bootsplash_path>/usr/share/plymouth</bootsplash_path> <gfxboot_path>/usr/share/gfxboot</gfxboot_path> @@ -90,6 +92,29 @@ --> <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> @@ -128,7 +153,7 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -137,13 +162,13 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>2010-spring</version> + <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> + <!--<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> - <filedeps>file-deps32</filedeps> + <filedeps>file-deps</filedeps> <filter>lists/extra-filter</filter> <urpmi_option>-a</urpmi_option> <askmedia desc="add for other media ?"> @@ -173,11 +198,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mandriva Linux</systemid> - <volumeid>FREE-2010S-i586</volumeid> - <volumesetid>Mandriva Linux - 2010 Spring (Free) - i586 DVD</volumesetid> + <volumeid>FREE-2010.2-i586</volumeid> + <volumesetid>Mandriva Linux - 2010.2 (Free) - i586 DVD</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_free64.xml b/dvd_free64.xml index 5376883..19a028f 100644 --- a/dvd_free64.xml +++ b/dvd_free64.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> <!-- <fullpath></fullpath> --> + <fullpath>/home/bcd/2010.1/isolinux/</fullpath> <!-- add hdt entry in syslinux.cfg --> <entry name="hdt" desc="Main media"> <bin>/usr/lib/syslinux/hdt.c32</bin> @@ -27,7 +28,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> @@ -37,6 +38,7 @@ <installer desc="path to the Mandriva installer (stage1/stage2)"> <defaultpath>install</defaultpath> <!--<fullpath></fullpath> --> + <fullpath>/usr/lib/drakx-installer-stage2/</fullpath> <advertising> <defaultpath>advertising</defaultpath> <!--<fullpath></fullpath> --> @@ -45,7 +47,7 @@ <!-- theme must be available to path altx/all.rdz files --> <theme name="mandriva-release-Free"> - <theme>mandriva-theme-Free</theme> + <theme>Mandriva-Free</theme> <bootsplash>Mandriva-Free</bootsplash> <bootsplash_path>/usr/share/plymouth</bootsplash_path> <gfxboot_path>/usr/share/gfxboot</gfxboot_path> @@ -81,7 +83,7 @@ <exclude> </exclude> <!-- nosuggests options should be yes or no --> - <nosuggests>no</nosuggests> + <nosuggests>yes</nosuggests> <!-- will be taken in {repo}{version}{arch}/media --> <mediadir>main</mediadir> <destmedia>main</destmedia> @@ -90,6 +92,29 @@ --> <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> @@ -128,7 +153,7 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>no</updates> + <updates>yes</updates> <backport>no</backport> <testing>no</testing> </list> @@ -137,13 +162,13 @@ </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</compssusers> - <filedeps>file-deps64</filedeps> + <filedeps>file-deps</filedeps> <filter>lists/extra-filter</filter> <urpmi_option>-a</urpmi_option> <askmedia desc="add for other media ?"> @@ -167,18 +192,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>FREE-2010S-x86_64</volumeid> - <volumesetid>Mandriva Linux - 2010 Spring (Free) - x86_64 DVD</volumesetid> + <volumeid>FREE-2010.2-x86_64</volumeid> + <volumesetid>Mandriva Linux - 2010.2 (Free) - x86_64 DVD</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/lists/basesystem_mini b/lists/basesystem_mini index 4ba6d91..519c128 100644 --- a/lists/basesystem_mini +++ b/lists/basesystem_mini @@ -145,3 +145,4 @@ glxinfo msec-gui mdkonline task-pulseaudio +notification-daemon diff --git a/lists/exclude_mini b/lists/exclude_mini index 28d06d0..52a8fd6 100644 --- a/lists/exclude_mini +++ b/lists/exclude_mini @@ -3,15 +3,15 @@ kdm vim-X11 mandriva-theme-Flash mandriva-theme-One -mandriva-theme-Free +mandriva-theme-Powerpack mandriva-theme-Mini mandriva-release-Flash mandriva-release-One -mandriva-release-Free +mandriva-release-Powerpack mandriva-release-Mini mandriva-lxde-config-Flash mandriva-lxde-config-One -mandriva-lxde-config-Free +mandriva-lxde-config-Powerpack mandriva-lxde-config-Mini policykit-kde polkit-kde-1 |