merge of b20c3c5a8f28ed4e47ac9afd5626ef9138ad0c95

     and b7799ca5f38be5d5b31eafe3229e04bd95f48e05

4 files changed, 39 insertions, 13 deletions

diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index 0a270a8eb0..e1999b066f 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -11,50 +11,62 @@ $feeds = array(
 			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',
 			)
 		)
 	),
@@ -66,50 +78,62 @@ $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',
 			)
 		)
 	)
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index 4745c75910..2532dd7c08 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -85,11 +85,12 @@ function insert_feeds ($db)
 		{
 			foreach($distro['feeds'] as $feed)
 			{
-				sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri) VALUES
+				sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri, f_type) VALUES
 					(
 						{$id},
 						'{$distro['distro_name']} {$distro['distro_version']} {$feed['name']}',
-						'{$distro['feed_base_url']}{$feed['url']}'
+						'{$distro['feed_base_url']}{$feed['url']}',
+						'{$feed['type']}'
 					)");
 
 				$id++;
@@ -441,7 +442,8 @@ function check_database()
 				f_id         int(8),
 				f_name       varchar(32),
 				f_uri        varchar(100),
-				f_comments   varchar(500))");
+				f_type		 varchar(16)
+		)");
 
 			insert_feeds ($db) ;
 		}
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index b82b843663..ed67d3b78a 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -39,11 +39,16 @@ require_once 'includes/functions.inc';
 
 check_database();
 
+$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
+
+if($argc > 1 AND $argv[1] == 'upgrades')
+{
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'");
+}
+
 $start = time();
 $p_count = 0;
 
-$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
-
 foreach($feeds as $feed)
 {
     print("Updating {$feed['f_name']}: ");
diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb
index 9e499c7687..7a5ff66af2 100644
--- a/packages/linux/linux-omap1_2.6.x+git.bb
+++ b/packages/linux/linux-omap1_2.6.x+git.bb
@@ -9,24 +9,19 @@ S = "${WORKDIR}/git"
 
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
-#KERNEL_CCSUFFIX = "-4.1.1"
 
 DEPENDS = "u-boot"
 
 inherit kernel
 
-# GIT does not have the UTS_RELEASE in version.h used to find the kernel version
-KERNEL_RELEASE = "2.6.17"
-
 COMPATIBLE_HOST = 'arm.*-linux'
 
 do_configure_prepend() {
         if [ "${MACHINE}" == "omap5912osk" ] ; then
-                 make omap_osk_5912_defconfig
+                 oe_runmake omap_osk_5912_defconfig
         fi
-        
-        oe_runmake oldconfig
-}
+
+}        
 
 do_deploy() {
         if [ "${MACHINE}" == "omap5912osk" ]; then