[oe-commits] org.oe.dev merge of '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'
hrw commit
openembedded-commits at lists.openembedded.org
Wed Nov 14 19:05:26 UTC 2007
merge of '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'
and '94fb88049d8aea8313c398d3df50af2d4646f619'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3bc3d210fa1ef434da665dc8ead148b68f8fdb84
ViewMTN: http://monotone.openembedded.org/revision/info/3bc3d210fa1ef434da665dc8ead148b68f8fdb84
Files:
1
packages/desktop-file-utils/desktop-file-utils-native_0.14.bb
packages/openmoko2/openmoko-messages2_svn.bb
classes/insane.bbclass
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/wifi-radar/wifi-radar_1.9.6.bb
packages/xorg-data/xbitmaps_1.0.1.bb
packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch
packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch
Diffs:
#
# mt diff -r5bba276288eaa8fa9d57001cdafb8cb332fcb78b -r3bc3d210fa1ef434da665dc8ead148b68f8fdb84
#
#
#
# add_file "packages/desktop-file-utils/desktop-file-utils-native_0.14.bb"
# content [a2e82b4ea68a494f12d15c7dd824579781660311]
#
# add_file "packages/openmoko2/openmoko-messages2_svn.bb"
# content [ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6]
#
# patch "classes/insane.bbclass"
# from [2b43994e2dd8ae85f612788e116ce44c9b31619d]
# to [969f0ea4a41bb686333bda84032d4f9250a61c3b]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [edc976173fe3b3eaefcad6ce35aff6594210bf8c]
# to [8af2f634c8a91d9c27579c3537ca1e7d3132f5c6]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a5c8530186b1620c562bb7e94df157e23c4b8928]
# to [75aa091df2487affbd25f7f9a213ee1b7e87d774]
#
# patch "conf/distro/openmoko.conf"
# from [fb09004f81fdf9ff14811c7e83335282b3f46b4b]
# to [bedbe8dd945eb5ace788da554ab20d12a1ab3e6d]
#
# patch "packages/wifi-radar/wifi-radar_1.9.6.bb"
# from [221e6edf4928be2b1bce088bd74dd7985772ea37]
# to [1744245b1a014042504064af18845a64c864a03a]
#
# patch "packages/xorg-data/xbitmaps_1.0.1.bb"
# from [613ab066e8981893ec5634d14519baa5129ae981]
# to [47f276f3b54cf30ab254a4d478388c6d462ac6a3]
#
============================================================
--- packages/desktop-file-utils/desktop-file-utils-native_0.14.bb a2e82b4ea68a494f12d15c7dd824579781660311
+++ packages/desktop-file-utils/desktop-file-utils-native_0.14.bb a2e82b4ea68a494f12d15c7dd824579781660311
@@ -0,0 +1,12 @@
+SECTION = "console/utils"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"
+DESCRIPTION = "command line utilities to work with *.desktop files"
+LICENSE = "GPL"
+
+DEPENDS = "glib-2.0-native"
+
+SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz"
+
+inherit autotools native
+
+S = "${WORKDIR}/desktop-file-utils-${PV}"
============================================================
--- packages/openmoko2/openmoko-messages2_svn.bb ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6
+++ packages/openmoko2/openmoko-messages2_svn.bb ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6
@@ -0,0 +1,11 @@
+DESCRIPTION = "The OpenMoko Message application"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
============================================================
--- classes/insane.bbclass 2b43994e2dd8ae85f612788e116ce44c9b31619d
+++ classes/insane.bbclass 969f0ea4a41bb686333bda84032d4f9250a61c3b
@@ -21,7 +21,7 @@ inherit package
# We play a special package function
inherit package
-PACKAGE_DEPENDS += "pax-utils-native"
+PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native"
#PACKAGE_DEPENDS += chrpath-native"
PACKAGEFUNCS += " do_package_qa "
@@ -308,8 +308,22 @@ def package_qa_check_pcla(path,name,d):
.pc and .la files should not point to the WORKDIR
"""
sane = True
+ # TODO
return sane
+def package_qa_check_desktop(path, name, d):
+ """
+ Run all desktop files through desktop-file-validate.
+ """
+ import bb, os
+ if path.endswith(".desktop"):
+ validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate')
+ output = os.popen("%s %s" % (validate, path))
+ # This only produces output on errors
+ for l in output:
+ bb.error(l.strip())
+ return True
+
def package_qa_check_staged(path,d):
"""
Check staged la and pc files for sanity
@@ -416,9 +430,13 @@ python do_package_qa () {
walk_sane = True
rdepends_sane = True
for package in packages.split():
+ if bb.data.getVar('INSANE_SKIP_' + package, d, True):
+ bb.note("Package: %s (skipped)" % package)
+ continue
+
bb.note("Checking Package: %s" % package)
path = "%s/install/%s" % (workdir, package)
- if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d):
+ if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d):
walk_sane = False
if not package_qa_check_rdepends(package, workdir, d):
rdepends_sane = False
============================================================
--- conf/distro/include/sane-srcdates.inc edc976173fe3b3eaefcad6ce35aff6594210bf8c
+++ conf/distro/include/sane-srcdates.inc 8af2f634c8a91d9c27579c3537ca1e7d3132f5c6
@@ -88,6 +88,7 @@ SRCDATE_python-edje ?= "${EFL_SRCDATE}"
SRCDATE_python-evas ?= "${EFL_SRCDATE}"
SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
SRCDATE_python-etk ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc a5c8530186b1620c562bb7e94df157e23c4b8928
+++ conf/distro/include/sane-srcrevs.inc 75aa091df2487affbd25f7f9a213ee1b7e87d774
@@ -48,9 +48,9 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-keyboard ?= "1739"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3207"
+SRCREV_pn-moko-gtk-engine ?= "3405"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-neod ?= "3358"
+SRCREV_pn-neod ?= "3421"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
@@ -81,6 +81,7 @@ SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
SRCREV_pn-openmoko-messages ?= "2276"
+SRCREV_pn-openmoko-messages2 ?= "3424"
SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "2896"
SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +106,7 @@ SRCREV_pn-openmoko-today2 ?= "3342"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3342"
-SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openmoko-today2-folders ?= "3414"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
============================================================
--- conf/distro/openmoko.conf fb09004f81fdf9ff14811c7e83335282b3f46b4b
+++ conf/distro/openmoko.conf bedbe8dd945eb5ace788da554ab20d12a1ab3e6d
@@ -24,10 +24,12 @@ FEED_URIS = "\
FEED_URIS = "\
snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \
+ snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \
snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \
\
updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
+ updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \
updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 "
# 2.18 seems to break badly on 64-bit systems
============================================================
--- packages/wifi-radar/wifi-radar_1.9.6.bb 221e6edf4928be2b1bce088bd74dd7985772ea37
+++ packages/wifi-radar/wifi-radar_1.9.6.bb 1744245b1a014042504064af18845a64c864a03a
@@ -1,13 +1,13 @@ LICENSE = "GPL"
SECTION = "x11/network"
DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles."
HOMEPAGE="http://www.bitbuilder.com/wifi_radar/"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "all"
-RDEPENDS = "python-core python-pygtk2 python-re python-io python-pygobject python-pycairo"
+RDEPENDS = "python-core python-pygtk python-re python-io python-pygobject python-pycairo"
SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \
file://wifi-radar.patch;patch=1 \
============================================================
--- packages/xorg-data/xbitmaps_1.0.1.bb 613ab066e8981893ec5634d14519baa5129ae981
+++ packages/xorg-data/xbitmaps_1.0.1.bb 47f276f3b54cf30ab254a4d478388c6d462ac6a3
@@ -1,6 +1,6 @@ LICENSE = "MIT"
require xorg-data-common.inc
DESCRIPTION = "Common X11 Bitmaps"
LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
+DEPENDS += "libxmu"
#
# mt diff -r94fb88049d8aea8313c398d3df50af2d4646f619 -r3bc3d210fa1ef434da665dc8ead148b68f8fdb84
#
#
#
# rename "packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch"
# to "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
#
# patch "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
# from [b87e8646dadfb7d5d16757a725aaef9cbc7b7778]
# to [0c5154e470f4e55e2a4fad1e3ff7765a939dc651]
#
============================================================
--- packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch b87e8646dadfb7d5d16757a725aaef9cbc7b7778
+++ packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch 0c5154e470f4e55e2a4fad1e3ff7765a939dc651
@@ -1,10 +1,10 @@ Index: linux-2.6.23/drivers/usb/host/ohc
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300
-@@ -0,0 +1,530 @@
++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-13 01:35:13.049455112 +0300
+@@ -0,0 +1,417 @@
+/*
+ * OHCI HCD(Host Controller Driver) for USB.
+ *
@@ -53,14 +53,6 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+/*-------------------------------------------------------------------------*/
+
-+#define MAX_TMIO_USB_PORTS 2
-+static bool default_tmio_ports[MAX_TMIO_USB_PORTS];
-+module_param_array(default_tmio_ports, bool, NULL, 0644);
-+MODULE_PARM_DESC(default_tmio_ports,
-+ "disable specified TC6393 usb ports (default: all enabled)");
-+
-+/*-------------------------------------------------------------------------*/
-+
+/*
+ * USB Host Controller Configuration Register
+ */
@@ -95,8 +87,8 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+struct {
+ unsigned gcken:1; /* D0 */
+ unsigned ckrnen:1; /* D1 */
-+ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */
-+ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */
++ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */
++ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */
+ unsigned x00:4;
+ unsigned pmee:1; /* D8 */
+ unsigned x01:6;
@@ -108,7 +100,6 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+struct tmio_hcd {
+ struct tmio_uhccr __iomem *ccr;
-+ bool disabled_ports[MAX_TMIO_USB_PORTS];
+};
+
+#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1))
@@ -116,39 +107,6 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+/*-------------------------------------------------------------------------*/
+
-+struct indexed_device_attribute{
-+ struct device_attribute dev_attr;
-+ int index;
-+};
-+#define to_indexed_dev_attr(_dev_attr) \
-+ container_of(_dev_attr, struct indexed_device_attribute, dev_attr)
-+
-+#define INDEXED_ATTR(_name, _mode, _show, _store, _index) \
-+ { .dev_attr = __ATTR(_name ## _index, _mode, _show, _store), \
-+ .index = _index }
-+
-+#define INDEXED_DEVICE_ATTR(_name, _mode, _show, _store, _index) \
-+struct indexed_device_attribute dev_attr_##_name ## _index \
-+ = INDEXED_ATTR(_name, _mode, _show, _store, _index)
-+
-+/*-------------------------------------------------------------------------*/
-+
-+
-+static void tmio_fill_pm(struct tmio_hcd *tmio, union tmio_uhccr_pm *pm)
-+{
-+ pm->raw = 0;
-+
-+ pm->pmee = 1;
-+ pm->pmes = 1;
-+ pm->gcken = 1;
-+ pm->ckrnen = 1;
-+
-+ if (tmio->disabled_ports[0])
-+ pm->uspw0 = 1;
-+ if (tmio->disabled_ports[1])
-+ pm->uspw1 = 1;
-+}
-+
+static void tmio_stop_hc(struct device *dev)
+{
+ struct tmio_device *tdev = dev_to_tdev(dev);
@@ -159,8 +117,8 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+ pm.gcken = 1;
+ pm.ckrnen = 1;
-+ pm.uspw0 = 1;
+ pm.uspw1 = 1;
++ pm.uspw2 = 1;
+
+ iowrite8(0, &ccr->intc);
+ iowrite8(0, &ccr->ilme);
@@ -181,7 +139,10 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+ union tmio_uhccr_pm pm = {0};
+ unsigned long base = hcd->rsrc_start;
+
-+ tmio_fill_pm(tmio, &pm);
++ pm.pmes = 1;
++ pm.pmee = 1;
++ pm.ckrnen = 1;
++ pm.gcken = 1;
+
+ tdev->ops->clock(dev, 1);
+ tdev->ops->function(dev, 1);
@@ -196,54 +157,6 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+ ioread8(&ccr->revid), hcd->rsrc_start, hcd->irq);
+}
+
-+static ssize_t tmio_disabled_port_show(struct device *dev,
-+ struct device_attribute *attr,
-+ char *buf)
-+{
-+ struct usb_hcd *hcd = dev_get_drvdata(dev);
-+ struct tmio_hcd *tmio = hcd_to_tmio(hcd);
-+ int index = to_indexed_dev_attr(attr)->index;
-+ return snprintf(buf, PAGE_SIZE, "%c",
-+ tmio->disabled_ports[index]? 'Y': 'N');
-+}
-+
-+static ssize_t tmio_disabled_port_store(struct device *dev,
-+ struct device_attribute *attr,
-+ const char *buf, size_t count)
-+{
-+ struct usb_hcd *hcd = dev_get_drvdata(dev);
-+ struct tmio_hcd *tmio = hcd_to_tmio(hcd);
-+ struct tmio_uhccr __iomem *ccr = tmio->ccr;
-+ union tmio_uhccr_pm pm = {0};
-+ int index = to_indexed_dev_attr(attr)->index;
-+
-+ if (!count)
-+ return -EINVAL;
-+
-+ switch (buf[0]) {
-+ case 'y': case 'Y': case '1':
-+ tmio->disabled_ports[index] = true;
-+ break;
-+ case 'n': case 'N': case '0':
-+ tmio->disabled_ports[index] = false;
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ tmio_fill_pm(tmio, &pm);
-+
-+ iowrite16(pm.raw, &ccr->pm);
-+
-+ return 1;
-+}
-+
-+
-+static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR,
-+ tmio_disabled_port_show, tmio_disabled_port_store, 0);
-+static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR,
-+ tmio_disabled_port_show, tmio_disabled_port_store, 1);
-+
+static int usb_hcd_tmio_probe(const struct hc_driver *driver,
+ struct device *dev)
+{
@@ -282,9 +195,6 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+ hcd->rsrc_len = regs->end - regs->start + 1;
+
+ tmio = hcd_to_tmio(hcd);
-+ memcpy(tmio->disabled_ports,
-+ default_tmio_ports,
-+ sizeof(default_tmio_ports));
+
+ tmio->ccr = ioremap(config->start, config->end - config->start + 1);
+ if (!tmio->ccr) {
@@ -314,23 +224,11 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+ ohci = hcd_to_ohci(hcd);
+ ohci_hcd_init(ohci);
+
-+ retval = device_create_file(dev,
-+ &dev_attr_disabled_usb_port0.dev_attr);
-+ retval |= device_create_file(dev,
-+ &dev_attr_disabled_usb_port1.dev_attr);
-+
-+ if (retval)
-+ goto err_create_file;
-+
+ retval = usb_add_hcd(hcd, irq->start, IRQF_DISABLED);
+
+ if (retval == 0)
+ return retval;
+
-+err_create_file:
-+ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr);
-+ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr);
-+
+ tmio_stop_hc(dev);
+
+ dmabounce_unregister_dev(dev);
@@ -358,8 +256,6 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+ struct tmio_hcd *tmio = hcd_to_tmio(hcd);
+
+ usb_remove_hcd(hcd);
-+ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr);
-+ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr);
+ tmio_stop_hc(dev);
+ dmabounce_unregister_dev(dev);
+ dma_release_declared_memory(dev);
@@ -447,22 +343,13 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+static int ohci_hcd_tmio_drv_probe(struct device *dev)
+{
+ struct resource *sram = tmio_resource_mem(dev);
-+ int retval;
+
+ dev->dma_mask = &dma_mask;
+ dev->coherent_dma_mask = DMA_32BIT_MASK;
+
-+ /* FIXME: move dmabounce checkers to tc6393 core? */
+ dmabounce_register_checker(tmio_dmabounce_check, sram);
+
-+ retval = usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev);
-+
-+ if (retval == 0)
-+ return retval;
-+
-+ dmabounce_remove_checker(tmio_dmabounce_check, sram);
-+
-+ return retval;
++ return usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev);
+}
+
+static int ohci_hcd_tmio_drv_remove(struct device *dev)
@@ -550,7 +437,7 @@ Index: linux-2.6.23/drivers/usb/host/ohc
Index: linux-2.6.23/drivers/usb/host/ohci-hcd.c
===================================================================
--- linux-2.6.23.orig/drivers/usb/host/ohci-hcd.c 2007-11-12 13:46:52.894560883 +0300
-+++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-14 16:44:32.788069355 +0300
++++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-13 01:03:53.950798640 +0300
@@ -915,6 +915,10 @@
#define PLATFORM_DRIVER usb_hcd_pnx4008_driver
#endif
More information about the Openembedded-commits
mailing list