merge of '967336334b2d3b22623c9851eb0ab8a2f5ad19c2'

     and 'f1ce41fae2ee4dc6bfc75fb8d991a37869ef24d8'

9 files changed, 124 insertions, 99 deletions

diff --git a/contrib/angstrom/rss.php b/contrib/angstrom/rss.php
index cf5a9e0218..2e1f49c4cc 100644
--- a/contrib/angstrom/rss.php
+++ b/contrib/angstrom/rss.php
@@ -1,48 +1,63 @@
-<?php echo ('<?xml version="1.0" encoding="utf-8"?>'); ?>
-<rss version="2.0" xml:base="http://www.angstrom-distribution.org/unstable/autobuild/" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<channel>
-		<title>Ångström autobuilder updates</title>
-		<link>http://www.angstrom-distribution.org/unstable/autobuild/</link>
-		<description></description>
-		<language>en</language>
 <?php
 
-$base_path = "/home/angstrom/website/unstable/autobuild";
+/*
+ * This generator expect only log from autobuilder in simple format:
+ * TIME_OF_BUILD BUILD_TARGET BUILD_MODE MACHINE
+ *
+ * where TIME_OF_BUILD is epoch
+ *
+ * All what it does is parsing log and output it in reverse order (new builds 
+ * first) in RSS 2.0 format.
+ *
+ * (C) 2007 Marcin Juszkiewicz
+ *
+ * License: MIT
+ *
+ */
 
-if ($handle = opendir("$base_path")) 
-{
-	while (false !== ($file = readdir($handle))) 
-	{
-		if(!(is_dir($file) && $file != "." && $file != ".."))
-		{
-			continue;
-		}
+$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/';
+
+$builder_log_date = file('autobuilder.log');
+
+if(empty($builder_log_date))
+	die("No logs\n");
+
+$builder_log_date = array_reverse($builder_log_date);
+
+$rss_xml = new xmlWriter();
 
-		$second_handle = opendir("$base_path/$file/");
+if(!$rss_xml)
+	die("Unable to create XML Writer\n");
 
-		while (false !== ($file2 = readdir($second_handle))) 
-		{
-			if(is_file("/$base_path/$file/$file2")) 
-			{ 
-				$fmtime = filemtime("$file/$file2");
+$rss_xml->openMemory();
 
-				echo "<item>\n"
-				echo "<title>$file/$file2 uploaded</title>\n";
-				echo " <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n";
+$rss_xml->startDocument('1.0','utf-8');
+$rss_xml->startElement('rss');
+$rss_xml->writeAttribute('version', '2.0');
 
-				$rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime);
+$rss_xml->startElement('channel');
 
-				echo "<pubDate>$rsstime</pubDate>\n";
-				echo "<dc:creator>Angstrom autobuilder</dc:creator>";
-				echo "</item>\n";
-			}
-		}
+$rss_xml->writeElement('title', 'Ångström autobuilder updates');
+$rss_xml->writeElement('link', $build_link_base);
+$rss_xml->writeElement('description', 'Ångström autobuilder updates list');
 
-		closedir($second_handle);
-	}
+foreach($builder_log_date as $build)
+{
+	$build = str_replace("\n", "", $build);
+	$data = explode(' ', $build);
+
+	$rss_xml->startElement('item');
+	$rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]} (" . date('c', $data[0]) . ")");
+	$rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/");
+	$rss_xml->writeElement('pubDate', date('r', $data[0]));
 
-	closedir($handle);
+	$rss_xml->endElement();
 }
+
+$rss_xml->endElement();
+$rss_xml->endElement();
+
+echo $rss_xml->outputMemory(true);   
+
+echo "\n";
 ?>
