[oe-commits] org.oe.dev merge of '0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Dec 25 18:55:10 UTC 2007
merge of '0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395'
and 'a2db4317a6940d3a7ea74bc07545523686942a59'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d29274157cd7d80d66aa37ae4d3ebf85231e594f
ViewMTN: http://monotone.openembedded.org/revision/info/d29274157cd7d80d66aa37ae4d3ebf85231e594f
Files:
1
contrib/deploy
contrib/deploy/nfs
contrib/deploy/README
contrib/deploy/nfs/exports.sample
contrib/deploy/nfs/oe-nfs-deploy-image
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
mtn:execute
true
packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
packages/navit/navit_cvs.bb
packages/navit/navit_0.0.3.bb
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/roadmap.desktop.patch
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2-1.0.12
packages/navit/navit.inc
packages/octave/octave_3.0.0.bb
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcdates.inc
packages/kismet/kismet_2007-10-R1.bb
packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch
packages/linux/linux-rp_2.6.23.bb
packages/navit/navit_0.0.1.bb
packages/navit/navit_0.0.2.bb
packages/python/python-pyqt_4.3.3.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395 -rd29274157cd7d80d66aa37ae4d3ebf85231e594f
#
#
#
# add_dir "contrib/deploy"
#
# add_dir "contrib/deploy/nfs"
#
# add_file "contrib/deploy/README"
# content [c3e0e9da6387c961d18461e22de7556a94a37a5e]
#
# add_file "contrib/deploy/nfs/exports.sample"
# content [873dee0855ece7add89696fa1203572e28671d9d]
#
# add_file "contrib/deploy/nfs/oe-nfs-deploy-image"
# content [892fee86f3f7fb512be7dd5114da05f12e1585eb]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [f75b0281709f790d2341265a880b463f53e674d2]
# to [4b9e167d681b0021650afe5f3dadac184ba2a50b]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [388ec458d592dce0a5a48e2ae5cc23b52f898460]
# to [aea2c9ea3bea6fbb89b9c845999c10891da21d5b]
#
# set "contrib/deploy/nfs/oe-nfs-deploy-image"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/deploy/README c3e0e9da6387c961d18461e22de7556a94a37a5e
+++ contrib/deploy/README c3e0e9da6387c961d18461e22de7556a94a37a5e
@@ -0,0 +1,2 @@
+This directory contains script for deploying OE-generated images for various
+devices and boot methods.
============================================================
--- contrib/deploy/nfs/exports.sample 873dee0855ece7add89696fa1203572e28671d9d
+++ contrib/deploy/nfs/exports.sample 873dee0855ece7add89696fa1203572e28671d9d
@@ -0,0 +1,2 @@
+# /etc/exports: NFS file systems being exported. See exports(5).
+/srv/nfs/oe 192.168.0.0/16(rw,insecure,no_root_squash)
============================================================
--- contrib/deploy/nfs/oe-nfs-deploy-image 892fee86f3f7fb512be7dd5114da05f12e1585eb
+++ contrib/deploy/nfs/oe-nfs-deploy-image 892fee86f3f7fb512be7dd5114da05f12e1585eb
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Wonder what the heck is /srv ? Read Filesystem Hierarchy Standard,
+# http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM
+# So, /srv/nfs is root of all NFS exports your system offers, and /srv/nfs/oe is
+# OpenEmbedded's subset (think security).
+NFS_ROOT=/srv/nfs/oe
+
+if [ -z "$1" ]; then
+ echo "$0 - Deploy OpenEmbedded-generated image for device NFS boot"
+ echo "Usage: $0 <image> | -l"
+ exit
+fi
+
+if [ "$1" == "-l" ]; then
+ if [ -n "$2" ]; then
+ extra="-name *$2*"
+ fi
+ find tmp/deploy/ -regextype posix-extended -wholename '*/images/*' -regex '.+\.(tar\.bz2|tar\.gz|cpio\.gz)$' $extra | xargs ls -l
+ exit
+fi
+
+if [ ! -f $1 ]; then
+ echo "Cannot find image $1"
+ exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+basename=`basename $1 .$ext`
+
+if [ -z "$basename" ]; then
+ echo "Assertion failed"
+ exit 100
+fi
+
+echo "Deploying to: $NFS_ROOT/$basename"
+
+rm -rf $NFS_ROOT/$basename
+
+mkdir -p $NFS_ROOT/$basename
+
+if [ "$ext" == "tar.bz2" ]; then
+ tar -xj -f $1 -C $NFS_ROOT/$basename
+elif [ "$ext" == "tar.gz" ]; then
+ tar -xz -f $1 -C $NFS_ROOT/$basename
+else
+ FPATH=`pwd`
+ cd $NFS_ROOT/$basename
+ bash -c "gzip -d -c $FPATH/$1 | cpio -i --no-absolute-filenames"
+ cd $FPATH
+fi
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh f75b0281709f790d2341265a880b463f53e674d2
+++ packages/initrdscripts/files/30-bootmenu.sh 4b9e167d681b0021650afe5f3dadac184ba2a50b
@@ -94,7 +94,7 @@ done < /proc/partitions
add_menu_item "$dev ($fstype)"
done < /proc/partitions
-add_menu_item "NFS (nfsroot=192.168.2.200:/nfs/image)"
+add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)"
total=`echo -e $list | wc -l`
num=0
@@ -145,7 +145,7 @@ if [ "$dev" == "NFS" ]; then
if [ "$dev" == "NFS" ]; then
ROOT_DEVICE="/dev/nfs"
- CMDLINE="$CMDLINE nfsroot=192.168.2.200:/nfs/image"
+ CMDLINE="$CMDLINE nfsroot=192.168.2.200:/srv/nfs/oe/image"
elif [ -n "$path" ]; then
ROOT_DEVICE="/dev/loop"
CMDLINE="looproot=/dev/$dev:$path"
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 388ec458d592dce0a5a48e2ae5cc23b52f898460
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb aea2c9ea3bea6fbb89b9c845999c10891da21d5b
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
SRC_URI = "file://30-bootmenu.sh"
-PR = "r4"
+PR = "r5"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
# For VFAT mounting.
#
# mt diff -ra2db4317a6940d3a7ea74bc07545523686942a59 -rd29274157cd7d80d66aa37ae4d3ebf85231e594f
#
#
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch"
#
# rename "packages/navit/navit_cvs.bb"
# to "packages/navit/navit_0.0.3.bb"
#
# rename "packages/roadmap/files/qt/roadmap.desktop.patch"
# to "packages/roadmap/files/roadmap.desktop.patch"
#
# rename "packages/roadmap/roadmap-gtk2_cvs.bb"
# to "packages/roadmap/roadmap-gtk2_1.1.0.bb"
#
# add_dir "packages/roadmap/roadmap-gtk2-1.0.12"
#
# add_file "packages/navit/navit.inc"
# content [926adcffc6471b5c8bf96d43d6eaf5c81bd2debf]
#
# add_file "packages/navit/navit_cvs.bb"
# content [df4f34394db1e519bb35df38f60d90b0c1a13b71]
#
# add_file "packages/octave/octave_3.0.0.bb"
# content [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
#
# add_file "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
# content [72a4e83be42ae269c1a94a7d4b9bfcec143dc775]
#
# add_file "packages/roadmap/roadmap-gtk2_1.0.12.bb"
# content [5c5317b0388798186c0b355406eac18c0fc2ed8b]
#
# add_file "packages/roadmap/roadmap-gtk2_cvs.bb"
# content [511a10a8453ed27a0df812a48cdcba14f90788e9]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch"
# content [873e511cd3661d256ac9429fd1f8fa41977e8ca7]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d0ef2c36f1b3189c7ab640814486bc42402933b7]
# to [5c4c13baff9f942bf49f38356a436936e225abbc]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2210b55702af66bd7496230c31bdd3b1434c3ef5]
# to [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
#
# patch "packages/kismet/kismet_2007-10-R1.bb"
# from [cb2ebd02b717a445eea7d52c0967752bad90862a]
# to [b8971fcf7ccf5f139688680c6faccc7b2cfe9bff]
#
# patch "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
# from [0c5154e470f4e55e2a4fad1e3ff7765a939dc651]
# to [b87e8646dadfb7d5d16757a725aaef9cbc7b7778]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [505c9cf9c63acfb81b9eb656abe42b25f2e89794]
# to [80ed60c8b799a23d2c149a04bbf24f1ed3353a2a]
#
# patch "packages/navit/navit_0.0.1.bb"
# from [f26539d3ae16efb9541db714be3d65c0312fc4a8]
# to [e62a0cfbc62cafa0aeb28e5404dda21160b96d70]
#
# patch "packages/navit/navit_0.0.2.bb"
# from [8f31c0603d8433a2780907e3b27bbcdb87f49f89]
# to [2942d2b0d378026c3e523ebe3834c3aafa8a1e9d]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
# to [889d14a50f20feacdb3bfe544505a50b469248d1]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [f4e8b4a75b9b494f6d70e74cc041955ee3af4996]
# to [4c9dd6dd767d79bb118e973d47bbda095cc45c6f]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
# to [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
#
# patch "packages/roadmap/roadmap.inc"
# from [18f16cbe822cba5f8dd391e023297f98a693d254]
# to [e3d443eff17119798c0c6deda17bf6ff8785c257]
#
# patch "packages/roadmap/zroadmap_1.0.12.bb"
# from [defdf4312079c65d41c8d23a255e656af962c476]
# to [c6606e496ddb94bd587b0dc254064d721c276aac]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [47050a07f10a909f16525fb375ad0bff60a3822e]
# to [deaa33e33e25e1c9b13a64473c53715a50f05d59]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [a3e925537e5fc4d227e62224726e06d610c448b3]
# to [910020856a214de2ce5b21692e857806378508b4]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [f9825c85f0e52ef579e9bef9ad5f2469dae32694]
# to [58d9f93157413d0ca323b5aeb9132e14c6bf0210]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [3414afa63a3d12e6a4cd900e882c8a621de05e1a]
# to [1bed21da6a3b2f4de965a06c2b32af9c3829ea42]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [f8f7bbf562514bec8076212836576397889ee6ed]
# to [6e0132a319145e0bee0939723f38518cc48760b8]
#
============================================================
--- packages/navit/navit.inc 926adcffc6471b5c8bf96d43d6eaf5c81bd2debf
+++ packages/navit/navit.inc 926adcffc6471b5c8bf96d43d6eaf5c81bd2debf
@@ -0,0 +1,11 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+RRECOMMENDS = "gpsd speechd flite"
+
+inherit autotools
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
============================================================
--- packages/navit/navit_cvs.bb df4f34394db1e519bb35df38f60d90b0c1a13b71
+++ packages/navit/navit_cvs.bb df4f34394db1e519bb35df38f60d90b0c1a13b71
@@ -0,0 +1,13 @@
+require navit.inc
+
+PV = "0.0.3+cvs${SRCDATE}"
+PR = "r0"
+
+S = "${WORKDIR}/navit"
+
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
+
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+
+EXTRA_AUTORECONF = " -I m4"
+
============================================================
--- packages/octave/octave_3.0.0.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
+++ packages/octave/octave_3.0.0.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+ file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+ libcruft-dev liboctave-dev liboctinterp-dev \
+ libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
============================================================
--- packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch 72a4e83be42ae269c1a94a7d4b9bfcec143dc775
+++ packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch 72a4e83be42ae269c1a94a7d4b9bfcec143dc775
@@ -0,0 +1,11 @@
+--- src/qt/ipkg/zroadgps.desktop.old 2007-12-24 19:35:34.000000000 -0600
++++ src/qt/ipkg/zroadgps.desktop 2007-12-24 19:37:12.000000000 -0600
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Comment=RoadMap
+ Exec=roadgps
+-Icon=zroadgps
++Icon=roadgps
+ Type=Application
+ Name=RoadMapGPS
++Categories=Graphics;Viewer;GTK;
============================================================
--- packages/roadmap/roadmap-gtk2_1.0.12.bb 5c5317b0388798186c0b355406eac18c0fc2ed8b
+++ packages/roadmap/roadmap-gtk2_1.0.12.bb 5c5317b0388798186c0b355406eac18c0fc2ed8b
@@ -0,0 +1,44 @@
+require roadmap.inc
+
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
+ file://roadmap.desktop.patch;patch=1 \
+ file://roadgps.desktop.patch;patch=1 \
+ http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \
+ file://zroadgps.png "
+
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+DESKTOP = "GTK2"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \
+ -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
+
+do_compile() {
+ oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
+ cd gtk2 && oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/roadmap
+
+ install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+ install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
+
+ install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+ install -m 0644 roadmap.png ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+
+ install -m 0644 roadmap.desktop ${D}${datadir}/applications/
+ install -m 0644 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop
+
+ install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
+
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
+++ packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
@@ -0,0 +1,45 @@
+require roadmap.inc
+
+DEPENDS = "agg expat gtk+"
+PV = "1.1.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+ file://cross.patch;patch=1;pnum=2 \
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+ file://zroadgps.png"
+
+S = "${WORKDIR}/roadmap/src"
+
+DESKTOP = "GTK2"
+AGG = "rgba32"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \
+ -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
+
+do_compile() {
+ oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+ oe_runmake -C gpx libgpx.a
+ oe_runmake -C unix libosroadmap.a
+ oe_runmake -C gtk2 gtkroadmap gtkroadgps
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/roadmap
+
+ install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+ install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
+
+ install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+
+ install -m 0644 roadmap.desktop ${D}${datadir}/applications/
+
+ install -m 0644 sprites preferences ${D}${datadir}/roadmap/
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
+
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch 873e511cd3661d256ac9429fd1f8fa41977e8ca7
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch 873e511cd3661d256ac9429fd1f8fa41977e8ca7
@@ -0,0 +1,13 @@
+--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c.old 2007-12-24 04:54:13.000000000 -0600
++++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2007-12-25 01:13:27.000000000 -0600
+@@ -357,10 +357,7 @@ fbdevMapFramebuffer (KdScreenInfo *scree
+ KdMouseMatrix m;
+ FbdevPriv *priv = screen->card->driver;
+
+- if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp)
+ scrpriv->shadow = TRUE;
+- else
+- scrpriv->shadow = FALSE;
+
+ KdComputeMouseMatrix (&m, scrpriv->randr, screen->width, screen->height);
+
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc d0ef2c36f1b3189c7ab640814486bc42402933b7
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 5c4c13baff9f942bf49f38356a436936e225abbc
@@ -1659,6 +1659,7 @@ PREFERRED_VERSION_rlpr ?= "2.05"
PREFERRED_VERSION_rglueap ?= "0.1"
PREFERRED_VERSION_rhythmbox ?= "0.8.7"
PREFERRED_VERSION_rlpr ?= "2.05"
+PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0"
PREFERRED_VERSION_rott ?= "1.0"
PREFERRED_VERSION_rox-filer ?= "2.5"
PREFERRED_VERSION_rp-pppoe ?= "3.8"
@@ -2126,7 +2127,7 @@ PREFERRED_VERSION_zrev7 ?= "1.0.1"
PREFERRED_VERSION_zope ?= "3.3.1"
PREFERRED_VERSION_zrally ?= "0.90"
PREFERRED_VERSION_zrev7 ?= "1.0.1"
-PREFERRED_VERSION_zroadmap ?= "1.0.12"
+PREFERRED_VERSION_zroadmap ?= "1.1.0"
PREFERRED_VERSION_zsafe ?= "2.1.3"
PREFERRED_VERSION_zsh ?= "4.1.1"
PREFERRED_VERSION_zshopi ?= "0.2"
============================================================
--- conf/distro/include/sane-srcdates.inc 2210b55702af66bd7496230c31bdd3b1434c3ef5
+++ conf/distro/include/sane-srcdates.inc cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3
@@ -148,7 +148,6 @@ SRCDATE_yamonenv ?= "20060814"
SRCDATE_xirssi ?= "20060814"
SRCDATE_xsvg ?= "20060814"
SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zroadmap ?= "20060814"
# Freedesktop.org
SRCDATE_poppler0.6 = "20070708"
============================================================
--- packages/kismet/kismet_2007-10-R1.bb cb2ebd02b717a445eea7d52c0967752bad90862a
+++ packages/kismet/kismet_2007-10-R1.bb b8971fcf7ccf5f139688680c6faccc7b2cfe9bff
@@ -1,9 +1,9 @@ LICENSE = "GPLv2"
DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
HOMEPAGE = "http://www.kismetwireless.net/"
SECTION = "console/network"
LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PR = "r1"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
+PR = "r2"
SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
============================================================
--- packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch 0c5154e470f4e55e2a4fad1e3ff7765a939dc651
+++ packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch b87e8646dadfb7d5d16757a725aaef9cbc7b7778
@@ -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-13 01:35:13.049455112 +0300
-@@ -0,0 +1,417 @@
++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300
+@@ -0,0 +1,530 @@
+/*
+ * OHCI HCD(Host Controller Driver) for USB.
+ *
@@ -53,6 +53,14 @@ 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
+ */
@@ -87,8 +95,8 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+struct {
+ unsigned gcken:1; /* D0 */
+ unsigned ckrnen:1; /* D1 */
-+ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */
-+ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */
++ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */
++ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */
+ unsigned x00:4;
+ unsigned pmee:1; /* D8 */
+ unsigned x01:6;
@@ -100,6 +108,7 @@ 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))
@@ -107,6 +116,39 @@ 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->us%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list