merge of 'a925a41dbe7a5d17f8081a8d5a761042750ef05c'

     and 'abe0149045acae87e701ee34dbfee1ff0ebc71c9'

3 files changed, 777 insertions, 315 deletions

diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index c4a9fc0fc3..c2414b8013 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -1,301 +1,746 @@
 <?php
 
-define('DB_FILENAME', './feeds.db');
+define('DB_FILENAME', '/home/angstrom/website/repo/feeds.db');
+$feed_base_url = "http://www.angstrom-distribution.org/unstable/feed/";
 
 $feeds = array(
-	array(
-		'distro_name'=>'OpenZaurus', 
-		'distro_version'=>'3.5.4',
-		'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/',
-		'feeds'=>array(
+		array(
+			'distro_name'=>'Ångström', 
+			'distro_version'=>'unstable',
+			'feed_base_url'=>'http://www.angstrom-distribution.org/unstable/feed/',
+			'feeds'=> 
 			array(
-				'name'=>'base',
-				'url'=>'base',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'opie',
-				'url'=>'opie',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'x11',
-				'url'=>'x11',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'upgrades',
-				'url'=>'upgrades',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'perl',
-				'url'=>'perl',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'python',
-				'url'=>'python',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'Collie upgrades',
-				'url'=>'upgrades/machine/collie',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'Tosa upgrades',
-				'url'=>'upgrades/machine/tosa',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'Poodle upgrades',
-				'url'=>'upgrades/machine/poodle',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'Poodle',
-				'url'=>'machine/poodle',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'Collie',
-				'url'=>'machine/collie',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'Tosa',
-				'url'=>'machine/tosa',
-				'type'=>'normal',
-			)
-		)
-	),
-	array(
-		'distro_name'=>'OpenZaurus', 
-		'distro_version'=>'3.5.4.1',
-		'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/',
-		'feeds'=>array(
-			array(
-				'name'=>'base',
-				'url'=>'base',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'opie',
-				'url'=>'opie',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'perl',
-				'url'=>'perl',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'python',
-				'url'=>'python',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'upgrades',
-				'url'=>'upgrades',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'x11',
-				'url'=>'x11',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'C7x0',
-				'url'=>'machine/c7x0',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'Spitz',
-				'url'=>'machine/spitz',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'Akita',
-				'url'=>'machine/akita',
-				'type'=>'normal',
-			),
-			array(
-				'name'=>'Akita upgrades',
-				'url'=>'upgrades/machine/akita',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'C7x0 upgrades',
-				'url'=>'upgrades/machine/c7x0',
-				'type'=>'upgrades',
-			),
-			array(
-				'name'=>'Spitz upgrades',
-				'url'=>'upgrades/machine/spitz',
-				'type'=>'upgrades',
-			)
-		)
-	)
-);
+				array(
+					'name'=>'All architectures',
+					'url'=>'all',
+				     ),
+				array(  
+					'name'=>'avr32 base',
+					'url'=>'avr32/base',
+				     ),
+				array(
+					'name'=>'blackfin base',
+					'url'=>'blackfin/base',
+				     ),
+
+				array(
+					'name'=>'armv5te base',
+					'url'=>'armv5te/base',
+				     ),
+				array(
+					'name'=>'iwmmxt base',
+					'url'=>'iwmmxt/base',
+				     ),
+				array(
+						'name'=>'armv5teb base',
+						'url'=>'armv5teb/base',
+				     ),
+				array(
+						'name'=>'arm-oabi base',
+						'url'=>'arm-oabi/base',
+				     ),
+
+				array(  
+						'name'=>'i586 base',
+						'url'=>'i586/base',
+				     ),
+				array(
+						'name'=>'i686 base',
+						'url'=>'i686/base',
+				     ),
+
+				array(  
+						'name'=>'armv4t base',
+						'url'=>'armv4t/base',
+				     ),
+				array(
+						'name'=>'armv6 base',
+						'url'=>'armv6/base',
+				     ),
+				array(  
+						'name'=>'ppc603e base',
+						'url'=>'ppc603e/base',
+				     ),
+				array(
+						'name'=>'ppc405 base',
+						'url'=>'ppc405/base',
+				     ),
+
+				array(  
+						'name'=>'armv5te perl',
+						'url'=>'armv5te/perl',
+				     ),
+				array(  
+						'name'=>'armv5te python',
+						'url'=>'armv5te/python',
+				     ),
+				array(  
+						'name'=>'armv5te debug',
+						'url'=>'armv5te/debug',
+				     ),
+				array(
+						'name'=>'armv5te gstreamer',
+						'url'=>'armv5te/gstreamer',
+				     ),
+				array(
+						'name'=>'avr32 perl',
+						'url'=>'avr32/perl',
+				     ),
+				array(
+						'name'=>'avr32 python',
+						'url'=>'avr32/python',
+				     ),
+				array(
+						'name'=>'avr32 debug',
+						'url'=>'avr32/debug',
+				     ),
+				array(
+						'name'=>'avr32 gstreamer',
+						'url'=>'avr32/gstreamer',
+				     ),
+
+				array(
+						'name'=>'blackfin perl',
+						'url'=>'blackfin/perl',
+				     ),
+				array(
+						'name'=>'blackfin python',
+						'url'=>'blackfin/python',
+				     ),
+				array(
+						'name'=>'blackfin debug',
+						'url'=>'blackfin/debug',
+				     ),
+				array(
+						'name'=>'blackfin gstreamer',
+						'url'=>'blackfin/gstreamer',
+				     ),
+				array(
+						'name'=>'armv4t perl',
+						'url'=>'armv4t/perl',
+				     ),
+				array(  
+						'name'=>'armv4t python',
+						'url'=>'armv4t/python',
+				     ),
+				array(  
+						'name'=>'armv4t debug',
+						'url'=>'armv4t/debug',
+				     ),
+				array(
+						'name'=>'armv4t gstreamer',
+						'url'=>'armv4t/gstreamer',
+				     ), 
+
+				array(
+						'name'=>'armv6 perl',
+						'url'=>'armv6/perl',
+				     ),
+				array(
+						'name'=>'armv6 python',
+						'url'=>'armv6/python',
+				     ),
+				array(
+						'name'=>'armv6 debug',
+						'url'=>'armv6/debug',
+				     ),
+				array(
+						'name'=>'armv6 gstreamer',
+						'url'=>'armv6/gstreamer',
+				     ),
+
+				array(
+						'name'=>'i686 perl',
+						'url'=>'i686/perl',
+				     ),
+				array(
+						'name'=>'i686 python',
+						'url'=>'i686/python',
+				     ),
+				array(  
+						'name'=>'i686 debug',
+						'url'=>'i686/debug',
+				     ),
+				array(  
+						'name'=>'i686 gstreamer',
+						'url'=>'i686/gstreamer',
+				     ),
+				array(
+						'name'=>'ppc603e perl',
+						'url'=>'ppc603e/perl',
+				     ),
+				array(
+						'name'=>'ppc603e python',
+						'url'=>'ppc603e/python',
+				     ),
+				array(
+						'name'=>'ppc603e debug',
+						'url'=>'ppc603e/debug',
+				     ),
+				array(
+						'name'=>'ppc603e gstreamer',
+						'url'=>'ppc603e/gstreamer',
+				     ),
+
+				array(
+						'name'=>'Motorola A780',
+						'url'=>'armv5te/machine/a780',
+				     ),
+				array(
+						'name'=>'HP iPAQ h2200',
+						'url'=>'armv5te/machine/h2200',
+				     ),
+
+				array(
+						'name'=>'HP iPAQ h4000',
+						'url'=>'armv5te/machine/h4000',
+				     ),
+
+				array(
+						'name'=>'HTC universal/ iMate jasjar',
+						'url'=>'armv5te/machine/htcuniversal',
+				     ),
+				array(
+						'name'=>'HP iPAQ hx4700',
+						'url'=>'armv5te/machine/hx4700',
+				     ),
+				array(
+						'name'=>'HP iPAQ hx2000 series',
+						'url'=>'armv5te/machine/hx2000',
+				     ),
+
+				array(
+						'name'=>'Psion Teklogix NetBook Pro',
+						'url'=>'armv5te/machine/netbook-pro',
+				     ),
+				array(
+						'name'=>'HTC Magician',
+						'url'=>'armv5te/machine/magician',
+				     ),
+				array(
+						'name'=>'Nokia 770 internet tablet',
+						'url'=>'armv5te/machine/nokia770',
+				     ),				     				     
+				array(
+						'name'=>'Sharp Zaurus 5600 (Poodle)',
+						'url'=>'armv5te/machine/poodle',
+				     ),
+				array(
+						'name'=>'Sharp Zaurus c7x0 (Corgi, Boxer, Husky, Shepher)',
+						'url'=>'armv5te/machine/c7x0',
+				     ),
+				array(  
+						'name'=>'Sharp Zaurus SL-C1000 (akita)',
+						'url'=>'armv5te/machine/akita',
+				     ),
+				array(  
+						'name'=>'HP iPAQ h5xxx series',
+						'url'=>'armv5te/machine/h5xxx',
+				     ),
+				array(
+						'name'=>'Sharp Zaurus SL-C6000 (Tosa)',
+						'url'=>'armv5te/machine/tosa',
+				     ),
+				array(
+						'name'=>'Sharp Zaurus SL-C3xxx (Spitz, Borzoi, Terrier)',
+						'url'=>'armv5te/machine/spitz',
+				     ),
+				array(
+						'name'=>'Cirrus Logic ep93xx boards',
+						'url'=>'armv4t/machine/ep93xx',
+				     ),
+				array(
+						'name'=>'FIC gta01/Neo1973 phone',
+						'url'=>'armv4t/machine/fic-gta01',
+				     ),
 
+				array(
+						'name'=>'HP iPAQ h6300',
+						'url'=>'armv4t/machine/h6300',
+				     ),
+				array(
+						'name'=>'Freescale i.mx31 ADS development board',
+						'url'=>'armv6/machine/mx31ads',
+				     ),
 
-$ipkpath = "/var/www/angstrom/unstable/feed/unsorted";
-$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc');
-$device_archs = array(
-		"a1200" => "armv5te", 
-		"a780"=> "armv5te", 
-		"acern30", 
-		"adsp-bf537-stamp" => "bfin", 
-		"adzs-bf538f-ezlite" => "bfin", 
-		"akita" => "armv5te", 
-		"alix", 
-		"amsdelta", 
-		"asus620", 
-		"asus730", 
-		"at32stk1000" => "avr32", 
-		"at91sam9260ek" => "armv5te", 
-		"at91sam9261ek" => "armv5te", 
-		"at91sam9263ek" => "armv5te", 
-		"atngw100" => "avr32", 
-		"aximx50" => "armv5te", 
-		"aximx50v" => "armv5te", 
-		"borzoi" => "armv5te", 
-		"boxer" => "armv5te", 
-		"c7x0" => "armv5te",  
-		"colinux", 
-		"collie", 
-		"compulab-pxa270" => "armv5te", 
-		"corgi" => "armv5te", 
-		"davinci-dvevm", 
-		"db1200", 
-		"devkitidp-pxa255" => "armv5te", 
-		"dht-walnut" => "ppc405", 
-		"e680" => "armv5te", 
-		"efika" => "ppc603e", 
-		"ep93xx" => "armv4t", 
-		"epia", 
-		"er0100" => "armv5te", 
-		"eteng500" => "armv5te", 
-		"fic-gta01" => "armv4t", 
-		"fic-gta02" => "armv4t", 
-		"fsg3be", 
-		"geodegx", 
-		"geodelx", 
-		"guinness", 
-		"gumstix-connex" => "armv5te", 
-		"gumstix-verdex" => "armv5te", 
-		"h1910", 
-		"h1940", 
-		"h2200" => "armv5te", 
-		"h3600" => "arm-oabi", 
-		"h3800" => "arm-oabi", 
-		"h3900" => "armv5te", 
-		"h4000" => "armv5te", 
-		"h5000" => "armv5te", 
-		"h6300" => "armv4t", 
-		"htcalpine", 
-		"htcapache", 
-		"htcblueangel", 
-		"htchimalaya", 
-		"htcsable", 
-		"htctornado", 
-		"htcuniversal" => "armv5te", 
-		"htcwallaby", 
-		"husky" => "armv5te", 
-		"hx2000" => "armv5te", 
-		"hx4700" => "armv5te", 
-		"i586-generic" => "i586", 
-		"i686-generic" => "i586", 
-		"ixp4xx", 
-		"ixp4xxbe" => "armv5teb", 
-		"ixp4xxle" => "armv5te", 
-		"jornada56x", 
-		"jornada6xx", 
-		"jornada7xx", 
-		"kb9202" => "armv4t", 
-		"ks8695", 
-		"lite5200", 
-		"logicpd-pxa270" => "armv5te", 
-		"looxc550", 
-		"lsarm", 
-		"lsppchd", 
-		"lsppchg", 
-		"magicbox", 
-		"magician" => "armv5te", 
-		"mainstone" => "armv5te", 
-		"mnci", 
-		"mtx-1", 
-		"mtx-2", 
-		"mtx-3", 
-		"mtx-3a", 
-		"mx21ads" => "armv5te", 
-		"mx31ads" => "armv6", 
-		"n2100", 
-		"native", 
-		"navman-icn330", 
-		"netbook-pro" => "armv5te", 
-		"netvista", 
-		"nokia770" => "armv5te", 
-		"nokia800", 
-		"nslu2" => "armv5te", 
-		"nslu2be" => "armv5teb", 
-		"nslu2le" => "armv5te", 
-		"omap1510inn" => "armv5te", 
-		"omap1610h2" => "armv5te", 
-		"omap1710h3" => "armv5te", 
-		"omap2420h4", 
-		"omap2430sdp", 
-		"omap5912osk" => "armv5te", 
-		"palmld" => "armv5te", 
-		"palmt650" => "armv5te", 
-		"palmt680", 
-		"palmtc", 
-		"palmtt", 
-		"palmtt2", 
-		"palmtt3", 
-		"palmtt5", 
-		"palmtx", 
-		"palmz31", 
-		"palmz71", 
-		"palmz72", 
-		"poodle" => "armv5te", 
-		"progear", 
-		"qemuarm" => "armv5te", 
-		"qemux86", 
-		"rb500", 
-		"rokre2" => "armv5te", 
-		"rokre6" => "armv5te", 
-		"rt3000", 
-		"rx1950", 
-		"rx3000", 
-		"sarge-at91" => "armv4t", 
-		"sequoia", 
-		"shark" => "arm-oabi", 
-		"shepherd" => "armv5te", 
-		"simpad" => "arm-oabi", 
-		"smdk2440" => "armv4t", 
-		"smdk2443" => "armv4t", 
-		"spitz" => "armv5te", 
-		"storcenter", 
-		"sun4cdm", 
-		"terrier" => "armv5te", 
-		"titan", 
-		"tosa" => "armv5te", 
-		"triton", 
-		"ts72xx", 
-		"turbostation", 
-		"wgt634u", 
-		"wl500g", 
-		"wrap", 
-		"wrt54", 
-		"x86-32-nocona", 
-		"x86-prescott", 
-		"x86-uml", 
-		"x86", 
-		"xilinx-ml403", 
-		"xilinx-ml410", 
-		"xxs1500", 
-		);
+				array(
+						'name'=>'Tyan thunder K7 s2462 mainboard (guinness)',
+						'url'=>'i686/machine/guinness',
+				     ),
+				array(
+						'name'=>'Progear webpad',
+						'url'=>'i686/machine/progear',
+				     ),
+				array(
+						'name'=>'Genesi Efika',
+						'url'=>'ppc603e/machine/efika',
+				     ),
 
-?>		
+			)// end distro[feeds]	
+		), //end distro
+		array(
+			'distro_name'=>'Ångström',
+			'distro_version'=>'2007.12',
+			'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2007/ipk/glibc/',
+			'feeds'=>
+			array( 
+				array(
+					'name'=>'noarch feed',
+					'url'=>'all',
+			     ),
+				array(  
+					'name'=>'arm-oabi architecture base feed',
+					'url'=>'arm-oabi/base',
+				     ),
+				array(  
+					'name'=>'arm-oabi architecture gstreamer feed',
+					'url'=>'arm-oabi/gstreamer',
+				     ),
+				array(  
+					'name'=>'arm-oabi architecture perl feed',
+					'url'=>'arm-oabi/perl',
+				     ),
+				array(  
+					'name'=>'arm-oabi architecture python feed',
+					'url'=>'arm-oabi/python',
+				     ),
+				array(  
+					'name'=>'arm-oabi architecture debug feed',
+					'url'=>'arm-oabi/debug',
+				     ),
+				array(  
+					'name'=>'armv4t architecture base feed',
+					'url'=>'armv4t/base',
+				     ),
+				array(  
+					'name'=>'armv4t architecture gstreamer feed',
+					'url'=>'armv4t/gstreamer',
+				     ),
+				array(  
+					'name'=>'armv4t architecture perl feed',
+					'url'=>'armv4t/perl',
+				     ),
+				array(  
+					'name'=>'armv4t architecture python feed',
+					'url'=>'armv4t/python',
+				     ),
+				array(  
+					'name'=>'armv4t architecture debug feed',
+					'url'=>'armv4t/debug',
+				     ),
+				array(  
+					'name'=>'armv5te architecture base feed',
+					'url'=>'armv5te/base',
+				     ),
+				array(  
+					'name'=>'armv5te architecture gstreamer feed',
+					'url'=>'armv5te/gstreamer',
+				     ),
+				array(  
+					'name'=>'armv5te architecture perl feed',
+					'url'=>'armv5te/perl',
+				     ),
+				array(  
+					'name'=>'armv5te architecture python feed',
+					'url'=>'armv5te/python',
+				     ),
+				array(  
+					'name'=>'armv5te architecture debug feed',
+					'url'=>'armv5te/debug',
+				     ),
+				array(  
+					'name'=>'armv5teb architecture base feed',
+					'url'=>'armv5teb/base',
+				     ),
+				array(  
+					'name'=>'armv5teb architecture gstreamer feed',
+					'url'=>'armv5teb/gstreamer',
+				     ),
+				array(  
+					'name'=>'armv5teb architecture perl feed',
+					'url'=>'armv5teb/perl',
+				     ),
+				array(  
+					'name'=>'armv5teb architecture python feed',
+					'url'=>'armv5teb/python',
+				     ),
+				array(  
+					'name'=>'armv5teb architecture debug feed',
+					'url'=>'armv5teb/debug',
+				     ),
+				array(  
+					'name'=>'armv6 architecture base feed',
+					'url'=>'armv6/base',
+				     ),
+				array(  
+					'name'=>'armv6 architecture gstreamer feed',
+					'url'=>'armv6/gstreamer',
+				     ),
+				array(  
+					'name'=>'armv6 architecture perl feed',
+					'url'=>'armv6/perl',
+				     ),
+				array(  
+					'name'=>'armv6 architecture python feed',
+					'url'=>'armv6/python',
+				     ),
+				array(  
+					'name'=>'armv6 architecture debug feed',
+					'url'=>'armv6/debug',
+				     ),
+				array(  
+					'name'=>'i486 architecture base feed',
+					'url'=>'i486/base',
+				     ),
+				array(  
+					'name'=>'i486 architecture gstreamer feed',
+					'url'=>'i486/gstreamer',
+				     ),
+				array(  
+					'name'=>'i486 architecture perl feed',
+					'url'=>'i486/perl',
+				     ),
+				array(  
+					'name'=>'i486 architecture python feed',
+					'url'=>'i486/python',
+				     ),
+				array(  
+					'name'=>'i486 architecture debug feed',
+					'url'=>'i486/debug',
+				     ),
+				array(  
+					'name'=>'i586 architecture base feed',
+					'url'=>'i586/base',
+				     ),
+				array(  
+					'name'=>'i586 architecture gstreamer feed',
+					'url'=>'i586/gstreamer',
+				     ),
+				array(  
+					'name'=>'i586 architecture perl feed',
+					'url'=>'i586/perl',
+				     ),
+				array(  
+					'name'=>'i586 architecture python feed',
+					'url'=>'i586/python',
+				     ),
+				array(  
+					'name'=>'i586 architecture debug feed',
+					'url'=>'i586/debug',
+				     ),
+				array(  
+					'name'=>'i686 architecture base feed',
+					'url'=>'i686/base',
+				     ),
+				array(  
+					'name'=>'i686 architecture gstreamer feed',
+					'url'=>'i686/gstreamer',
+				     ),
+				array(  
+					'name'=>'i686 architecture perl feed',
+					'url'=>'i686/perl',
+				     ),
+				array(  
+					'name'=>'i686 architecture python feed',
+					'url'=>'i686/python',
+				     ),
+				array(  
+					'name'=>'i686 architecture debug feed',
+					'url'=>'i686/debug',
+				     ),
+				array(  
+					'name'=>'iwmmxt architecture base feed',
+					'url'=>'iwmmxt/base',
+				     ),
+				array(  
+					'name'=>'iwmmxt architecture gstreamer feed',
+					'url'=>'iwmmxt/gstreamer',
+				     ),
+				array(  
+					'name'=>'iwmmxt architecture perl feed',
+					'url'=>'iwmmxt/perl',
+				     ),
+				array(  
+					'name'=>'iwmmxt architecture python feed',
+					'url'=>'iwmmxt/python',
+				     ),
+				array(  
+					'name'=>'iwmmxt architecture debug feed',
+					'url'=>'iwmmxt/debug',
+				     ),
+				array(  
+					'name'=>'ppc405 architecture base feed',
+					'url'=>'ppc405/base',
+				     ),
+				array(  
+					'name'=>'ppc405 architecture gstreamer feed',
+					'url'=>'ppc405/gstreamer',
+				     ),
+				array(  
+					'name'=>'ppc405 architecture perl feed',
+					'url'=>'ppc405/perl',
+				     ),
+				array(  
+					'name'=>'ppc405 architecture python feed',
+					'url'=>'ppc405/python',
+				     ),
+				array(  
+					'name'=>'ppc405 architecture debug feed',
+					'url'=>'ppc405/debug',
+				     ),
+				array(  
+					'name'=>'ppc603e architecture base feed',
+					'url'=>'ppc603e/base',
+				     ),
+				array(  
+					'name'=>'ppc603e architecture gstreamer feed',
+					'url'=>'ppc603e/gstreamer',
+				     ),
+				array(  
+					'name'=>'ppc603e architecture perl feed',
+					'url'=>'ppc603e/perl',
+				     ),
+				array(  
+					'name'=>'ppc603e architecture python feed',
+					'url'=>'ppc603e/python',
+				     ),
+				array(  
+					'name'=>'ppc603e architecture debug feed',
+					'url'=>'ppc603e/debug',
+				     )
+			) // end distro['feeds'] 
+		), //end distro
+		array(
+			'distro_name'=>'Ångström',
+			'distro_version'=>'2008.6',
+			'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2008/ipk/glibc/',
+			'feeds'=>
+			array( 
+				array(
+					'name'=>'noarch feed',
+					'url'=>'all',
+				     ),
+				array(  
+					'name'=>'arm-oabi architecture base feed',
+					'url'=>'arm-oabi/base',
+				     ),
+				array(  
+					'name'=>'arm-oabi architecture gstreamer feed',
+					'url'=>'arm-oabi/gstreamer',
+				     ),
+										array(  
+											'name'=>'arm-oabi architecture perl feed',
+											'url'=>'arm-oabi/perl',
+										     ),
+										array(  
+											'name'=>'arm-oabi architecture python feed',
+											'url'=>'arm-oabi/python',
+										     ),
+										array(  
+												'name'=>'arm-oabi architecture debug feed',
+												'url'=>'arm-oabi/debug',
+										     ),
+										array(  
+												'name'=>'armv4t architecture base feed',
+												'url'=>'armv4t/base',
+										     ),
+										array(  
+												'name'=>'armv4t architecture gstreamer feed',
+												'url'=>'armv4t/gstreamer',
+										     ),
+										array(  
+												'name'=>'armv4t architecture perl feed',
+												'url'=>'armv4t/perl',
+										     ),
+										array(  
+												'name'=>'armv4t architecture python feed',
+												'url'=>'armv4t/python',
+										     ),
+										array(  
+												'name'=>'armv4t architecture debug feed',
+												'url'=>'armv4t/debug',
+										     ),
+										array(  
+												'name'=>'armv5te architecture base feed',
+												'url'=>'armv5te/base',
+										     ),
+										array(  
+												'name'=>'armv5te architecture gstreamer feed',
+												'url'=>'armv5te/gstreamer',
+										     ),
+										array(  
+												'name'=>'armv5te architecture perl feed',
+												'url'=>'armv5te/perl',
+										     ),
+										array(  
+												'name'=>'armv5te architecture python feed',
+												'url'=>'armv5te/python',
+										     ),
+										array(  
+												'name'=>'armv5te architecture debug feed',
+												'url'=>'armv5te/debug',
+										     ),
+										array(  
+												'name'=>'armv5teb architecture base feed',
+												'url'=>'armv5teb/base',
+										     ),
+										array(  
+												'name'=>'armv5teb architecture gstreamer feed',
+												'url'=>'armv5teb/gstreamer',
+										     ),
+										array(  
+												'name'=>'armv5teb architecture perl feed',
+												'url'=>'armv5teb/perl',
+										     ),
+										array(  
+												'name'=>'armv5teb architecture python feed',
+												'url'=>'armv5teb/python',
+										     ),
+										array(  
+												'name'=>'armv5teb architecture debug feed',
+												'url'=>'armv5teb/debug',
+										     ),
+										array(  
+												'name'=>'armv6 architecture base feed',
+												'url'=>'armv6/base',
+										     ),
+										array(  
+												'name'=>'armv6 architecture gstreamer feed',
+												'url'=>'armv6/gstreamer',
+										     ),
+										array(  
+												'name'=>'armv6 architecture perl feed',
+												'url'=>'armv6/perl',
+										     ),
+										array(  
+												'name'=>'armv6 architecture python feed',
+												'url'=>'armv6/python',
+										     ),
+										array(  
+												'name'=>'armv6 architecture debug feed',
+												'url'=>'armv6/debug',
+										     ),
+										array(  
+												'name'=>'i486 architecture base feed',
+												'url'=>'i486/base',
+										     ),
+										array(  
+												'name'=>'i486 architecture gstreamer feed',
+												'url'=>'i486/gstreamer',
+										     ),
+										array(  
+												'name'=>'i486 architecture perl feed',
+												'url'=>'i486/perl',
+										     ),
+										array(  
+												'name'=>'i486 architecture python feed',
+												'url'=>'i486/python',
+										     ),
+										array(  
+												'name'=>'i486 architecture debug feed',
+												'url'=>'i486/debug',
+										     ),
+										array(  
+												'name'=>'i586 architecture base feed',
+												'url'=>'i586/base',
+										     ),
+										array(  
+												'name'=>'i586 architecture gstreamer feed',
+												'url'=>'i586/gstreamer',
+										     ),
+										array(  
+												'name'=>'i586 architecture perl feed',
+												'url'=>'i586/perl',
+										     ),
+										array(  
+												'name'=>'i586 architecture python feed',
+												'url'=>'i586/python',
+										     ),
+										array(  
+												'name'=>'i586 architecture debug feed',
+												'url'=>'i586/debug',
+										     ),
+										array(  
+												'name'=>'i686 architecture base feed',
+												'url'=>'i686/base',
+										     ),
+										array(  
+												'name'=>'i686 architecture gstreamer feed',
+												'url'=>'i686/gstreamer',
+										     ),
+										array(  
+												'name'=>'i686 architecture perl feed',
+												'url'=>'i686/perl',
+										     ),
+										array(  
+												'name'=>'i686 architecture python feed',
+												'url'=>'i686/python',
+										     ),
+										array(  
+												'name'=>'i686 architecture debug feed',
+												'url'=>'i686/debug',
+										     ),
+										array(  
+												'name'=>'iwmmxt architecture base feed',
+												'url'=>'iwmmxt/base',
+										     ),
+										array(  
+												'name'=>'iwmmxt architecture gstreamer feed',
+												'url'=>'iwmmxt/gstreamer',
+										     ),
+										array(  
+												'name'=>'iwmmxt architecture perl feed',
+												'url'=>'iwmmxt/perl',
+										     ),
+										array(  
+												'name'=>'iwmmxt architecture python feed',
+												'url'=>'iwmmxt/python',
+										     ),
+										array(  
+												'name'=>'iwmmxt architecture debug feed',
+												'url'=>'iwmmxt/debug',
+										     ),
+										array(  
+												'name'=>'ppc405 architecture base feed',
+												'url'=>'ppc405/base',
+										     ),
+										array(  
+												'name'=>'ppc405 architecture gstreamer feed',
+												'url'=>'ppc405/gstreamer',
+										     ),
+										array(  
+												'name'=>'ppc405 architecture perl feed',
+												'url'=>'ppc405/perl',
+										     ),
+										array(  
+												'name'=>'ppc405 architecture python feed',
+												'url'=>'ppc405/python',
+										     ),
+										array(  
+												'name'=>'ppc405 architecture debug feed',
+												'url'=>'ppc405/debug',
+										     ),
+										array(  
+												'name'=>'ppc603e architecture base feed',
+												'url'=>'ppc603e/base',
+										     ),
+										array(  
+												'name'=>'ppc603e architecture gstreamer feed',
+												'url'=>'ppc603e/gstreamer',
+										     ),
+										array(  
+												'name'=>'ppc603e architecture perl feed',
+												'url'=>'ppc603e/perl',
+										     ),
+										array(  
+												'name'=>'ppc603e architecture python feed',
+												'url'=>'ppc603e/python',
+										     ),
+										array(  
+												'name'=>'ppc603e architecture debug feed',
+												'url'=>'ppc603e/debug',
+										     )
+									)// end distro[feeds]s		
+								)// end distro
+							); //end $feeds
+?> 
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index 53317ebb03..98751ea26c 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -46,9 +46,15 @@ if(!check_database())
 
 $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
 
