diff options
-rw-r--r-- | BCD/Media.pm | 2 | ||||
-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 | ||||
-rw-r--r-- | lists/basesystem_mini | 3 | ||||
-rw-r--r-- | lists/exclude | 14 | ||||
-rw-r--r-- | lists/exclude_mini | 2 | ||||
-rw-r--r-- | lists/exclude_nonfree | 4 | ||||
-rw-r--r-- | lists/exclude_tofix | 5 | ||||
-rw-r--r-- | lists/input_cat | 26 | ||||
-rw-r--r-- | lists/input_main | 6 | ||||
-rw-r--r-- | lists/input_nonfree | 45 | ||||
-rw-r--r-- | lists/kernel32 | 5 | ||||
-rw-r--r-- | lists/kernel64 | 8 |
17 files changed, 149 insertions, 55 deletions
diff --git a/BCD/Media.pm b/BCD/Media.pm index 2112507..c39652b 100644 --- a/BCD/Media.pm +++ b/BCD/Media.pm @@ -425,7 +425,7 @@ sub create_list { # my $list_filename_update = "$isoconf->{tocopy_file}_todo_$media->{name}_update"; my $list = "$chroot_path/urpmq/$list_filename"; my $list_update = "$chroot_path/urpmq/$list_filename" . "_update"; - system("sudo chroot $chroot_path mkdir -m 777 -p urpmq"); + system("mkdir -m 777 -p $chroot_path/urpmq"); # urpmq error file my $urpmq_error = "$chroot_path/$isoconf->{tocopy_file}_urpmi_error_$media->{name}"; my $urpmq_error_update = "$chroot_path/$isoconf->{tocopy_file}_urpmi_error_update_$media->{name}"; 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> diff --git a/lists/basesystem_mini b/lists/basesystem_mini index 299d526..6a1f498 100644 --- a/lists/basesystem_mini +++ b/lists/basesystem_mini @@ -55,6 +55,7 @@ dvd+rw-tools cdrkit rsync grub +efibootmgr grub2 os-prober acpi @@ -183,3 +184,5 @@ netstat-nat iftop logcheck +oxygen-gtk +oxygen-gtk3 diff --git a/lists/exclude b/lists/exclude index 8e0b7d8..3644241 100644 --- a/lists/exclude +++ b/lists/exclude @@ -150,5 +150,17 @@ al-anvar celtx- bijiben -kernel-source qt4-doc +stellarium + +apper +*kernel*3.12.8* +*kernel*3.12.9* +*kernel*3.12.13* + +kernel-source +kernel-source-latest +anjuta +kf5-libkscreen +samba4-client +scribus diff --git a/lists/exclude_mini b/lists/exclude_mini index 8bdb2f5..17b9281 100644 --- a/lists/exclude_mini +++ b/lists/exclude_mini @@ -28,3 +28,5 @@ x11-font-bh-type1 nvidia-nsight nvidia-visual-profiler python3 +*kernel-*3.12.9-1* + diff --git a/lists/exclude_nonfree b/lists/exclude_nonfree index 6c8e978..6866b83 100644 --- a/lists/exclude_nonfree +++ b/lists/exclude_nonfree @@ -1,2 +1,6 @@ cg cg-examples +broadcom-wl-kernel-desktop-latest-6.30.223.141-25 +broadcom-wl-kernel-server-latest-6.30.223.141-25 +broadcom-wl-kernel-desktop-latest-6.30.223.141-24 +broadcom-wl-kernel-server-latest-6.30.223.141-24 diff --git a/lists/exclude_tofix b/lists/exclude_tofix index 6589ef7..080a7f2 100644 --- a/lists/exclude_tofix +++ b/lists/exclude_tofix @@ -25,3 +25,8 @@ uClibc-libopenssl0.9.7-devel #nspluginwrapper #nspluginwrapper-i386 hugs98 +hugin +2mandvd +celestia +xfig +kde-l10n-handbooks-pt_BR diff --git a/lists/input_cat b/lists/input_cat index fa28006..c34cfcd 100644 --- a/lists/input_cat +++ b/lists/input_cat @@ -95,8 +95,24 @@ task-x11 task-e17 oxygen-gtk oxygen-gtk3 -x11-driver-input-* x11-driver-video-* +x11-driver-input +x11-driver-input-acecad +x11-driver-input-aiptek +x11-driver-input-evdev +x11-driver-input-evdev-devel +x11-driver-input-evtouch +x11-driver-input-fpit +x11-driver-input-hyperpen +x11-driver-input-joystick +x11-driver-input-keyboard +x11-driver-input-mouse +x11-driver-input-mutouch +x11-driver-input-penmount +x11-driver-input-synaptics +x11-driver-input-vmmouse +x11-driver-input-void +x11-driver-input-wacom # usefull tools xen-hypervisor @@ -143,7 +159,6 @@ colorprompt chromium-browser-stable vlc kernel-firmware -icedtea-web gnumeric abiword @@ -248,9 +263,6 @@ wmcalclock marble kdegames4 guile1.8 -telepathy-haze -tomcat6-jsp-2.1-api -caribou net_monitor util-linux rsyslog @@ -258,7 +270,6 @@ grub2 os-prober grub2-mageia-theme shorewall-ipv6 -# rpmcheck apper itext kmediafactory @@ -290,8 +301,9 @@ java-gcj-compat gnome-session gnome-classic-session -anjuta cinnamon gnome-terminal-nautilus mageiawelcome usbutils + +efibootmgr diff --git a/lists/input_main b/lists/input_main index 2032cd7..c2925cb 100644 --- a/lists/input_main +++ b/lists/input_main @@ -232,3 +232,9 @@ libcg-devel net_monitor +# after checking prefer.vendor.list +vim-minimal +gnome-speech-driver-espeak +pulseaudio-esound-compat +pinentry-gtk2 + diff --git a/lists/input_nonfree b/lists/input_nonfree index 8876b44..17c8215 100644 --- a/lists/input_nonfree +++ b/lists/input_nonfree @@ -1,9 +1,5 @@ atmel-firmware bluez-firmware -broadcom-wl-kernel-* -broadcom-wl-kernel-desktop586-latest -broadcom-wl-kernel-desktop-latest -broadcom-wl-kernel-server-latest dkms-broadcom-wl dkms-fglrx dkms-nvidia173 @@ -28,6 +24,9 @@ nvidia173-cuda nvidia173-devel nvidia173-doc-html nvidia173-kernel-* +nvidia173-kernel-desktop586-latest +nvidia173-kernel-desktop-latest +nvidia173-kernel-server-latest nvidia304-cuda-opencl nvidia304-devel nvidia304-doc-html @@ -54,3 +53,41 @@ x11-driver-video-fglrx x11-driver-video-nvidia173 x11-driver-video-nvidia304 x11-driver-video-nvidia-current + +broadcom-wl-kernel-desktop-latest-6.30.223.141-27 +broadcom-wl-kernel-desktop586-latest-6.30.223.141-27 +broadcom-wl-kernel-server-latest-6.30.223.141-27 +broadcom-wl-kernel-3.12.13-desktop-2.mga4-6.30.223.141-27 +broadcom-wl-kernel-3.12.13-server-2.mga4-6.30.223.141-27 +broadcom-wl-kernel-desktop-latest-6.30.223.141-27 +broadcom-wl-kernel-server-latest-6.30.223.141-27 +dkms-nvidia-current-331.49-1 +fglrx-kernel-3.12.13-desktop-2.mga4-13.251-12 +fglrx-kernel-3.12.13-desktop586-2.mga4-13.251-12 +fglrx-kernel-3.12.13-server-2.mga4-13.251-12 +fglrx-kernel-desktop-latest-13.251-12 +fglrx-kernel-desktop586-latest-13.251-12 +fglrx-kernel-server-latest-13.251-12 +nvidia173-kernel-3.12.13-desktop-2.mga4-173.14.39-13 +nvidia173-kernel-3.12.13-desktop586-2.mga4-173.14.39-13 +nvidia173-kernel-3.12.13-server-2.mga4-173.14.39-13 +nvidia173-kernel-desktop-latest-173.14.39-13 +nvidia173-kernel-desktop586-latest-173.14.39-13 +nvidia173-kernel-server-latest-173.14.39-13 +nvidia304-kernel-3.12.13-desktop-2.mga4-304.119-5 +nvidia304-kernel-3.12.13-desktop586-2.mga4-304.119-5 +nvidia304-kernel-3.12.13-server-2.mga4-304.119-5 +nvidia304-kernel-desktop-latest-304.119-5 +nvidia304-kernel-desktop586-latest-304.119-5 +nvidia304-kernel-server-latest-304.119-5 +nvidia-current-cuda-opencl-331.49-1 +nvidia-current-devel-331.49-1 +nvidia-current-doc-html-331.49-1 +nvidia-current-kernel-3.12.13-desktop-2.mga4-331.49-2 +nvidia-current-kernel-3.12.13-desktop586-2.mga4-331.49-2 +nvidia-current-kernel-3.12.13-server-2.mga4-331.49-2 +nvidia-current-kernel-desktop-latest-331.49-2 +nvidia-current-kernel-desktop586-latest-331.49-2 +nvidia-current-kernel-server-latest-331.49-2 +x11-driver-video-nvidia-current-331.49-1 + diff --git a/lists/kernel32 b/lists/kernel32 index 6d570a3..317996e 100644 --- a/lists/kernel32 +++ b/lists/kernel32 @@ -22,3 +22,8 @@ libfonts libkmf0 liblayout libossp_uuid-devel +libmate-polkit1_0 +nvidia173-kernel-desktop586-latest +nvidia173-kernel-desktop-latest +nvidia173-kernel-server-latest +liblightdm-gobject1_0 diff --git a/lists/kernel64 b/lists/kernel64 index 98b5e40..8eda87c 100644 --- a/lists/kernel64 +++ b/lists/kernel64 @@ -20,3 +20,11 @@ lib64fonts lib64kmf0 lib64layout lib64ossp_uuid-devel +lib64mate-polkit1_0 +nvidia173-kernel-desktop-latest +nvidia173-kernel-server-latest +efibootmgr +kernel-server +broadcom-wl-kernel-desktop +broadcom-wl-kernel-server +lib64lightdm-gobject1_0 |