From a2180410547d77d65670e6a445464556d67beb20 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 21 May 2013 01:36:32 +0200 Subject: [PATCH] autodist: sync to current distdb.* and unstage.* for all archs --- etc/autodist/blacklist | 1 - etc/autodist/distdb | 61 ++++++++++++++++++++++++++++--------- etc/autodist/distdb.arm | 16 +++++++++- etc/autodist/distdb.i586 | 35 ++++++++++++++++----- etc/autodist/distdb.x86_64 | 8 ++++- etc/autodist/legacy | 9 ++++++ etc/autodist/unstage.arm | 3 ++ etc/autodist/unstage.x86_64 | 10 ++++++ 8 files changed, 118 insertions(+), 25 deletions(-) diff --git a/etc/autodist/blacklist b/etc/autodist/blacklist index 0478250..6452a7b 100644 --- a/etc/autodist/blacklist +++ b/etc/autodist/blacklist @@ -14,7 +14,6 @@ postplug grub-theme-openmamba kdevelop lxde -libqt distromatic u-boot openmamba-distro-compat diff --git a/etc/autodist/distdb b/etc/autodist/distdb index 476af1f..2bc1ea4 100644 --- a/etc/autodist/distdb +++ b/etc/autodist/distdb @@ -15,6 +15,8 @@ xorg-drv-video-s3virge,xorg-drv-video-savage,xorg-drv-video-siliconmotion,xorg-d 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-video +%continue_on_error +1 ) #xorg-drv-video-sisusb, @@ -24,6 +26,8 @@ xorg-drv-input-evdev,xorg-drv-input-fpit,xorg-drv-input-hyperpen,xorg-drv-input- 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,\ xorg-drv-input +%continue_on_error +1 ) abiword=( @@ -79,20 +83,36 @@ kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n ) kde4=( +kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,\ +nepomuk-widgets,kdepim4,kdepim-runtime,kdeadmin,kdenetwork4,kdetoys,kdesdk,libkdcraw,libkexiv2,kdeartwork,marble,\ +kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\ +kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ +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,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\ +bomber +%build_and_install,%continue_on_error +1,1 +) +# kdegames + +kde49=( kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,kdepim4,\ -kdepim-runtime,kdeadmin,kdenetwork4,kdegames,kdetoys,kdesdk,libkdcraw,libkexiv2,kdeartwork,marble,\ +kdepim-runtime,kdeadmin,kdenetwork4,kdetoys,kdesdk,libkdcraw,libkexiv2,kdeartwork,marble,\ kdeplasma-addons,kde-l10n,blinken,cantor,libkipi,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,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,\ -libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk -%build_and_install -1 +jovie,kmousetool,kmouth,qyoto,kaccessible,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,printer-applet,kdegames +%build_and_install,%continue_on_error +1,1 ) -#kdemultimedia, ksecrets kde48=( kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,kdepim4,\ @@ -104,20 +124,20 @@ okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,ko kross-interpreters,PyKDE4,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 -%build_and_install -1 +%build_and_install,%continue_on_error +1,1 ) xfce4=( libxfce4util,libxfce4ui,xfce4-appfinder,xfce4-dev-tools,xfce4-panel,xfce4-session,xfce4-settings,xfconf,xfdesktop,xfwm4 -%build_and_install -1 +%build_and_install,%continue_on_error +1,1 ) alsa=( libalsa,libalsa-plugins,alsa-utils,alsa-tools,python-alsa -%build_and_install -1 +%build_and_install,%continue_on_error +1,1 ) #,alsa-driver @@ -162,8 +182,8 @@ libdc,valknut 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 -%build_and_install -1 +%build_and_install,%continue_on_error +1,1 ) fwbuilder=( @@ -178,3 +198,16 @@ koffice 1 ) #,koffice-i18n + +python_numpy=( +python-numpy +with_pyver +- +3 +) + +shorewall=( +shorewall-core,shorewall +%build_and_install +1 +) diff --git a/etc/autodist/distdb.arm b/etc/autodist/distdb.arm index cfc9462..377420c 100644 --- a/etc/autodist/distdb.arm +++ b/etc/autodist/distdb.arm @@ -32,7 +32,7 @@ arm,mamba-arm linux_firmware=( linux-firmware target,KERNEL_TARGET,KERNEL_VER -arm,mamba-arm,- +arm,mamba-arm,3.4 ) pam=( @@ -65,3 +65,17 @@ udev %build_and_install 0 ) + +libcec=( +libcec +_with_raspberrypi +- +1 +) + +xbmc=( +xbmc +_with_raspberrypi +- +1 +) diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586 index 03b9f34..60e601b 100644 --- a/etc/autodist/distdb.i586 +++ b/etc/autodist/distdb.i586 @@ -160,11 +160,20 @@ ppc klibc=( klibc -cross_target_cpu,_target_platform,KERNEL_VER +cross_target_cpu,_target_platform,KERNEL_TARGET,KERNEL_VER -,-,- -ppc,ppc-openmamba-linux-gnu,2.6.33mamba-ppc -x86_64,x86_64-openmamba-linux-gnu,2.6.33mamba-x86_64 -arm,arm-openmamba-linux-gnueabi,2.6.33mamba-arm +ppc,ppc-openmamba-linux-gnu,mamba-ppc,- +x86_64,x86_64-openmamba-linux-gnu,3mamba-x86_64,- +arm,arm-openmamba-linux-gnueabi,mamba-arm,- +) + +# +# arm cross toolchain +# +binutils_arm=( +binutils +cross_target_cpu,_target_platform +arm,arm-openmamba-linux-gnueabi ) @@ -216,12 +225,22 @@ kernel target,KERNEL_TARGET i586,mamba i586,mamba-64GB +i586,mamba-rt +i586,mamba-64GB-rt +arm,mamba-arm +) +#arm,mamba-arm-kirkwood +#x86_64,mamba-x86_64 + +kernel_37=( +kernel +target,KERNEL_TARGET +i586,mamba +i586,mamba-64GB arm,mamba-arm arm,mamba-arm-kirkwood x86_64,mamba-x86_64 ) -#i586,mamba-rt -#i586,mamba-64GB-rt kernel_34=( kernel @@ -274,7 +293,7 @@ x86_64,mamba-x86_64 ) kernel_packages=( -hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox-kernel,\ +hsfmodem,slmodem,compat-wireless,alsa-driver,ndiswrapper,VirtualBox-kernel,\ broadcom-sta,stk11xx,cm2020,r8101 target,KERNEL_TARGET,KERNEL_VER i586,mamba,- @@ -353,7 +372,7 @@ arm,arm-none-linux-gnueabi linux_firmware=( linux-firmware target,KERNEL_TARGET,KERNEL_VER -i586,mamba,3.6 +i586,mamba,3.4 ) NVIDIA=( diff --git a/etc/autodist/distdb.x86_64 b/etc/autodist/distdb.x86_64 index 98be25c..2ae4d43 100644 --- a/etc/autodist/distdb.x86_64 +++ b/etc/autodist/distdb.x86_64 @@ -271,5 +271,11 @@ bootstrap gcc=( gcc cross_target_cpu,_target_platform,disable_jack,disable_gjdoc,disable_java -x86_64,x86_64-openmamba-linux-gnu,1,1,0 +x86_64,x86_64-openmamba-linux-gnu,1,0,0 +) + +apache_ant=( +apache-ant +stage2 +1 ) diff --git a/etc/autodist/legacy b/etc/autodist/legacy index 5dfa8b2..5bf4831 100644 --- a/etc/autodist/legacy +++ b/etc/autodist/legacy @@ -118,3 +118,12 @@ python liblcms libpng14 xmlgraphics-commons14 +pygobject2 +ImageMagick5 +automake1.12 +libpcap0 +htmlunit1 +libimobiledevice3 +libilmbase1 +libgif4 +libmpc2 diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm index 3103a30..a3eff84 100644 --- a/etc/autodist/unstage.arm +++ b/etc/autodist/unstage.arm @@ -36,3 +36,6 @@ gutenprint gpm emacs groff +graphviz +python26 +python27 diff --git a/etc/autodist/unstage.x86_64 b/etc/autodist/unstage.x86_64 index 003ec5f..8225d78 100644 --- a/etc/autodist/unstage.x86_64 +++ b/etc/autodist/unstage.x86_64 @@ -16,3 +16,13 @@ gpm emacs groff soprano +livecd-tools +tracker +graphviz +PackageKit +apache-ant +libpeas +libalsa-plugins +libproxy +python26 +python27