-	</channel>
-</rss>
diff --git a/contrib/angstrom/rss2.php b/contrib/angstrom/rss2.php
deleted file mode 100644
index 995c344e14..0000000000
--- a/contrib/angstrom/rss2.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This generator expect only log from autobuilder in simple format:
- * TIME_OF_BUILD BUILD_TARGET BUILD_MODE MACHINE
- *
- * where TIME_OF_BUILD is epoch
- *
- * All what it does is parsing log and output it in reverse order (new builds 
- * first) in RSS 2.0 format.
- *
- * (C) 2007 Marcin Juszkiewicz
- *
- * License: MIT
- *
- */
-
-$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/';
-
-$builder_log_date = file('autobuilder.log');
-
-if(empty($builder_log_date))
-	die("No logs\n");
-
-$builder_log_date = array_reverse($builder_log_date);
-
-$rss_xml = new xmlWriter();
-
-if(!$rss_xml)
-	die("Unable to create XML Writer\n");
-
-$rss_xml->openMemory();
-
-$rss_xml->startDocument('1.0','utf-8');
-$rss_xml->startElement('rss');
-$rss_xml->writeAttribute('version', '2.0');
-
-$rss_xml->startElement('channel');
-
-$rss_xml->writeElement('title', 'Ångström autobuilder updates');
-$rss_xml->writeElement('link', $build_link_base);
-$rss_xml->writeElement('description', 'Ångström autobuilder updates list');
-
-foreach($builder_log_date as $build)
-{
-	$build = str_replace("\n", "", $build);
-	$data = explode(' ', $build);
-
-	$rss_xml->startElement('item');
-	$rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}");
-	$rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/");
-	$rss_xml->writeElement('pubDate', date('r', $data[0]));
-
-	$rss_xml->endElement();
-}
-
-$rss_xml->endElement();
-$rss_xml->endElement();
-
-echo $rss_xml->outputMemory(true);   
-
-echo "\n";
-?>
diff --git a/contrib/image-convert/.mtn2git_empty b/contrib/image-convert/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/contrib/image-convert/.mtn2git_empty
diff --git a/contrib/image-convert/README b/contrib/image-convert/README
new file mode 100644
index 0000000000..9daca60703
--- /dev/null
+++ b/contrib/image-convert/README
@@ -0,0 +1,5 @@
+This directory contains scripts to convert (root) filesystem images from one
+format to another. While OpenEmbedded has extensive support for generating
+images in various formats, sometimes it may be useful/needed to convert
+already existing image.
+
diff --git a/contrib/image-convert/cpio2tar b/contrib/image-convert/cpio2tar
new file mode 100755
index 0000000000..7f2c92fe26
--- /dev/null
+++ b/contrib/image-convert/cpio2tar
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+cd scratch; gzip -d -c ../$1 | cpio -i --make-directories; \
+cd ..; \
+tar -cj -C scratch -f $(basename $1 .cpio.gz).tar.bz2 ."
diff --git a/contrib/image-convert/tar2ext2 b/contrib/image-convert/tar2ext2
new file mode 100755
index 0000000000..d5756a4733
--- /dev/null
+++ b/contrib/image-convert/tar2ext2
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <tarball> <ext2 size>"
+    exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+dir=$(dirname $1)
+
+if [ "$ext" == "tar.bz2" ]; then
+    uncompress=j
+else
+    uncompress=z
+fi
+
+rm -rf mnt
+mkdir -p mnt
+
+fakeroot bash -c "\
+tar -x$uncompress -f $1 -C mnt; \
+genext2fs -d mnt -b $(($2 * 1024)) $dir/$base.img; \
+rm -rf mnt; \
+"
diff --git a/contrib/image-convert/tar2ext2.mount b/contrib/image-convert/tar2ext2.mount
new file mode 100755
index 0000000000..7e23098c4d
--- /dev/null
+++ b/contrib/image-convert/tar2ext2.mount
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <tarball> <ext2 size>"
+    exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+if [ "$ext" == "tar.bz2" ]; then
+    uncompress=j
+else
+    uncompress=z
+fi
+
+dd if=/dev/zero of=$base.img bs=1M count=$2
+mkfs.ext2 -F -m1 $base.img
+
+mkdir -p mnt
+mount -o loop $base.img mnt
+
+tar -x$uncompress -f $1 -C mnt
+
+umount mnt
+rm -rf mnt
diff --git a/contrib/image-convert/tar2jffs b/contrib/image-convert/tar2jffs
new file mode 100755
index 0000000000..7bf158e4a5
--- /dev/null
+++ b/contrib/image-convert/tar2jffs
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+tar -xj -f $1 -C scratch; \
+${STAGING}mkfs.jffs2 -x lzo --root=scratch --faketime --output=$(dirname $1)/$(basename $1 .tar.bz2).jffs2"
diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index a92b58dc73..5658c1662d 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -42,6 +42,7 @@ OE_vars = [
     'RPROVIDES',
     'RCONFLICTS',
     'SRCDATE',
+    'PE',
     'PV',
     'PR',
     'SRC_URI',