From 39689f7e7d4c4ab06ba9fd8c70bb209e475fb443 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Thu, 26 Apr 2012 15:18:20 +0200
Subject: [PATCH] /etc/autodist: update distdb* and unstage* files

---
 etc/autodist/distdb                  | 26 ++++++++++++++++++--------
 etc/autodist/distdb.arm              | 22 ++++++++++++----------
 etc/autodist/distdb.i586             | 14 ++++++++++----
 etc/autodist/distdb.x86_64           |  4 ++--
 etc/autodist/scripts/update-specfile |  1 +
 etc/autodist/unstage.arm             |  6 ++++++
 etc/autodist/unstage.x86_64          |  4 ++++
 7 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/etc/autodist/distdb b/etc/autodist/distdb
index 7f8eb4d..2454aaf 100644
--- a/etc/autodist/distdb
+++ b/etc/autodist/distdb
@@ -9,6 +9,8 @@ kernel
 target,KERNEL_TARGET
 i586,mamba
 i586,mamba-64GB
+arm,mamba-arm
+x86_64,mamba-x86_64
 )
 
 kernel_64GB=(
@@ -17,6 +19,12 @@ target,KERNEL_TARGET
 i586,mamba-64GB
 )
 
+kernel_x86_64=(
+kernel
+target,KERNEL_TARGET
+x86_64,mamba-x86_64
+)
+
 kernel_hannspad=(
 kernel-hannspad
 target
@@ -87,6 +95,7 @@ target,KERNEL_TARGET
 i586,mamba
 i586,mamba-64GB
 )
+#x86_64,mamba-x86_64
 
 broadcom_sta=(
 broadcom-sta
@@ -230,17 +239,18 @@ kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n
 )
 
 kde4=(
-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
+kdelibs,kdepimlibs,oxygen-icons,kde-runtime,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,libanalitza,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
 %build_and_install
 1
 )
-#kdebase4,kdegraphics,kdeedu4,kdebindings4
+#kdeaccessibility4,kdeutils
 
 alsa=(
 libalsa,libalsa-plugins,alsa-utils,alsa-driver,alsa-tools
diff --git a/etc/autodist/distdb.arm b/etc/autodist/distdb.arm
index 88df8c0..de7c02c 100644
--- a/etc/autodist/distdb.arm
+++ b/etc/autodist/distdb.arm
@@ -4,10 +4,17 @@
 # Released under the terms of the GNU GPL version 3 license 
 #
 
+#
+# XTC 1 (Cross Toolchain)
+#
+# build native binutils (gcc needed, so it's not a stage1 build) 
+# and cross platform binutils 
+#
 binutils=(
 binutils
-cross_target_cpu
-arm
+cross_target_cpu,_target_platform
+arm,arm-openmamba-linux-gnueabi
+avr,avr
 )
 
 glibc=(
@@ -16,12 +23,6 @@ cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER,build_doc,build_pr
 arm,-,-,mamba-arm,-,0,0,0
 )
 
-gcc=(
-gcc
-cross_target_cpu
-arm
-)
-
 kernel=(
 kernel
 target,KERNEL_TARGET
@@ -60,8 +61,9 @@ bootstrap
 
 gcc=(
 gcc
-disable_jack,disable_gjdoc,disable_java
-1,1,1
+cross_target_cpu,_target_platform,disable_java,disable_gjdoc
+avr,avr,1,-
+arm,arm-openmamba-linux-gnueabi,1,1
 )
 
 udev=(
diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586
index 7fd7616..f99833e 100644
--- a/etc/autodist/distdb.i586
+++ b/etc/autodist/distdb.i586
@@ -13,10 +13,10 @@
 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
+avr,avr
+x86_64,x86_64-openmamba-linux-gnu
 ppc,ppc-openmamba-linux-gnu
 )
 
@@ -27,7 +27,6 @@ ppc,ppc-openmamba-linux-gnu
 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
@@ -40,7 +39,6 @@ x86_64,1,x86_64-openmamba-linux-gnu,mamba-x86_64,-
 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
@@ -69,6 +67,7 @@ i586,i586-openmamba-linux-gnu,-
 arm,arm-openmamba-linux-gnueabi,1
 x86_64,x86_64-openmamba-linux-gnu,1
 ppc,ppc-openmamba-linux-gnu,1
+avr,avr,1
 )
 
 #
@@ -87,12 +86,19 @@ ppc,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
 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
 )
 
+gcc_cross=(
+gcc
+cross_target_cpu,_target_platform,disable_java
+avr,avr,1
+)
+
 pkg_config=(
 pkg-config
 cross_target_cpu,_target_platform
diff --git a/etc/autodist/distdb.x86_64 b/etc/autodist/distdb.x86_64
index 254c36c..f5458f7 100644
--- a/etc/autodist/distdb.x86_64
+++ b/etc/autodist/distdb.x86_64
@@ -266,6 +266,6 @@ bootstrap
 
 gcc=(
 gcc
-disable_jack,disable_gjdoc,disable_java
-1,1,1
+cross_target_cpu,_target_platform,disable_jack,disable_gjdoc,disable_java
+x86_64,x86_64-openmamba-linux-gnu,1,1,0
 )
diff --git a/etc/autodist/scripts/update-specfile b/etc/autodist/scripts/update-specfile
index c58de17..689ffc3 100755
--- a/etc/autodist/scripts/update-specfile
+++ b/etc/autodist/scripts/update-specfile
@@ -24,4 +24,5 @@ sed -i "s|\(BuildRequires:[[:space:]]*\)firefox-devel|\1xulrunner-devel|" $1
 sed -i "s|^PreReq:[[:space:]]*/sbin/install-info|Requires(post):%{__install_info}|" $1
 sed -i "s|^PreReq:[[:space:]]*%{__install_info}|Requires(post):%{__install_info}|" $1
 sed -i "s|^PreReq:[[:space:]]*|Requires(pre): |" $1
+#sed -i "s|^\(Source.*:[[:space:]]*ftp://ftp.kde.org/pub/kde/stable/.*.tar.\)bz2|\1xz|" $1
 exit 0
diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm
index 1277302..5b3f7bc 100644
--- a/etc/autodist/unstage.arm
+++ b/etc/autodist/unstage.arm
@@ -9,3 +9,9 @@ glib
 libnfsidmap
 ghostscript
 liblcms
+ImageMagick4
+ImageMagick
+gcc
+libtiff
+libtiff3
+libcairo
diff --git a/etc/autodist/unstage.x86_64 b/etc/autodist/unstage.x86_64
index e69de29..151a0ab 100644
--- a/etc/autodist/unstage.x86_64
+++ b/etc/autodist/unstage.x86_64
@@ -0,0 +1,4 @@
+tcltk
+libxml2
+libpango
+libatk