From 878663f2f039af119d872860c31668c8ef5a164c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 20 Nov 2012 00:10:29 +0100 Subject: [PATCH] autodist: sync configuration files with current status --- etc/autodist/distdb | 10 +- etc/autodist/distdb.i586 | 278 ++++++++++++------------------------- etc/autodist/distdb.x86_64 | 36 +++-- etc/autodist/legacy | 15 ++ 4 files changed, 134 insertions(+), 205 deletions(-) diff --git a/etc/autodist/distdb b/etc/autodist/distdb index 4aa1459..476af1f 100644 --- a/etc/autodist/distdb +++ b/etc/autodist/distdb @@ -87,7 +87,8 @@ klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\ okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ kross-interpreters,PyKDE4,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 +jovie,kmousetool,kmouth,qyoto,kaccessible,printer-applet,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk %build_and_install 1 ) @@ -106,7 +107,12 @@ analitza,jovie,kmousetool,kmouth,qyoto,kaccessible,ksecrets,printer-applet,kdegr %build_and_install 1 ) -#kdeaccessibility4,kdeutils + +xfce4=( +libxfce4util,libxfce4ui,xfce4-appfinder,xfce4-dev-tools,xfce4-panel,xfce4-session,xfce4-settings,xfconf,xfdesktop,xfwm4 +%build_and_install +1 +) alsa=( libalsa,libalsa-plugins,alsa-utils,alsa-tools,python-alsa diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586 index 7a100ef..9f48aca 100644 --- a/etc/autodist/distdb.i586 +++ b/etc/autodist/distdb.i586 @@ -87,13 +87,30 @@ x86_64,i586,1,i586-openmamba-linux-gnu,-,-,mamba-x86_64,- cross_environment=( cross-environment cross_target_cpu,autodist_crossonly,_target_platform -avr,1,avr i586,1,i586-openmamba-linux-gnu arm,1,arm-openmamba-linux-gnueabi ppc,1,ppc-openmamba-linux-gnu x86_64,1,x86_64-openmamba-linux-gnu ) +glibc_arm=( +glibc +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,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,- +) + +glibc_cross_multilib=( +glibc +target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER +-,i586,1,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,- +) + gcc_cross=( gcc cross_target_cpu,_target_platform,disable_java @@ -150,17 +167,6 @@ x86_64,x86_64-openmamba-linux-gnu,2.6.33mamba-x86_64 arm,arm-openmamba-linux-gnueabi,2.6.33mamba-arm ) -glibc_arm=( -glibc -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 @@ -212,6 +218,22 @@ i586,mamba i586,mamba-64GB arm,mamba-arm x86_64,mamba-x86_64 +i586,mamba-rt +i586,mamba-64GB-rt +) + +kernel_milestone2=( +kernel +target,KERNEL_TARGET +i586,mamba +i586,mamba-64GB +arm,mamba-arm +) + +kernel_rt=( +kernel +target,KERNEL_TARGET +i586,mamba-rt ) kernel_64GB=( @@ -220,12 +242,62 @@ target,KERNEL_TARGET i586,mamba-64GB ) +kernel_64GB_rt=( +kernel +target,KERNEL_TARGET +i586,mamba-64GB-rt +) + kernel_x86_64=( kernel target,KERNEL_TARGET x86_64,mamba-x86_64 ) +kernel_packages=( +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,VirtualBox,\ +broadcom-sta,stk11xx,cm2020,r8101 +target,KERNEL_TARGET,KERNEL_VER +i586,mamba,- +i586,mamba-64GB,- +i586,mamba-rt,- +i586,mamba-64GB-rt,- +) + +kernel_packages_36=( +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,VirtualBox-kernel,\ +broadcom-sta,stk11xx,cm2020,r8101 +target,KERNEL_TARGET,KERNEL_VER +i586,mamba,3.6 +i586,mamba-64GB,3.6 +i586,mamba-rt,3.6 +i586,mamba-64GB-rt,3.6 +) + +kernel_packages_34=( +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,VirtualBox-kernel,\ +broadcom-sta,stk11xx,cm2020,r8101 +target,KERNEL_TARGET,KERNEL_VER +i586,mamba,3.4 +i586,mamba-64GB,3.4 +) + +kernel_packages_32=( +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox-kernel,\ +broadcom-sta,stk11xx,cm2020,r8101 +target,KERNEL_TARGET,KERNEL_VER +i586,mamba,3.2 +i586,mamba-64GB,3.2 +) + +kernel_packages_30=( +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ +broadcom-sta,atheros-81,drbd,rtl8192se +target,KERNEL_TARGET,KERNEL_VER +i586,mamba,3.0 +i586,mamba-64GB,3.0 +) + kernel_hannspad=( kernel-hannspad target @@ -238,182 +310,8 @@ target arm ) -#ppc,mamba -#x86_64,mamba - -#kernel_extramodules=( -#kernel-extramodules -#target,KERNEL_TARGET -#i586,mamba -#i586,mamba-64GB -#) - -kernel_packages=( -hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ -broadcom-sta,stk11xx,cm2020,r8101 -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,- -i586,mamba-64GB,- -) - -kernel_packages_30=( -hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ -broadcom-sta,atheros-81,drbd,rtl8192se -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.0 -i586,mamba-64GB,3.0 -) - -kernel_packages_32=( -hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ -broadcom-sta,stk11xx,cm2020,r8101 -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.2 -i586,mamba-64GB,3.2 -) - -kernel_packages_34=( -hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,NVIDIA,\ -broadcom-sta,stk11xx,cm2020,r8101 -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.4 -i586,mamba-64GB,3.4 -) -#NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,ndiswrapper, - -#ppc,mamba -#x86_64,mamba - -NVIDIA_all=( -NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,- -i586,mamba-64GB,- -) - -alsa_driver=( -alsa-driver -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -ati_driver=( -ati-driver -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) -#x86_64,mamba-x86_64 - -broadcom_sta=( -broadcom-sta -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -kernel_wireless_backport=( -kernel-wireless-backport -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -lirc=( -lirc -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -ndiswrapper=( -ndiswrapper -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -ndiswrapper_34=( -ndiswrapper -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.4 -i586,mamba-64GB,3.4 -) - -NVIDIA=( -NVIDIA -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -NVIDIA_32=( -NVIDIA -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.2 -i586,mamba-64GB,3.2 -) - -VirtualBox=( -VirtualBox -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -VirtualBox_32=( -VirtualBox -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.2 -i586,mamba-64GB,3.2 -) - -VirtualBox_34=( -VirtualBox -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.4 -i586,mamba-64GB,3.4 -) - -compat_wireless=( -compat-wireless -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -broadcom_sta=( -broadcom-sta -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -atheros_81=( -atheros-sta -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -drbd=( -drbd -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -r8101=( -r8101 -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -r8101_34=( -r8101 -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.4 -i586,mamba-64GB,3.4 +kernel_iconia_altgcc=( +kernel-iconia +target,_target_platform +arm,arm-none-linux-gnueabi ) diff --git a/etc/autodist/distdb.x86_64 b/etc/autodist/distdb.x86_64 index b2cee4f..72a53f6 100644 --- a/etc/autodist/distdb.x86_64 +++ b/etc/autodist/distdb.x86_64 @@ -111,6 +111,9 @@ i586 ppc ) +# +# KERNEL +# kernel=( kernel target,KERNEL_TARGET @@ -132,30 +135,37 @@ x86_64,mamba-x86_64 #x86_64,mamba-xen kernel_packages=( -hsfmodem,compat-wireless,ati-driver,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,broadcom-sta +VirtualBox-kernel target,KERNEL_TARGET,KERNEL_VER x86_64,mamba-x86_64,- ) +#hsfmodem,compat-wireless,ati-driver,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,broadcom-sta # slmodem, alsa-driver, lirc,VirtualBox, ndiswrapper, alsa-driver -kernel_packages_new=( -hsfmodem,compat-wireless,ati-driver,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,broadcom-sta +kernel_packages_36=( +VirtualBox-kernel,NVIDIA target,KERNEL_TARGET,KERNEL_VER -x86_64,mamba-x86_64,2.6.33 +x86_64,mamba-x86_64,3.6 ) -kernelxen_packages=( -alsa-driver,hsfmodem,compat-wireless,ati-driver,ndiswrapper,broadcom-sta +kernel_packages_34=( +VirtualBox-kernel,NVIDIA target,KERNEL_TARGET,KERNEL_VER -x86_64,mamba-xen,- +x86_64,mamba-x86_64,3.4 ) -NVIDIA_all=( -NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx -target,KERNEL_TARGET,KERNEL_VER -x86_64,mamba-x86_64 -) -#x86_64,mamba-xen +#kernelxen_packages=( +#alsa-driver,hsfmodem,compat-wireless,ati-driver,ndiswrapper,broadcom-sta +#target,KERNEL_TARGET,KERNEL_VER +#x86_64,mamba-xen,- +#) + +#NVIDIA_all=( +#NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx +#target,KERNEL_TARGET,KERNEL_VER +#x86_64,mamba-x86_64 +#) +##x86_64,mamba-xen alsa_driver=( alsa-driver diff --git a/etc/autodist/legacy b/etc/autodist/legacy index 511c5be..1e3c519 100644 --- a/etc/autodist/legacy +++ b/etc/autodist/legacy @@ -98,3 +98,18 @@ libxcb-util1 parted2 libguile1 libgnutls2 +libgdbm3 +farstream1 +gst-plugins-base010 +gst-plugins-good010 +gst-plugins-bad010 +gst-plugins-ugly010 +gstreamer010 +lua51 +libwebkit-gtk +libgraphite2_11 +goocanvas +libdirectfb5 +libtasn1_3 +kdelibs3 +goocanvas