[oe-commits] org.oe.dev merge of '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
koen commit
openembedded-commits at lists.openembedded.org
Fri Dec 7 10:35:28 UTC 2007
merge of '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 105955293719b2a1414f1b03af410b8ff8dbdb1b
ViewMTN: http://monotone.openembedded.org/revision/info/105955293719b2a1414f1b03af410b8ff8dbdb1b
Files:
1
contrib/angstrom/rss2.php
contrib/angstrom/build-release.sh
contrib/angstrom/rss.php
packages/tasks/task-python-everything.bb
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r40faf7d48d883c5cd0bb74d8c212de805ef7cdf3 -r105955293719b2a1414f1b03af410b8ff8dbdb1b
#
#
#
# add_file "contrib/angstrom/rss2.php"
# content [30cfd581394ae7f5e17996503a966670e246c014]
#
# patch "contrib/angstrom/build-release.sh"
# from [843df303818fa5ebb602d61d6ece155fa69e1bdf]
# to [2fb09c74580347257b64436551a2367492be367b]
#
# patch "contrib/angstrom/rss.php"
# from [a3c2ef58537ead249729992e9297b9157e6f1a09]
# to [1ed147213049aa6f7086f8439401621c2a865702]
#
# patch "packages/tasks/task-python-everything.bb"
# from [8ac45927171c9bfd7e98506a31c29c28f1184299]
# to [2e4ebcc640b47da88d113e5780f8f4da2e755a21]
#
============================================================
--- contrib/angstrom/rss2.php 30cfd581394ae7f5e17996503a966670e246c014
+++ contrib/angstrom/rss2.php 30cfd581394ae7f5e17996503a966670e246c014
@@ -0,0 +1,63 @@
+<?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";
+?>
============================================================
--- contrib/angstrom/build-release.sh 843df303818fa5ebb602d61d6ece155fa69e1bdf
+++ contrib/angstrom/build-release.sh 2fb09c74580347257b64436551a2367492be367b
@@ -29,7 +29,7 @@ do_report_success() {
do_report_success() {
- echo "$(date -u +%Y%M%d%H%M) $target ($BUILD_MODE) built for $machine" >> autobuilder.log
+ echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log
}
# No graphics
============================================================
--- contrib/angstrom/rss.php a3c2ef58537ead249729992e9297b9157e6f1a09
+++ contrib/angstrom/rss.php 1ed147213049aa6f7086f8439401621c2a865702
@@ -1,43 +1,48 @@
-<? print('<?xml version="1.0" encoding="utf-8"?>');?>
+<?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>Ã…ngstrom autobuilder updates </title>
- <link>http://www.angstrom-distribution.org/unstable/autobuild</link>
- <description></description>
- <language>en</language>
+ <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";
-if ($handle = opendir("$base_path")) {
+if ($handle = opendir("$base_path"))
+{
+ while (false !== ($file = readdir($handle)))
+ {
+ if(!(is_dir($file) && $file != "." && $file != ".."))
+ {
+ continue;
+ }
- while (false !== ($file = readdir($handle))) {
- if(is_dir($file) && $file != "." && $file != "..") {
- $second_handle = opendir("$base_path/$file/");
- while (false !== ($file2 = readdir($second_handle))) {
- if(is_file("/$base_path/$file/$file2")) {
- $fmtime = filemtime("$file/$file2");
+ $second_handle = opendir("$base_path/$file/");
-print("<item>\n");
-print("<title>$file/$file2 uploaded</title>\n");
-print(" <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n");
+ while (false !== ($file2 = readdir($second_handle)))
+ {
+ if(is_file("/$base_path/$file/$file2"))
+ {
+ $fmtime = filemtime("$file/$file2");
-$rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime);
+ echo "<item>\n"
+ echo "<title>$file/$file2 uploaded</title>\n";
+ echo " <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n";
-print("<pubDate>$rsstime</pubDate>\n");
-print("<dc:creator>Angstrom autobuilder</dc:creator>");
-print("</item>\n");
+ $rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime);
- }
+ echo "<pubDate>$rsstime</pubDate>\n";
+ echo "<dc:creator>Angstrom autobuilder</dc:creator>";
+ echo "</item>\n";
}
- closedir($second_handle);
- }
+ }
+ closedir($second_handle);
}
+
closedir($handle);
}
?>
-</channel>
+ </channel>
</rss>
-
-
============================================================
--- packages/tasks/task-python-everything.bb 8ac45927171c9bfd7e98506a31c29c28f1184299
+++ packages/tasks/task-python-everything.bb 2e4ebcc640b47da88d113e5780f8f4da2e755a21
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml20"
+PR = "ml21"
RDEPENDS = "\
python-ao \
@@ -9,10 +9,7 @@ RDEPENDS = "\
python-constraint \
python-dbus \
python-dialog \
- python-evas \
- python-ecore \
-# python-emotion \
-# python-edje \
+ python-efl \
python-pycurl \
python-fam \
python-fnorb \
@@ -52,6 +49,7 @@ RDEPENDS = "\
python-pyiw \
python-pylinda \
python-pylint \
+ python-pyqt \
python-pyraf \
python-pyreverse \
python-pyrex \
@@ -74,6 +72,7 @@ RDEPENDS = "\
python-spydi \
python-spyro \
python-sqlobject \
+ python-sword \
python-tlslite \
python-urwid \
python-vmaps \
@@ -88,9 +87,7 @@ BROKEN_PACKAGES = "\
python-egenix-mx-base \
python-gammu \
python-m2crypto \
- python-sword \
python-mysqldb \
- python-pyqt \
python-pyqwt \
"
#
# mt diff -rf564197dcff7dea800a0dcabf27c4809e2521c8c -r105955293719b2a1414f1b03af410b8ff8dbdb1b
#
#
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [a59b4bdff5fea83e852628a968abbeb155999248]
# to [781a9a9775be71ff7f91c9abe1fb7a8c7af4b061]
#
============================================================
--- conf/distro/angstrom-2007.1.conf a59b4bdff5fea83e852628a968abbeb155999248
+++ conf/distro/angstrom-2007.1.conf 781a9a9775be71ff7f91c9abe1fb7a8c7af4b061
@@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\
update-modules \
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
angstrom-version \
- ipkg ipkg-collateral angstrom-feed-configs \
+ ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
util-linux-mount util-linux-umount \
${EXTRA_STUFF} \
${DEBUG_APPS} \
More information about the Openembedded-commits
mailing list