diff options
| -rwxr-xr-x | create_dual.sh | 2 | ||||
| -rw-r--r-- | dual.xml | 12 | ||||
| -rw-r--r-- | dual64.xml | 12 | ||||
| -rw-r--r-- | dvd_free-i586.xml | 12 | ||||
| -rw-r--r-- | dvd_free-x86_64.xml | 12 | ||||
| -rw-r--r-- | lists/basesystem_mini | 12 | ||||
| -rw-r--r-- | lists/exclude | 1 |
7 files changed, 32 insertions, 31 deletions
diff --git a/create_dual.sh b/create_dual.sh index d017575..b8fa8c6 100755 --- a/create_dual.sh +++ b/create_dual.sh @@ -1,7 +1,7 @@ #!/bin/sh DISTRIB=Mageia -TREE=cauldron +TREE=3 TAG=vanda VERSION=3 SUPPORT=dual-CD @@ -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>3</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/cauldron/i586/isolinux</fullpath> + <fullpath>/home/bcd/build_bcd/pieces/3/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/3/i586/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/i586/isolinux/modules.pcimap</file> + <file>/home/bcd/build_bcd/pieces/3/i586/isolinux/modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -130,7 +130,7 @@ <mediainfo desc="All files relatives to media_info dir"> <version>3</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/3/i586/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>yes</dualarch> @@ -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>3</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/3/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/3/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/3/x86_64/isolinux/modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -130,7 +130,7 @@ <mediainfo desc="All files relatives to media_info dir"> <version>3</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/3/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> diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml index 6b5bce0..c70478b 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>3</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/3/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/3/i586/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/i586/isolinux//modules.pcimap</file> + <file>/home/bcd/build_bcd/pieces/3/i586/isolinux//modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -144,7 +144,7 @@ <mediainfo desc="All files relatives to media_info dir"> <version>3</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/3/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> diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml index 4b5ec9a..bf5da08 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>3</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/3/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/3/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/3/x86_64/isolinux//modules.pcimap</file> </tocopy> <tocopy name="ids"> <file>/usr/share/pci.ids</file> @@ -145,7 +145,7 @@ <mediainfo desc="All files relatives to media_info dir"> <version>3</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/3/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> diff --git a/lists/basesystem_mini b/lists/basesystem_mini index 9b412d2..228292a 100644 --- a/lists/basesystem_mini +++ b/lists/basesystem_mini @@ -66,13 +66,10 @@ openssh-server openssh-clients traceroute wget -lynx lsof -tcpdump gnupg file monitor-edid -vim-enhanced rsyslog urpmi aria2 @@ -126,12 +123,9 @@ x11-driver-video x11-driver-video-vboxvideo bridge-utils -smartmontools bash-completion -lshw screen iftop -tcpdump midori lxdm xdm @@ -144,3 +138,9 @@ virtualbox-guest-additions mgaonline shorewall-ipv6 openbox +gvfs +vim +fonts-ttf-dejavu +smartmontools +tcpdump +netsat diff --git a/lists/exclude b/lists/exclude index 6383f74..82a20a1 100644 --- a/lists/exclude +++ b/lists/exclude @@ -148,3 +148,4 @@ hunspell-gsc yofrankie-bge al-anvar celtx- +bijiben |