Index: k/aaf-flashbeta_allowed
===================================================================
--- /ipk/aaf-flashbeta_allowed	(revision 8586)
+++ 	(revision )
@@ -1,32 +1,0 @@
-bootlogos
-browsers
-cardreader
-editors
-emus
-epg
-fonts
-games
-infos
-keymaps
-mediacenter
-picons
-players
-po
-radiologos
-settings
-skins
-spinner
-swapbrowsers
-swapeditors
-swapemus
-swapepg
-swapgames
-swapinfos
-swapmediacenter
-swapnetwork
-swappicons
-swapscreensaver
-swapskins
-swapsystem
-system
-swapsystem
Index: /ipk/make-ipk
===================================================================
--- /ipk/make-ipk	(revision 8586)
+++ /ipk/make-ipk	(revision 8587)
@@ -111,21 +111,10 @@
 . ./config/make-config
 
-if [ $CPUTYPE = "sh4" ];then
-	cp -a "$HOMEDIR"/source.sh4/* "$HOMEDIR"/BUILD
-elif [ $CPUTYPE = "mipsel" ];then
-	cp -a "$HOMEDIR"/source.sh4/spinner* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/settings* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/radio* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/p* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/m* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/i* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/game* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/fonts* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/epg* "$HOMEDIR"/BUILD
-	cp -a "$HOMEDIR"/source.sh4/editor* "$HOMEDIR"/BUILD
-	sleep 5
+cp -a "$HOMEDIR"/source/* "$HOMEDIR"/BUILD
+cp -a "$HOMEDIR"/source."$CPUTYPE"/* "$HOMEDIR"/BUILD
+
+if [ $CPUTYPE = "mipsel" ];then
 	rm -r "$HOMEDIR"/BUILD/*/CONTROL/pre*
 	sed -i 's/sh4/mipsel/g' "$HOMEDIR"/BUILD/*/CONTROL/control
-	cp -a "$HOMEDIR"/source.mipsel/* "$HOMEDIR"/BUILD
 fi
 
@@ -134,5 +123,5 @@
 
 LIST_LINE=`cat aaf-flashbeta.txt`
-ALLOWED=`cat "$HOMEDIR"/aaf-flashbeta_allowed`
+ALLOWED=`cat "$HOMEDIR"/trustlist_allowed_"$CPUTYPE"_"$SWTYPE"`
 
 cd "$HOMEDIR"/BUILD	
Index: /ipk/trustlist_allowed_mipsel_enigma2
===================================================================
--- /ipk/trustlist_allowed_mipsel_enigma2	(revision 8587)
+++ /ipk/trustlist_allowed_mipsel_enigma2	(revision 8587)
@@ -0,0 +1,32 @@
+bootlogos
+browsers
+cardreader
+editors
+emus
+epg
+fonts
+games
+infos
+keymaps
+mediacenter
+picons
+players
+po
+radiologos
+settings
+skins
+spinner
+swapbrowsers
+swapeditors
+swapemus
+swapepg
+swapgames
+swapinfos
+swapmediacenter
+swapnetwork
+swappicons
+swapscreensaver
+swapskins
+swapsystem
+system
+swapsystem
Index: /ipk/trustlist_allowed_mipsel_neutrino
===================================================================
--- /ipk/trustlist_allowed_mipsel_neutrino	(revision 8587)
+++ /ipk/trustlist_allowed_mipsel_neutrino	(revision 8587)
@@ -0,0 +1,12 @@
+bootlogos
+browsers
+cardreader
+emus
+fonts
+picons
+swappicons
+radiologos
+swapemus
+swapnetwork
+swapscreensaver
+swapsystem
Index: /ipk/trustlist_allowed_sh4_enigma2
===================================================================
--- /ipk/trustlist_allowed_sh4_enigma2	(revision 8587)
+++ /ipk/trustlist_allowed_sh4_enigma2	(revision 8587)
@@ -0,0 +1,32 @@
+bootlogos
+browsers
+cardreader
+editors
+emus
+epg
+fonts
+games
+infos
+keymaps
+mediacenter
+picons
+players
+po
+radiologos
+settings
+skins
+spinner
+swapbrowsers
+swapeditors
+swapemus
+swapepg
+swapgames
+swapinfos
+swapmediacenter
+swapnetwork
+swappicons
+swapscreensaver
+swapskins
+swapsystem
+system
+swapsystem
Index: /ipk/trustlist_allowed_sh4_neutrino
===================================================================
--- /ipk/trustlist_allowed_sh4_neutrino	(revision 8587)
+++ /ipk/trustlist_allowed_sh4_neutrino	(revision 8587)
@@ -0,0 +1,12 @@
+bootlogos
+browsers
+cardreader
+emus
+fonts
+picons
+swappicons
+radiologos
+swapemus
+swapnetwork
+swapscreensaver
+swapsystem