diff options
author | Rod Whitby <rod@whitby.id.au> | 2009-02-06 17:24:03 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2009-02-06 17:24:03 +0000 |
commit | 3248ec9ec8a70b5c711a91b9b9196fbbf739e5fb (patch) | |
tree | 9fe66ec52450092996a7b9a9c223ecb34e337183 | |
parent | 2f0da8e805f83a4580a4f78f78d1c5a604a9880a (diff) | |
parent | 7e2a63b555ef4e8c9100a0785a0df2ec1855088f (diff) |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 8 | ||||
-rw-r--r-- | conf/machine/h2200.conf | 1 | ||||
-rw-r--r-- | conf/machine/hx4700.conf | 1 | ||||
-rw-r--r-- | contrib/feed-browser/index.html | 47 | ||||
-rw-r--r-- | contrib/feed-browser/index.php | 108 | ||||
-rw-r--r-- | contrib/feed-browser/scripts/js/repo.js | 129 | ||||
-rw-r--r-- | contrib/feed-browser/section.php | 85 | ||||
-rw-r--r-- | packages/freesmartphone/fso-abyss_git.bb | 18 | ||||
-rw-r--r-- | packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig | 2 | ||||
-rw-r--r-- | packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig | 2 | ||||
-rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 | ||||
-rw-r--r-- | packages/python/python-coherence_svn.bb | 4 | ||||
-rw-r--r-- | packages/serial-utils/pty-forward-native.bb | 11 | ||||
-rw-r--r-- | packages/serial-utils/serial-forward.bb | 12 |
14 files changed, 304 insertions, 126 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 6d8d2ea09e..711c0f74d6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,6 +43,7 @@ SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" SRCREV_pn-exalt-module ?= "78" SRCREV_pn-ezx-boot-usb-native ?= "2371" +SRCREV_pn-ezx-gen-blob ?= "2390" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" @@ -53,6 +54,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d" SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" +SRCREV_pn-fso-abyss ?= "b8430f9e8898dae390191fb114904f13583043f5" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" @@ -185,7 +187,7 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" -SRCREV_pn-pty-forward-native ?= "4214" +SRCREV_pn-pty-forward-native ?= "4907" SRCREV_pn-pyefl-sudoku ?= "49" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" @@ -206,7 +208,7 @@ SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798" SRCREV_pn-remoko ?= "121" SRCREV_pn-remoko-server ?= "121" SRCREV_pn-s3c24xx-gpio ?= "4130" -SRCREV_pn-serial-forward ?= "4214" +SRCREV_pn-serial-forward ?= "4907" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" @@ -223,7 +225,7 @@ SRCREV_pn-uclibc ?= "24279" SRCREV_pn-uclibc-initial ?= "24279" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" -SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5" +SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" SRCREV_pn-webkit-gtk ?= "39964" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 6ccdc5070e..abc17728b5 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -45,5 +45,4 @@ module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt" require conf/machine/include/LAB-settings.inc diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 4906f87e76..ab532e33ff 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -73,5 +73,4 @@ module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" -IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/contrib/feed-browser/index.html b/contrib/feed-browser/index.html new file mode 100644 index 0000000000..08b1d9a804 --- /dev/null +++ b/contrib/feed-browser/index.html @@ -0,0 +1,47 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> + <title>Feed browser</title> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <style type="text/css" media="all">@import "css/feed.css";</style> + <script language="javascript" type="text/javascript" src="scripts/js/repo.js"></script> + </head> + <body onLoad=" qs(); getLetter(); getSection();"> + <div id="right"> + <div id="searchletter"</div> + <form name="pkg_query" onsubmit="javascript:pkgQuery();return false""> + <fieldset> + <label for="name">Package name</label> + <input id="pkgsearch" type="text" name="pkgsearch" value="" /> + <select name="arch"> + <option value="" selected="selected">all architectures</option> + <option value="all">no arch</option> +<?php + +foreach($archs_list as $architecture) +{ + echo "<option value='{$architecture['p_arch']}'"; + + if($architecture['p_arch'] == $arch) + { + echo ' selected="selected"'; + } + echo ">{$architecture['p_arch']}</option>"; +} + +?> + + + </select> + <input type="submit" value="Search" /> + </fieldset> + </form> + <div id="opkgoutput"><?php echo $ipkgoutput; ?></div> + </div> + <div id="left"> + <h1>Sections list</h1> + <div id="sectionslist"></div> + </div> + </body> +</html> diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php deleted file mode 100644 index eca57e9269..0000000000 --- a/contrib/feed-browser/index.php +++ /dev/null @@ -1,108 +0,0 @@ -<?php - -/* - * (c) Koen Kooi 2006, 2007 - * (c) Marcin Juszkiewicz 2006, 2007 - * - * This php script is intended to do the following: - * - * - have searchable webfronted for the feed like packages.ubuntu.com - * - * ToDo: - * - * - search functionality - * - provide feed-management functionality - * - allow uploading of new software - * - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License along - * with this library; see the file COPYING.LIB. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - * - */ - -require_once 'includes/config.inc'; -require_once 'includes/functions.inc'; - -if(!check_database()) -{ - die("Database not found and cannot be created."); -} - -read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section')); - -$ipkgoutput = ''; - -if(!empty($section)) -{ - $ipkgoutput = searchsection($section); -} -elseif(!empty($letter)) -{ - $ipkgoutput = searchpkg("{$letter}%", $arch); -} -elseif(!empty($pkgname)) -{ - $ipkgoutput = pkgdetails($pkgname); -} -elseif(!empty($pkgsearch) OR !empty($arch)) -{ - $ipkgoutput = searchpkg("%{$pkgsearch}%", $arch); -} - -$archs_list = get_arch_list(); - -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> - <head> - <title>Feed browser</title> - <meta http-equiv="Content-Style-Type" content="text/css" /> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <style type="text/css" media="all">@import "css/feed.css";</style> - </head> - <body > - <div id="right"> - <?php echo searchletter(); ?> - <form action="" method="get"> - <fieldset> - <label for="name">Package name</label> - <input type="text" name="pkgsearch" value="<?php echo $pkgsearch; ?>" /> - <select name="arch"> - <option value="" selected="selected">all architectures</option> - <option value="all">no arch</option> -<?php - -foreach($archs_list as $architecture) -{ - echo "<option value='{$architecture['p_arch']}'"; - - if($architecture['p_arch'] == $arch) - { - echo ' selected="selected"'; - } - echo ">{$architecture['p_arch']}</option>"; -} - -?> - </select> - <input type="submit" value="Search" /> - </fieldset> - </form> - <?php echo $ipkgoutput; ?> - </div> - <div id="left"> - <h1>Sections list</h1> - <?php echo sectionslist(); ?> - </div> - </body> -</html> diff --git a/contrib/feed-browser/scripts/js/repo.js b/contrib/feed-browser/scripts/js/repo.js new file mode 100644 index 0000000000..95b36f3935 --- /dev/null +++ b/contrib/feed-browser/scripts/js/repo.js @@ -0,0 +1,129 @@ +/* The following function creates an XMLHttpRequest object... */ + +function createRequestObject(){ + var request_o; //declare the variable to hold the object. + var browser = navigator.appName; //find the browser name + if(browser == "Microsoft Internet Explorer"){ + /* Create the object using MSIE's method */ + request_o = new ActiveXObject("Microsoft.XMLHTTP"); + } else { + /* Create the object using other browser's method */ + request_o = new XMLHttpRequest(); + } + return request_o; //return the object +} + +/* The variable http will hold our new XMLHttpRequest object. */ +var sectionHTTP = createRequestObject(); +var queryHTTP = createRequestObject(); +var http = createRequestObject(); + +var qsParm = new Array(); +qsParm['pkgsearch'] = null; +qsParm['arch'] = null; +qsParm['section'] = null; +qsParm['pkgname'] = null; + + +function qs() { + var query = window.location.search.substring(1); + var parms = query.split('&'); + for (var i=0; i<parms.length; i++) { + var pos = parms[i].indexOf('='); + if (pos > 0) { + var key = parms[i].substring(0,pos); + var val = parms[i].substring(pos+1); + qsParm[key] = val; + } + } + if (qsParm['pkgsearch']) { + document.getElementById('pkgsearch').value = qsParm['pkgsearch']; + pkgQuery(); + } + if (qsParm['pkgname']) { + document.getElementById('pkgsearch').value = qsParm['pkgname']; + pkgQuery(); + } + if (qsParm['section']) { + pkgQuery(); + } + +} + +function pkgQuery() { + var action = 'pkgquery'; + var params = ''; + + if (qsParm['pkgname']) { + action = 'pkgname'; + params = '&pkgname=' + qsParm['pkgname']; + } + + if (document.getElementById('pkgsearch').value != "") { + params = params + '&pkgsearch=' + document.getElementById('pkgsearch').value; + } else { + if (qsParm['pkgsearch']) { + params = params + '&pkgsearch=' + qsParm['pkgsearch']; + } + } + if (qsParm['arch']) { + params = params + '&arch=' + qsParm['arch']; + qsParm['arch'] = null; + } + if (qsParm['section']) { + action = 'section'; + params = params + '§ion=' + qsParm['section']; + qsParm['section'] = null; + } + + params = '&action=' + action + params; + + queryHTTP.open('post', 'section.php'); + queryHTTP.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + queryHTTP.onreadystatechange = queryProgress; + queryHTTP.send(params); + +} + +function getLetter() { + var params = 'action=searchletter'; + http.open('post', 'section.php'); + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.onreadystatechange = letterProgress; + http.send(params); + +} + +function getSection() { + var params = 'action=sectionslist'; + sectionHTTP.open('post', 'section.php'); + sectionHTTP.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + sectionHTTP.onreadystatechange = sectionProgress; + sectionHTTP.send(params); + +} + +function letterProgress() { + if(http.readyState == 4){ + var response = http.responseText; + document.getElementById('searchletter').innerHTML = response; + + } +} + +function sectionProgress() { + if(sectionHTTP.readyState == 4){ + var response = sectionHTTP.responseText; + document.getElementById('sectionslist').innerHTML = response; + + } +} + +function queryProgress() { + document.getElementById('opkgoutput').innerHTML = "loading, please wait"; + if(queryHTTP.readyState == 4){ + var response = queryHTTP.responseText; + document.getElementById('opkgoutput').innerHTML = response; + + } +} diff --git a/contrib/feed-browser/section.php b/contrib/feed-browser/section.php new file mode 100644 index 0000000000..083910bc46 --- /dev/null +++ b/contrib/feed-browser/section.php @@ -0,0 +1,85 @@ +<?php + +/* + * (c) Koen Kooi 2006, 2007, 2008, 2009 + * (c) Marcin Juszkiewicz 2006, 2007 + * + * This php script is intended to do the following: + * + * - have searchable webfronted for the feed like packages.ubuntu.com + * + * ToDo: + * + * - search functionality + * - provide feed-management functionality + * - allow uploading of new software + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License along + * with this library; see the file COPYING.LIB. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + * + */ + +require_once 'includes/config.inc'; +require_once 'includes/functions.inc'; + +if(!check_database()) +{ + die("Database not found and cannot be created."); +} + +if (isset($_POST["action"]) && $_POST["action"] != "") { + $action = $_POST["action"]; +} else { + print "Invalid action: $action"; + exit; +} + +if (isset($_POST["pkgsearch"]) && $_POST["pkgsearch"] != "") { + $pkgsearch = $_POST["pkgsearch"]; +} + +if (isset($_POST["section"]) && $_POST["section"] != "") { + $section = $_POST["section"]; +} + +if (isset($_POST["arch"]) && $_POST["arch"] != "") { + $arch = $_POST["arch"]; +} else { + $arch = ""; +} + +if (isset($_POST["pkgname"]) && $_POST["pkgname"] != "") { + $pkgname = $_POST["pkgname"]; +} + + +//print("$action"); +switch($action) { +case "sectionslist": + echo sectionslist(); + break; +case "searchletter": + echo searchletter(); + break; +case "pkgquery": + echo searchpkg("%{$pkgsearch}%", $arch); + break; +case "pkgname": + echo pkgdetails($pkgname); + break; +case "section": + echo searchsection($section); + break; +} +?> diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb new file mode 100644 index 0000000000..7038d5e0f9 --- /dev/null +++ b/packages/freesmartphone/fso-abyss_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +SECTION = "console/network" +DEPENDS = "vala-native dbus dbus-glib libgee" +LICENSE = "GPL" +PV = "0.1.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools + +RDEPENDS = "dbus dbus-glib" +RCONFLICTS = "gsm0710muxd fso-gsm0710muxd" + +FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig index 22e9cb3c93..b3f1a4cbf0 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig @@ -1530,7 +1530,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig index d65aaff1bb..5d3f16ee19 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig @@ -1550,7 +1550,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index 0742e23e58..f6bb17302d 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r24" +PR = "r25" DEFAULT_PREFERENCE = "-1" diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb index 15c0b4f14f..7d5e0be598 100644 --- a/packages/python/python-coherence_svn.bb +++ b/packages/python/python-coherence_svn.bb @@ -3,7 +3,7 @@ SECTION = "python/devel" LICENSE = "MIT" HOMEPAGE = "http://coherence.beebits.net/wiki" -PR = "r3" +PR = "r4" PV = "0.6.0+svnr${SRCREV}" inherit setuptools @@ -14,6 +14,6 @@ S = "${WORKDIR}/Coherence" FILES_${PN} += "${datadir}" RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \ python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \ - zope python-modules" + zope python-modules python-pygobject" diff --git a/packages/serial-utils/pty-forward-native.bb b/packages/serial-utils/pty-forward-native.bb index 972070d6b6..54ff591928 100644 --- a/packages/serial-utils/pty-forward-native.bb +++ b/packages/serial-utils/pty-forward-native.bb @@ -1,7 +1,11 @@ -LICENSE="GPL" -SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY" +DESCRIPTION = "Receive a forwarded serial from serial-forward and provide a PTY" +AUTHOR = "Holger 'Zecke' Freyther" +LICENSE = "GPL" +SECTION = "console/network" +PV = "1.0.0+svnr${SRCREV}"" +PR = "r0" -SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" S = "${WORKDIR}/serial_forward" inherit native @@ -21,4 +25,3 @@ do_deploy() { } addtask deploy before do_package after do_install - diff --git a/packages/serial-utils/serial-forward.bb b/packages/serial-utils/serial-forward.bb index 3cc33770d6..c3b879a0ee 100644 --- a/packages/serial-utils/serial-forward.bb +++ b/packages/serial-utils/serial-forward.bb @@ -1,8 +1,12 @@ -LICENSE="GPL" -SUMMARY="Forward a serial using TCP/IP" +DESCRIPTION = "Forward a serial using TCP/IP" +AUTHOR = "Holger 'Zecke' Freyther'" +LICENSE = "GPL" +SECTION = "console/devel" +PV = "1.0.0+svnr${SRCREV}" +PR = "r0" -SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" -S="${WORKDIR}/serial_forward" +SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S = "${WORKDIR}/serial_forward" do_compile() { cd ${S} |