From f842044af69dbc96aab8bf92f2544609d2122d28 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 16 Aug 2012 11:49:11 +0200 Subject: [PATCH] autodist: configuration update for all archs --- etc/autodist/blacklist | 1 + etc/autodist/config | 8 ++++---- etc/autodist/distdb | 30 ++++++++++++++++++++++-------- etc/autodist/distdb.arm | 4 ++-- etc/autodist/distdb.i586 | 18 ++++++++++++++++++ etc/autodist/distdb.x86_64 | 36 ++++++++++++++++++------------------ etc/autodist/legacy | 12 ++++++++++++ etc/autodist/unstage.arm | 11 +++++++++++ etc/autodist/unstage.x86_64 | 5 +++++ 9 files changed, 93 insertions(+), 32 deletions(-) diff --git a/etc/autodist/blacklist b/etc/autodist/blacklist index 7e1f830..0478250 100644 --- a/etc/autodist/blacklist +++ b/etc/autodist/blacklist @@ -18,3 +18,4 @@ libqt distromatic u-boot openmamba-distro-compat +xorg-apps diff --git a/etc/autodist/config b/etc/autodist/config index fffb0f4..bc98dae 100644 --- a/etc/autodist/config +++ b/etc/autodist/config @@ -3,14 +3,14 @@ REPS_BASE_URL=http://www.openmamba.org/pub/openmamba LOCAL_REPS_BASE_DIR=/var/ftp/pub/openmamba SEND_SERVER=devel-autodist -GNOME_VER=2.32.0 -AUTOBUILD_MAXNUM=150 +GNOME_VER=3.4 +AUTOBUILD_MAXNUM=200 AUTOBUILD_DATEFROM=20060601 -AUTOBUILD_SKIP_DAYS=7 +AUTOBUILD_SKIP_DAYS=28 AUTOBUILD_SUCCESS_DAYS=3 AUTODIST_REPOSITORY=devel-autodist AUTODIST_DELAYED_REPOSITORY=devel-future AUTODIST_REPOSITORIES=(devel devel-games devel-makedist devel-kernel devel-xorg devel-kde4 devel-autodist) AUTOPORT_STAGEVARS="--define stage1=1" -AUTOPORT_MAX_STEPS=15 +AUTOPORT_MAX_STEPS=10 #RPMDIR=/usr/src/RPM diff --git a/etc/autodist/distdb b/etc/autodist/distdb index c854b7e..35666f7 100644 --- a/etc/autodist/distdb +++ b/etc/autodist/distdb @@ -57,20 +57,20 @@ i586,mamba-64GB,3.0 kernel_packages=( hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ -broadcom-sta,stk11xx,cm2020,rtl8192se +broadcom-sta,stk11xx,cm2020 target,KERNEL_TARGET,KERNEL_VER i586,mamba,- i586,mamba-64GB,- ) kernel_packages_new=( -hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,NVIDIA,\ broadcom-sta,stk11xx,cm2020 target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.2 -i586,mamba-64GB,3.2 +i586,mamba,3.4 +i586,mamba-64GB,3.4 ) -#rtl8192se +#NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,ndiswrapper, #ppc,mamba #x86_64,mamba @@ -242,7 +242,22 @@ kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n ) kde4=( -kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kde-workspace,kde-wallpapers,kde-baseapps,kdepim4,\ +kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,kdepim4,\ +kdepim-runtime,kdeadmin,kdenetwork4,kdeartwork,kdegames,kdetoys,kdesdk,marble,\ +kdeplasma-addons,kde-l10n,blinken,cantor,gwenview,libkdeedu,analitza,kalgebra,kalzium,kamera,\ +kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ +klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libkdcraw,libkexiv2,libkipi,libksane,\ +okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ +kross-interpreters,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\ +ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\ +jovie,kmousetool,kmouth,qyoto,kaccessible,printer-applet,kdegraphics-mobipocket +%build_and_install +1 +) +#kdemultimedia, ksecrets + +kde48=( +kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,kdepim4,\ kdepim-runtime,kdeadmin,kdemultimedia,kdenetwork4,kdeartwork,kdegames,kdetoys,kdesdk,marble,\ kdeplasma-addons,kde-l10n,blinken,cantor,gwenview,libkdeedu,kalgebra,kalzium,kamera,\ kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ @@ -250,8 +265,7 @@ klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libkdcraw,libkexiv2, okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ kross-interpreters,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\ ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\ -analitza,jovie,kmousetool,kmouth,qyoto,kaccessible,ksecrets,printer-applet,\ -kdegraphics-mobipocket,kactivities +analitza,jovie,kmousetool,kmouth,qyoto,kaccessible,ksecrets,printer-applet,kdegraphics-mobipocket %build_and_install 1 ) diff --git a/etc/autodist/distdb.arm b/etc/autodist/distdb.arm index de7c02c..d979afe 100644 --- a/etc/autodist/distdb.arm +++ b/etc/autodist/distdb.arm @@ -20,7 +20,7 @@ avr,avr glibc=( glibc cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER,build_doc,build_profile,build_selinux -arm,-,-,mamba-arm,-,0,0,0 +arm,-,-,mamba-arm,3.2,0,0,0 ) kernel=( @@ -62,8 +62,8 @@ bootstrap gcc=( gcc cross_target_cpu,_target_platform,disable_java,disable_gjdoc +arm,arm-openmamba-linux-gnueabi,-,1 avr,avr,1,- -arm,arm-openmamba-linux-gnueabi,1,1 ) udev=( diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586 index 6ae0002..73bca6d 100644 --- a/etc/autodist/distdb.i586 +++ b/etc/autodist/distdb.i586 @@ -97,9 +97,21 @@ x86_64,1,x86_64-openmamba-linux-gnu gcc_cross=( gcc cross_target_cpu,_target_platform,disable_java +x86_64,x86_64-openmamba-linux-gnu,1 +arm,arm-openmamba-linux-gnueabi,1 +ppc,ppc-openmamba-linux-gnu,1 avr,avr,1 ) +glibc_cross=( +glibc +target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER +-,x86_64,-,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,- +-,arm,-,arm-openmamba-linux-gnueabi,-,-,mamba-arm,- +-,ppc,-,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33 +x86_64,i586,1,i586-openmamba-linux-gnu,-,-,mamba-x86_64,- +) + pkg_config=( pkg-config cross_target_cpu,_target_platform @@ -144,6 +156,12 @@ cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER arm,-,-,mamba-arm,- ) +glibc_multilib=( +glibc +target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER +x86_64,i586,1,i586-openmamba-linux-gnu,-,-,mamba-x86_64,- +) + # # ppc cross toolchain # diff --git a/etc/autodist/distdb.x86_64 b/etc/autodist/distdb.x86_64 index f5458f7..b2cee4f 100644 --- a/etc/autodist/distdb.x86_64 +++ b/etc/autodist/distdb.x86_64 @@ -118,6 +118,12 @@ x86_64,mamba-x86_64 ) #x86_64,mamba-xen +linux_firmware=( +linux-firmware +target,KERNEL_TARGET,KERNEL_VER +x86_64,mamba-x86_64,- +) + kernel_extra=( kernel-extramodules target,KERNEL_TARGET @@ -155,64 +161,64 @@ alsa_driver=( alsa-driver target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen ati_driver=( ati-driver target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen broadcom_sta=( broadcom-sta target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen kernel_extramodules=( kernel-extramodules target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen kernel_nongpl=( kernel-nongpl target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen kernel_wireless_backport=( kernel-wireless-backport target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen broadcom_sta=( broadcom-sta target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen lirc=( lirc target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen ndiswrapper=( ndiswrapper target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen NVIDIA=( NVIDIA @@ -225,19 +231,13 @@ VirtualBox=( VirtualBox target,KERNEL_TARGET x86_64,mamba-x86_64 -x86_64,mamba-xen ) +#x86_64,mamba-xen glibc=( glibc -cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER -x86_64,-,-,mamba-x86_64,- -) - -gcc=( -gcc -cross_target_cpu -x86_64 +cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER,multilib +x86_64,-,-,mamba-x86_64,-,- ) binutils=( diff --git a/etc/autodist/legacy b/etc/autodist/legacy index 3602f2d..35cf0c8 100644 --- a/etc/autodist/legacy +++ b/etc/autodist/legacy @@ -82,3 +82,15 @@ libwps01 libwpd08 db52 glade-3 +goocanvas +libnl1 +moagg +apache-commons-digester18 +x264-116 +libcdio12 +udev173 +libtiff3 +libpcre0 +libcdio12 +libpoppler12 +libaudiofile0 diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm index 8c549c7..c401eff 100644 --- a/etc/autodist/unstage.arm +++ b/etc/autodist/unstage.arm @@ -16,3 +16,14 @@ libtiff libtiff3 libcairo gtk-doc +libpoppler +libpoppler12 +gettext +libXext +gnokii +kdegames +soprano +autoconf +libidn +libcanberra +libxml2 diff --git a/etc/autodist/unstage.x86_64 b/etc/autodist/unstage.x86_64 index 151a0ab..5581631 100644 --- a/etc/autodist/unstage.x86_64 +++ b/etc/autodist/unstage.x86_64 @@ -2,3 +2,8 @@ tcltk libxml2 libpango libatk +gettext +libnfsidmap +libXext +libidn +libtiff