From 32ddc9a1ef934f33c8222036735cdef5df957401 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 13 Mar 2012 15:59:26 +0100 Subject: [PATCH] Update configuration files to current status --- etc/autodist/blacklist | 2 + etc/autodist/distdb | 188 +++++++++++++++++- etc/autodist/distdb.arm | 2 +- etc/autodist/distdb.i586 | 178 +++-------------- etc/autodist/legacy | 5 + .../65-openmamba-autobuild-autoport | 2 +- 6 files changed, 219 insertions(+), 158 deletions(-) diff --git a/etc/autodist/blacklist b/etc/autodist/blacklist index 8b9bc09..7e1f830 100644 --- a/etc/autodist/blacklist +++ b/etc/autodist/blacklist @@ -16,3 +16,5 @@ kdevelop lxde libqt distromatic +u-boot +openmamba-distro-compat diff --git a/etc/autodist/distdb b/etc/autodist/distdb index 9e3f0e0..7f8eb4d 100644 --- a/etc/autodist/distdb +++ b/etc/autodist/distdb @@ -1,15 +1,180 @@ # openmamba autodist build jobs database - architecture independent # -# Copyright (c) 2006-2010 by Silvan Calarco +# Copyright (c) 2006-2012 by Silvan Calarco # Released under the terms of the GNU GPL version 3 license # +kernel=( +kernel +target,KERNEL_TARGET +i586,mamba +i586,mamba-64GB +) + +kernel_64GB=( +kernel +target,KERNEL_TARGET +i586,mamba-64GB +) + +kernel_hannspad=( +kernel-hannspad +target +arm +) + +kernel_iconia=( +kernel-iconia +target +arm +) + +#ppc,mamba +#x86_64,mamba + +kernel_extramodules=( +kernel-extramodules +target,KERNEL_TARGET +i586,mamba +i586,mamba-64GB +) + +kernel_packages_old=( +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=( +hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\ +broadcom-sta,stk11xx,cm2020,rtl8192se +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,\ +broadcom-sta,stk11xx,cm2020 +target,KERNEL_TARGET,KERNEL_VER +i586,mamba,3.2 +i586,mamba-64GB,3.2 +) +#rtl8192se + +#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 +) + +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 +) + +NVIDIA=( +NVIDIA +target,KERNEL_TARGET +i586,mamba +i586,mamba-64GB +) + +VirtualBox=( +VirtualBox +target,KERNEL_TARGET +i586,mamba +i586,mamba-64GB +) + +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 +) + xorg_drv_video=( -xorg-drv-video,xorg-drv-video-ati,xorg-drv-video-fbdev,xorg-drv-video-geode,xorg-drv-video-i128,xorg-drv-video-intel,xorg-drv-video-mga,xorg-drv-video-nv,xorg-drv-video-openchrome,xorg-drv-video-r128,xorg-drv-video-radeonhd,xorg-drv-video-sis,xorg-drv-video-dummy,xorg-drv-video-siliconmotion,xorg-drv-video-savage,xorg-drv-video-newport +xorg-drv-video,xorg-drv-video-apm,xorg-drv-video-ark,xorg-drv-video-ast,xorg-drv-video-ati,\ +xorg-drv-video-chips,xorg-drv-video-cirrus,xorg-drv-video-dummy,xorg-drv-video-fbdev,\ +xorg-drv-video-geode,xorg-drv-video-glint,xorg-drv-video-i128,xorg-drv-video-i740,\ +xorg-drv-video-intel,xorg-drv-video-mach64,xorg-drv-video-mga,xorg-drv-video-neomagic,\ +xorg-drv-video-newport,xorg-drv-video-nouveau,xorg-drv-video-nv,xorg-drv-video-openchrome,\ +xorg-drv-video-r128,xorg-drv-video-radeonhd,xorg-drv-video-rendition,xorg-drv-video-s3,\ +xorg-drv-video-s3virge,xorg-drv-video-savage,xorg-drv-video-siliconmotion,xorg-drv-video-sis,\ +xorg-drv-video-sisusb,xorg-drv-video-trident,xorg-drv-video-tseng,xorg-drv-video-v4l,\ +xorg-drv-video-vesa,xorg-drv-video-vmware,xorg-drv-video-voodoo,xorg-drv-video-xgixp ) xorg_drv_input=( -xorg-drv-input,xorg-drv-input-aiptek,xorg-drv-input-calcomp,xorg-drv-input-citron,xorg-drv-input-digitaledge,xorg-drv-input-dmc,xorg-drv-input-dynapro,xorg-drv-input-elo2300,xorg-drv-input-elographics,xorg-drv-input-evdev,xorg-drv-input-fpit,xorg-drv-input-hyperpen,xorg-drv-input-jamstudio,xorg-drv-input-joystick,xorg-drv-input-keyboard,xorg-drv-input-magellan,xorg-drv-input-magictouch,xorg-drv-input-microtouch,xorg-drv-input-mouse,xorg-drv-input-mutouch,xorg-drv-input-palmax,xorg-drv-input-penmount,xorg-drv-input-spaceorb,xorg-drv-input-summa,xorg-drv-input-synaptics,xorg-drv-input-tek4957,xorg-drv-input-ur98,xorg-drv-input-vmmouse,xorg-drv-input-void +xorg-drv-input,xorg-drv-input-acecad,xorg-drv-input-aiptek,xorg-drv-input-elographics,\ +xorg-drv-input-evdev,xorg-drv-input-fpit,xorg-drv-input-hyperpen,xorg-drv-input-joystick,\ +xorg-drv-input-keyboard,xorg-drv-input-mouse,xorg-drv-input-mutouch,xorg-drv-input-penmount,\ +xorg-drv-input-synaptics,xorg-drv-input-tslib,xorg-drv-input-vmmouse,xorg-drv-input-void ) abiword=( @@ -19,7 +184,8 @@ abiword,abiword-docs ) compiz=( -compiz,compiz-bcop,compiz-plugins-extra,compiz-plugins-main,libcompizconfig,compizconfig-backend-kconfig4,compizconfig-simple-settings-manager,emerald +compiz,compiz-bcop,compiz-plugins-extra,compiz-plugins-main,libcompizconfig,compizconfig-backend-kconfig4,\ +compizconfig-simple-settings-manager,emerald %build_and_install 1 ) @@ -57,13 +223,20 @@ libevolution-data-server,evolution #) kde3=( -kdelibs,kdebase,kdeadmin,kdeutils,kdenetwork,kdeaccessibility,kdepim,kdegames,kdegraphics,kdemultimedia,kdeaddons,kdenetwork,kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n +kdelibs,kdebase,kdeadmin,kdeutils,kdenetwork,kdeaccessibility,kdepim,kdegames,kdegraphics,kdemultimedia,kdeaddons,kdenetwork,\ +kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n %build_and_install 1 ) kde4=( -kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kde-workspace,kdepim4,kdepim-runtime,kdeadmin,kdemultimedia,kdenetwork4,kdeartwork,kdegames4,kdetoys4,kdeaccessibility4,kdesdk4,kdeutils,kdeplasma-addons,kde-l10n,kate +kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kde-workspace,kde-baseapps,kdepim4,kdepim-runtime,kdeadmin,\ +kdemultimedia,kdenetwork4,kdeartwork,kdegames,kdetoys,kdeaccessibility4,kdesdk4,kdeutils,kdeplasma-addons,\ +kde-l10n,blinken,cantor,gwenview,libkdeedu,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,marble,okular,smokegen,smokeqt,smokekde,\ +svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,kross-interpreters,perl-Qt4,perl-KDE4,\ +kdegraphics-thumbnailers,ksaneplugin,mobipocket,kde4-wallpapers %build_and_install 1 ) @@ -114,7 +287,8 @@ libdc,valknut # use for major release update (e.g. 2.24 -> 2.26) gnome=( -libgnome,libsoup,libgweather,librsvg,libwnck,libgdl,gnome-desktop,python-gnome-desktop,libeel,gnome-icon-theme,gnome-menus,libgnome-panel,anjuta,zenity,metacity,nautilus,brasero,cheese,evince,gconf-editor,gedit,gedit-plugins +libgnome,libsoup,libgweather,librsvg,libwnck,libgdl,gnome-desktop,python-gnome-desktop,libeel,gnome-icon-theme,gnome-menus,\ +libgnome-panel,anjuta,zenity,metacity,nautilus,brasero,cheese,evince,gconf-editor,gedit,gedit-plugins %build_and_install 1 ) diff --git a/etc/autodist/distdb.arm b/etc/autodist/distdb.arm index 7a4c461..17e0b7a 100644 --- a/etc/autodist/distdb.arm +++ b/etc/autodist/distdb.arm @@ -13,7 +13,7 @@ arm glibc=( glibc cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER,build_doc,build_profile,build_selinux -arm,-,-,mamba-arm,2.6.35,0,0,0 +arm,-,-,mamba-arm,-,0,0,0 ) gcc=( diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586 index 419a8f0..7fd7616 100644 --- a/etc/autodist/distdb.i586 +++ b/etc/autodist/distdb.i586 @@ -4,18 +4,8 @@ # Released under the terms of the GNU GPL version 3 license # -# XTC 1 (Cross Toolchain) -cross_environment=( -cross-environment -cross_target_cpu,autodist_crossonly,_target_platform -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 -) - # -# XTC 2 +# XTC 1 (Cross Toolchain) # # build native binutils (gcc needed, so it's not a stage1 build) # and cross platform binutils @@ -23,6 +13,7 @@ x86_64,1,x86_64-openmamba-linux-gnu binutils=( binutils cross_target_cpu,_target_platform +avr,avr-openmamba-linux-gnu x86_64,x86_64-openmamba-linux-gnu i586,i586-openmamba-linux-gnu arm,arm-openmamba-linux-gnueabi @@ -30,12 +21,13 @@ ppc,ppc-openmamba-linux-gnu ) # -# XTC 3 +# XTC 2 # # glibc stage1: build headers only glibc_stage1=( glibc cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER +avr,1,avr-openmamba-linux-gnu,mamba-avr,- i586,1,i586-openmamba-linux-gnu,mamba,- arm,1,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33 ppc,1,ppc-openmamba-linux-gnu,mamba-ppc,2.6.33 @@ -43,11 +35,12 @@ x86_64,1,x86_64-openmamba-linux-gnu,mamba-x86_64,- ) # -# XTC 4 +# XTC 3 # gcc_stage1=( gcc cross_target_cpu,stage1,_target_platform +avr,1,avr-openmamba-linux-gnu arm,1,arm-openmamba-linux-gnueabi i586,1,i586-openmamba-linux-gnu ppc,1,ppc-openmamba-linux-gnu @@ -55,7 +48,7 @@ x86_64,1,x86_64-openmamba-linux-gnu ) # -# XTC 5 +# XTC 4 # glibc_stage2=( glibc @@ -67,7 +60,7 @@ x86_64,1,-,-,x86_64-openmamba-linux-gnu,mamba-x86_64,- ) # -# XTC 6 +# XTC 5 # gcc=( gcc @@ -79,17 +72,36 @@ ppc,ppc-openmamba-linux-gnu,1 ) # -# XTC 7 +# XTC 6 # glibc=( glibc cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER i586,i586-openmamba-linux-gnu,-,-,mamba,- x86_64,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,2.6.33 -arm,arm-openmamba-linux-gnueabi,-,-,mamba-arm,2.6.35 +arm,arm-openmamba-linux-gnueabi,-,-,mamba-arm,- ppc,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33 ) +# XTC 7 +cross_environment=( +cross-environment +cross_target_cpu,autodist_crossonly,_target_platform +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 +) + +pkg_config=( +pkg-config +cross_target_cpu,_target_platform +i586,i586-openmamba-linux-gnu +x86_64,x86_64-openmamba-linux-gnu +arm,arm-openmamba-linux-gnueabi +ppc,ppc-openmamba-linux-gnu +) + gcc_uclibc=( gcc cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER @@ -125,138 +137,6 @@ cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER arm,-,-,mamba-arm,- ) - -kernel=( -kernel -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -kernel_64GB=( -kernel -target,KERNEL_TARGET -i586,mamba-64GB -) - -#ppc,mamba -#x86_64,mamba - -kernel_extramodules=( -kernel-extramodules -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -kernel_packages_old=( -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,2.6.38 -i586,mamba-64GB,2.6.38 -) - -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 -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,broadcom-sta,stk11xx,cm2020,rtl8192se -target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.0 -i586,mamba-64GB,3.0 -) - -#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 -) - -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 -) - -NVIDIA=( -NVIDIA -target,KERNEL_TARGET -i586,mamba -i586,mamba-64GB -) - -VirtualBox=( -VirtualBox -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 -) - # # ppc cross toolchain # diff --git a/etc/autodist/legacy b/etc/autodist/legacy index 625c979..3975742 100644 --- a/etc/autodist/legacy +++ b/etc/autodist/legacy @@ -76,3 +76,8 @@ rpm5 libpoppler6 x264-84 db51 +kde-i18n +libwpg01 +libwps01 +libwpd08 +db52 diff --git a/etc/cron.hourly/65-openmamba-autobuild-autoport b/etc/cron.hourly/65-openmamba-autobuild-autoport index 8e857c0..40637e3 100755 --- a/etc/cron.hourly/65-openmamba-autobuild-autoport +++ b/etc/cron.hourly/65-openmamba-autobuild-autoport @@ -10,7 +10,7 @@ ME=`basename $0` [ "$$" == "`pidof -x $ME`" ] || { - echo "Warning: script already running; exiting." + echo "Warning: $ME script already running; exiting." exit 0 }