-if($argc > 1 AND $argv[1] == 'upgrades')
+if($argc == 2)
 {
-	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'");
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_uri = '${argv[1]}'");
+} else if ($argc == 3 && $argv[1] == "--type") {
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = '${argv[2]}'");
+}
+
+if (!$feeds) {
+    die("Cannot find feed(s) in the DB\n");
 }
 
 $start = time();
diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc
index 987b85dc29..c01458d626 100644
--- a/packages/util-linux-ng/util-linux-ng.inc
+++ b/packages/util-linux-ng/util-linux-ng.inc
@@ -6,8 +6,9 @@ DEPENDS = "zlib ncurses e2fsprogs-libs"
 inherit autotools
 
 # I'm finishing this recipe during the 2.13.1 candidate release cycle
-# @todo Remove $RC later. See if patches are needed. File locations.
+# @todo Remove $RC later. See if patches are needed. Move files from /usr/*.
 # --  Leon 'likewise' Woestenberg
+
 RC="-rc2"
 DEFAULT_PREFERENCE = "-1"
 
@@ -36,7 +37,9 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile"
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
 
-EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown"
+EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \
+--enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \
+--enable-arch --enable-init"
 
 S = "${WORKDIR}/util-linux-ng-${PV}${RC}"
 
@@ -81,30 +84,38 @@ do_install () {
 	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
 		'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
 		'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
-        return 0
-	test -f ${D}${base_sbindir}/pivot_root && \
-	mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
-	mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
-	mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN}
-	mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN}
-	mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
-	mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
-	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
-	mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN}
-	mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
-	mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
+	mkdir ${D}${base_bindir}
+	mkdir ${D}${base_sbindir}
+	test -f ${D}${sbindir}/pivot_root && \
+	mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
+	mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
+	mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN}
+	mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN}
+	mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
+	mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
+	mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+#	mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN}
+	mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
+	mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
 	mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN}
 	mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
 	mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
 	mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
 	mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN}
 	mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
+        return 0
+
+	mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
+	mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
+	mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN}
+	mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN}
+	mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
+
+	mv ${D}${bindir}/agetty ${D}${base_sbindir}/ 
+	mv ${D}${bindir}/blockdev ${D}${base_sbindir}/
+	mv ${D}${bindir}/cfdisk ${D}${base_sbindir}/
+	mv ${D}${bindir}/ctrlaltdel ${D}${base_sbindir}/
 
-	mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
-	mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
-	mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN}
-	mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN}
-	mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
 	install -d ${D}${sysconfdir}/default/
 	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
@@ -132,7 +143,7 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${bindir}/renice renice renice.${PN} 100
 	update-alternatives --install ${bindir}/wall wall wall.${PN} 100
 	
-	# There seems to be problem, atleast on nslu2, with these, untill they are
+	# There seems to be problem, atleast on nslu2, with these, until they are
 	# fixed the busybox ones have higher priority
 	update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 10
 	update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10