org.openmoko.dev: a65325dea87a216542ed573242fc36d32f1411d9
oe at monotone.openmoko.org
oe at monotone.openmoko.org
Fri Apr 11 13:31:38 CEST 2008
revision: a65325dea87a216542ed573242fc36d32f1411d9
date: 2008-04-11T10:14:56
author: dodji at openedhand.com
branch: org.openmoko.dev
changelog:
merge of '36152772af2a6e41040b8991c2474e44835a6f0b'
and 'ccfe3a4d1cf78dee2fd5a60308cf6495cf685e94'
manifest:
format_version "1"
new_manifest [04d1642d962b8f7e0e6abfa00342977bd02db891]
old_revision [36152772af2a6e41040b8991c2474e44835a6f0b]
add_dir "packages/tslib/tslib/om-gta02"
add_dir "packages/wordlist"
add_dir "packages/wordlist/files"
add_file "packages/tslib/tslib/om-gta02/ts.conf"
content [7123e2647340fe6a95f41cd9f53f3307c08cd223]
add_file "packages/wordlist/files/rules"
content [c05179a08d78dc9c946b1b4e3eaab857aae70513]
add_file "packages/wordlist/scowl_6.bb"
content [3c879b1a8c2e4cb21bb186cd29601c95da176d93]
patch "classes/package_ipk.bbclass"
from [74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1]
to [242c256c8e04a09f38c2935be0882b1dee651600]
patch "conf/bitbake.conf"
from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
to [6ff864c9de6f26e92c7ab40bc46eddef334a4df4]
patch "conf/distro/include/moko-autorev.inc"
from [526e53c6184d16c08fc9cba8b28d1ef6dc4fe3b4]
to [87f881f7cd88b239e8022a227df4b65b4a155c4f]
patch "conf/distro/include/sane-srcdates.inc"
from [8b9fd0206baa49e75bdf70f5761e1fe4649d422e]
to [ff2cde45563283f24f83472dafe559f2b2043e24]
patch "conf/distro/include/sane-srcrevs.inc"
from [b5c07ab75b8688bbbdefd4466751f40294f4e226]
to [74298b9f70161c93059b5b2f49a05c04a1826693]
patch "contrib/oe-stylize.py"
from [9e40dcd24e4d8f38580faf97a7ca791069087802]
to [ccf166ea67ebcb8024d3d378d1ff66b5386d1023]
patch "packages/efl1/etk_cvs.bb"
from [1c4ad62955a3041ca60b191f4f46f758a4a45cb4]
to [409c4526643bb84665f38a0a31a6e5596c432ae5]
patch "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
from [bcce07d7c1acb2892a59f8be552f77994e17e98c]
to [e66a4afa1f9a57edd969a060f0b99fc5bfb33e50]
patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
from [054d2acb3ff8284167043e5554633713ebdba2cf]
to [2fffa65764b445bac4b2ec9f7b7b01d1b11a0651]
patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
from [53716efd0be08661e891166feef9298502f1ff73]
to [6ca2e19f7611e0124df8a7be84f3cab7f69e1963]
patch "packages/linux/linux-openmoko_2.6.24+git.bb"
from [20255a61aa6d2525255c85da2f1d62a5c56e02bf]
to [b5191bd5a6a02812c00983b18becbb791e375c18]
patch "packages/openmoko-projects/assassin_svn.bb"
from [ec54896d60155ed78661fbb53074c68150c9077c]
to [080e285125a168b5f6d613c3bbd62d5d53591ad0]
patch "packages/openmoko-projects/diversity-nav_svn.bb"
from [e70dd159aa10e5d331469df680d7a92b6a17ed69]
to [9370cdd9600c307c35b50ef38c35a344330e1f73]
patch "packages/openmoko-projects/illume_svn.bb"
from [f0d1ea3f7f065e02920803bee606469fccb5db16]
to [41d78bc73011aab120638b3ff084513fbbeeeb4e]
patch "packages/settings-daemon/files/70settings-daemon"
from [70c8c167bec306d4135dd5cbf159e6cae849a18a]
to [fd2db3c1fc805b65926439f53fd8dba081004766]
patch "packages/settings-daemon/settings-daemon_svn.bb"
from [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
to [232ef26e8f78ffc82665195719a830883eaf51d5]
patch "packages/tslib/tslib_1.0.bb"
from [5d5d2fe05b80425f25473bfe084177b902b207f9]
to [d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f]
patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
from [2915a14313602fff89685477aaabe69d4e32a457]
to [b6120434f910d084652aecf6c1d3d4c501be78cc]
patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
from [60b23f2d6507ed740f14d2d710ab0b1fe8f1dca0]
to [e41ab9242ae6d5e9acea897aa94ca13e00b76f1b]
old_revision [ccfe3a4d1cf78dee2fd5a60308cf6495cf685e94]
patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
from [ea17b13c96864a64f96b121b88a66ec7b5f3daf7]
to [02e2c207f0fd749919681c772b4289100a327dc2]
-------------- next part --------------
#
#
# add_dir "packages/tslib/tslib/om-gta02"
#
# add_dir "packages/wordlist"
#
# add_dir "packages/wordlist/files"
#
# add_file "packages/tslib/tslib/om-gta02/ts.conf"
# content [7123e2647340fe6a95f41cd9f53f3307c08cd223]
#
# add_file "packages/wordlist/files/rules"
# content [c05179a08d78dc9c946b1b4e3eaab857aae70513]
#
# add_file "packages/wordlist/scowl_6.bb"
# content [3c879b1a8c2e4cb21bb186cd29601c95da176d93]
#
# patch "classes/package_ipk.bbclass"
# from [74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1]
# to [242c256c8e04a09f38c2935be0882b1dee651600]
#
# patch "conf/bitbake.conf"
# from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
# to [6ff864c9de6f26e92c7ab40bc46eddef334a4df4]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [526e53c6184d16c08fc9cba8b28d1ef6dc4fe3b4]
# to [87f881f7cd88b239e8022a227df4b65b4a155c4f]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [8b9fd0206baa49e75bdf70f5761e1fe4649d422e]
# to [ff2cde45563283f24f83472dafe559f2b2043e24]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [b5c07ab75b8688bbbdefd4466751f40294f4e226]
# to [74298b9f70161c93059b5b2f49a05c04a1826693]
#
# patch "contrib/oe-stylize.py"
# from [9e40dcd24e4d8f38580faf97a7ca791069087802]
# to [ccf166ea67ebcb8024d3d378d1ff66b5386d1023]
#
# patch "packages/efl1/etk_cvs.bb"
# from [1c4ad62955a3041ca60b191f4f46f758a4a45cb4]
# to [409c4526643bb84665f38a0a31a6e5596c432ae5]
#
# patch "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
# from [bcce07d7c1acb2892a59f8be552f77994e17e98c]
# to [e66a4afa1f9a57edd969a060f0b99fc5bfb33e50]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [054d2acb3ff8284167043e5554633713ebdba2cf]
# to [2fffa65764b445bac4b2ec9f7b7b01d1b11a0651]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [53716efd0be08661e891166feef9298502f1ff73]
# to [6ca2e19f7611e0124df8a7be84f3cab7f69e1963]
#
# patch "packages/linux/linux-openmoko_2.6.24+git.bb"
# from [20255a61aa6d2525255c85da2f1d62a5c56e02bf]
# to [b5191bd5a6a02812c00983b18becbb791e375c18]
#
# patch "packages/openmoko-projects/assassin_svn.bb"
# from [ec54896d60155ed78661fbb53074c68150c9077c]
# to [080e285125a168b5f6d613c3bbd62d5d53591ad0]
#
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
# from [e70dd159aa10e5d331469df680d7a92b6a17ed69]
# to [9370cdd9600c307c35b50ef38c35a344330e1f73]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [f0d1ea3f7f065e02920803bee606469fccb5db16]
# to [41d78bc73011aab120638b3ff084513fbbeeeb4e]
#
# patch "packages/settings-daemon/files/70settings-daemon"
# from [70c8c167bec306d4135dd5cbf159e6cae849a18a]
# to [fd2db3c1fc805b65926439f53fd8dba081004766]
#
# patch "packages/settings-daemon/settings-daemon_svn.bb"
# from [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
# to [232ef26e8f78ffc82665195719a830883eaf51d5]
#
# patch "packages/tslib/tslib_1.0.bb"
# from [5d5d2fe05b80425f25473bfe084177b902b207f9]
# to [d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [2915a14313602fff89685477aaabe69d4e32a457]
# to [b6120434f910d084652aecf6c1d3d4c501be78cc]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [60b23f2d6507ed740f14d2d710ab0b1fe8f1dca0]
# to [e41ab9242ae6d5e9acea897aa94ca13e00b76f1b]
#
============================================================
--- packages/tslib/tslib/om-gta02/ts.conf 7123e2647340fe6a95f41cd9f53f3307c08cd223
+++ packages/tslib/tslib/om-gta02/ts.conf 7123e2647340fe6a95f41cd9f53f3307c08cd223
@@ -0,0 +1,25 @@
+# Uncomment if you wish to use the linux input layer event interface
+module_raw input grab_events=1
+
+# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
+# module_raw collie
+
+# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
+# module_raw corgi
+
+# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
+# module_raw ucb1x00
+
+# Uncomment if you're using an HP iPaq h3600 or similar
+# module_raw h3600
+
+# Uncomment if you're using a Hitachi Webpad
+# module_raw mk712
+
+# Uncomment if you're using an IBM Arctic II
+# module_raw arctic2
+
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
============================================================
--- packages/wordlist/files/rules c05179a08d78dc9c946b1b4e3eaab857aae70513
+++ packages/wordlist/files/rules c05179a08d78dc9c946b1b4e3eaab857aae70513
@@ -0,0 +1,218 @@
+#!/usr/bin/make -f
+# -*- Makefile -*- $Id: rules,v 1.18 2005/10/15 03:03:48 david Exp $
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+# Customized 27 Oct 1999 by David Coe for wenglish, later moved to scowl
+# This version is for packages that are architecture independent.
+
+# Copied & modified 20080409 from debian source package by John Lee
+# into OpenEmbedded.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# In addition to the scowl binary package, we create wamerican-small, wamerican, wamerican-large, wamerican-huge, and the
+# corresponding packages for wbritish and wcanadian.
+# The medium size packages have no -size part in their names
+# These are the scowl extensions (complexity numbers?) that contribute to each word list (i.e. each size);
+# the -size parts "-small", "", "-large", and "-huge" correspond to the end of the binary package name:
+export SIZE_EXTENSIONS-small:=10 20 35
+export SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS-small) 40 50
+export SIZE_EXTENSIONS-large:=$(SIZE_EXTENSIONS) 55 60 70
+export SIZE_EXTENSIONS-huge:=$(SIZE_EXTENSIONS-large) 80
+
+# These are the scowl word list classes we use:
+CLASSES:=words proper-names upper contractions
+VARIANTS:=0 1
+
+build: build-stamp
+build-stamp:
+# dh_testdir
+
+ set -e;\
+ for SPELLING in american british canadian; do\
+ for SIZE in -small "" -large -huge; do\
+ echo "The following SCOWL word lists were concatenated and sorted (with duplicates" > w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ echo "removed) to create this word list (see README.Debian for more details):" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ for CLASS in $(CLASSES); do\
+ for EXT in $$(eval echo \\$$SIZE_EXTENSIONS$$SIZE); do\
+ if [ -f final/english-$$CLASS.$$EXT ]; then\
+ echo "cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+ cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+ echo " english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ for VARIANT in $(VARIANTS); do\
+ if [ -f final/variant_$$VARIANT-$$CLASS.$$EXT ]; then\
+ echo "cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+ cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+ echo " variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ done;\
+ if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\
+ echo "cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+ cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+ echo " $$SPELLING-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ done;\
+ done;\
+ echo "sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
+ sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+ done;\
+ done
+
+ touch build-stamp
+
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ set -e;\
+ for SIZE in -small "" -large -huge; do\
+ for SPELLING in american british canadian; do\
+ rm -f $$SPELLING-english$$SIZE.unsorted $$SPELLING-english$$SIZE $$SPELLING-english$$SIZE.5 w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ done;\
+ done
+
+ dh_clean
+
+
+install: DH_OPTIONS=
+install: install-scowl install-wamerican install-wamerican-small install-wamerican-large install-wamerican-huge install-wbritish install-wbritish-small install-wbritish-large install-wbritish-huge install-wcanadian install-wcanadian-small install-wcanadian-large install-wcanadian-huge
+
+
+
+.PHONY: install-scowl
+install-scowl: PKG=scowl
+install-scowl:
+ dh_testdir
+ dh_testroot
+ dh_installdirs --package=$(PKG)
+
+ dh_install --package=$(PKG) final/*.[0-9][0-9] usr/share/dict/scowl
+ dh_installdocs --package=$(PKG) README debian/README.Debian
+
+
+.PHONY: install-wordlist
+install-wordlist:
+# PKG and WORDLIST must have been set to the binary package name and word list file name, respectively.
+ dh_testdir
+ dh_testroot
+ dh_installdirs --package=$(PKG)
+
+ dh_install --package=$(PKG) $(WORDLIST) usr/share/dict
+
+ dh_installdocs --package=$(PKG) $(PKG).scowl-word-lists-used debian/README.Debian
+
+ installdeb-wordlist --package=$(PKG) # This internally uses dh_installdebcon
+
+ sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template > $(WORDLIST).5
+ dh_installman --package=$(PKG) $(WORDLIST).5
+
+
+.PHONY: install-wamerican
+install-wamerican: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican WORDLIST=american-english install-wordlist
+
+.PHONY: install-wamerican-small
+install-wamerican-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-small WORDLIST=american-english-small install-wordlist
+
+.PHONY: install-wamerican-large
+install-wamerican-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-large WORDLIST=american-english-large install-wordlist
+
+.PHONY: install-wamerican-huge
+install-wamerican-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-huge WORDLIST=american-english-huge install-wordlist
+
+
+.PHONY: install-wbritish
+install-wbritish: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish WORDLIST=british-english install-wordlist
+
+.PHONY: install-wbritish-small
+install-wbritish-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-small WORDLIST=british-english-small install-wordlist
+
+.PHONY: install-wbritish-large
+install-wbritish-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-large WORDLIST=british-english-large install-wordlist
+
+.PHONY: install-wbritish-huge
+install-wbritish-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-huge WORDLIST=british-english-huge install-wordlist
+
+
+.PHONY: install-wcanadian
+install-wcanadian: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian WORDLIST=canadian-english install-wordlist
+
+.PHONY: install-wcanadian-small
+install-wcanadian-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-small WORDLIST=canadian-english-small install-wordlist
+
+.PHONY: install-wcanadian-large
+install-wcanadian-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-large WORDLIST=canadian-english-large install-wordlist
+
+.PHONY: install-wcanadian-huge
+install-wcanadian-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-huge WORDLIST=canadian-english-huge install-wordlist
+
+
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+# dh_installdocs # moved to the install targets, because it doesn't DWIM with "-A -p scowl README"
+# dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installman
+# dh_installcron
+# dh_installinfo
+# dh_undocumented
+# dh_strip
+ dh_link
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+# (Uncomment this next line if you have such packages.)
+# $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install
============================================================
--- packages/wordlist/scowl_6.bb 3c879b1a8c2e4cb21bb186cd29601c95da176d93
+++ packages/wordlist/scowl_6.bb 3c879b1a8c2e4cb21bb186cd29601c95da176d93
@@ -0,0 +1,37 @@
+DESCRIPTION = "SCOWL (Spell Checker Oriented Word Lists) is a collection of word lists split up in various sizes, and other categories, intended to be suitable for use in spell checkers. However, I am sure it will have numerous other uses as well."
+HOMEPAGE = "http://wordlist.sourceforge.net/"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wordlist/scowl-6.tar.gz \
+ file://rules"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_compile() {
+ cp -f ${WORKDIR}/rules ${S}
+ oe_runmake -f rules build
+}
+do_install() {
+ install -d ${D}/${datadir}/dict
+ install ${S}/american-english ${D}/${datadir}/dict
+ install ${S}/british-english ${D}/${datadir}/dict
+ install ${S}/canadian-english ${D}/${datadir}/dict
+}
+
+PACKAGE_ARCH = "all"
+PACKAGES = "wamerican wbritish wcanadian"
+
+FILES = "${datadir}/dict/${DICTNAME}"
+
+pkg_postinst() {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+cd ${datadir}/dict
+ln -sf ${DICTNAME} words
+}
+
+DICTNAME_wamerican = "american-english"
+DICTNAME_wbritish = "british-english"
+DICTNAME_wcanadian = "canadian-english"
============================================================
--- classes/package_ipk.bbclass 74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1
+++ classes/package_ipk.bbclass 242c256c8e04a09f38c2935be0882b1dee651600
@@ -203,20 +203,21 @@ python do_package_ipk () {
fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
fields.append(["OE: %s\n", ['PN']])
fields.append(["Homepage: %s\n", ['HOMEPAGE']])
+ fields.append(["Tags: %s\n", ['PKG_TAGS']])
def pullData(l, d):
l2 = []
for i in l:
- l2.append(bb.data.getVar(i, d, 1))
+ v = bb.data.getVar(i, d, 1)
+ if v is None:
+ raise KeyError(f)
+ l2.append(v)
return l2
ctrlfile.write("Package: %s\n" % pkgname)
# check for required fields
try:
for (c, fs) in fields:
- for f in fs:
- if bb.data.getVar(f, localdata) is None:
- raise KeyError(f)
ctrlfile.write(c % tuple(pullData(fs, localdata)))
except KeyError:
(type, value, traceback) = sys.exc_info()
============================================================
--- conf/bitbake.conf 86fdaa0747310ea3f83914cbb3f62e00cd500cec
+++ conf/bitbake.conf 6ff864c9de6f26e92c7ab40bc46eddef334a4df4
@@ -143,6 +143,7 @@ HOMEPAGE = "unknown"
LICENSE = "unknown"
MAINTAINER = "OpenEmbedded Team <openembedded-devel at lists.openembedded.org>"
HOMEPAGE = "unknown"
+PKG_TAGS = ""
# Package dependencies and provides.
============================================================
--- conf/distro/include/moko-autorev.inc 526e53c6184d16c08fc9cba8b28d1ef6dc4fe3b4
+++ conf/distro/include/moko-autorev.inc 87f881f7cd88b239e8022a227df4b65b4a155c4f
@@ -10,6 +10,8 @@ SRCREV_pn-diversity-nav ?= "${AUTOREV}"
SRCREV_pn-assassin ?= "${AUTOREV}"
SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-illume ?= "${AUTOREV}"
+SRCREV_pn-illume-theme ?= "${AUTOREV}"
SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
SRCREV_pn-opkg ?= "${AUTOREV}"
@@ -63,3 +65,5 @@ SRCREV_pn-usbpath-native ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-usbpath ?= "${AUTOREV}"
SRCREV_pn-usbpath-native ?= "${AUTOREV}"
+
+EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
============================================================
--- conf/distro/include/sane-srcdates.inc 8b9fd0206baa49e75bdf70f5761e1fe4649d422e
+++ conf/distro/include/sane-srcdates.inc ff2cde45563283f24f83472dafe559f2b2043e24
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080402"
+EFL_SRCDATE ?= "20080402"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc b5c07ab75b8688bbbdefd4466751f40294f4e226
+++ conf/distro/include/sane-srcrevs.inc 74298b9f70161c93059b5b2f49a05c04a1826693
@@ -38,8 +38,8 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "21"
-SRCREV_pn-illume-theme ?= "21"
+SRCREV_pn-illume ?= "31"
+SRCREV_pn-illume-theme ?= "31"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
@@ -58,7 +58,7 @@ SRCREV_pn-linux-ixp4xx ?= "1056"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1056"
-SRCREV_pn-linux-openmoko ?= "4194"
+SRCREV_pn-linux-openmoko ?= "a7abe2b82f5f98272587c4aed474d7445f2bd6b8"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
@@ -155,7 +155,7 @@ SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-python-lightmediascanner = "68"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
-SRCREV_pn-settings-daemon ?= "1755"
+SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-sjf2410-linux-native ?= "4268"
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
============================================================
--- contrib/oe-stylize.py 9e40dcd24e4d8f38580faf97a7ca791069087802
+++ contrib/oe-stylize.py ccf166ea67ebcb8024d3d378d1ff66b5386d1023
@@ -32,6 +32,7 @@ OE_vars = [
'AUTHOR',
'HOMEPAGE',
'SECTION',
+ 'PKG_TAGS',
'PRIORITY',
'LICENSE',
'DEPENDS',
============================================================
--- packages/efl1/etk_cvs.bb 1c4ad62955a3041ca60b191f4f46f758a4a45cb4
+++ packages/efl1/etk_cvs.bb 409c4526643bb84665f38a0a31a6e5596c432ae5
@@ -2,7 +2,7 @@ PV = "0.1.0.042+cvs${SRCDATE}"
DEPENDS = "evas ecore edje"
LICENSE = "MIT"
PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r0.01"
inherit efl
@@ -17,20 +17,20 @@ RRECOMMENDS_${PN} = "${PN}-engines"
RRECOMMENDS_${PN} = "${PN}-engines"
-PACKAGES += "etk-engines-software-x11"
-FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
+#PACKAGES += "etk-engines-software-x11"
+#FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
#PACKAGES =+ "etk-engines-gl-x11"
#FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so"
-PACKAGES =+ "etk-engines-evas"
-FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
+#PACKAGES =+ "etk-engines-evas"
+#FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
-PACKAGES =+ "etk-engines-fb"
-FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
+#PACKAGES =+ "etk-engines-fb"
+#FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
-PACKAGES =+ "etk-engines-x11"
-FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+#PACKAGES =+ "etk-engines-x11"
+#FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+#PACKAGES =+ "etk-engines-software-x11-16"
+#FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
-PACKAGES =+ "etk-engines-software-x11-16"
-FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
============================================================
--- packages/ipkg-utils/ipkg-utils/fields_tweaks.patch bcce07d7c1acb2892a59f8be552f77994e17e98c
+++ packages/ipkg-utils/ipkg-utils/fields_tweaks.patch e66a4afa1f9a57edd969a060f0b99fc5bfb33e50
@@ -6,9 +6,9 @@ Index: ipkg-utils/Makefile
Index: ipkg-utils/Makefile
===================================================================
---- ipkg-utils.orig/Makefile 2007-06-13 22:45:47.000000000 +0100
-+++ ipkg-utils/Makefile 2007-06-13 22:46:50.000000000 +0100
-@@ -15,6 +15,8 @@ install: ${UTILS}
+--- ipkg-utils.orig/Makefile 2004-12-28 23:32:20.000000000 +0800
++++ ipkg-utils/Makefile 2008-04-08 18:42:36.000000000 +0800
+@@ -15,6 +15,8 @@
python setup.py install
chmod agu+rx ipkg-make-index
cp -f ipkg-make-index $(PREFIX)/bin
@@ -20,7 +20,7 @@ Index: ipkg-utils/ipkg-list-fields
Index: ipkg-utils/ipkg-list-fields
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/ipkg-list-fields 2007-06-13 22:43:32.000000000 +0100
++++ ipkg-utils/ipkg-list-fields 2008-04-08 18:42:36.000000000 +0800
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
@@ -37,19 +37,20 @@ Index: ipkg-utils/ipkg.py
+
Index: ipkg-utils/ipkg.py
===================================================================
---- ipkg-utils.orig/ipkg.py 2007-06-13 22:44:50.000000000 +0100
-+++ ipkg-utils/ipkg.py 2007-06-13 22:39:44.000000000 +0100
-@@ -139,6 +139,9 @@ class Package:
+--- ipkg-utils.orig/ipkg.py 2008-04-08 18:42:35.000000000 +0800
++++ ipkg-utils/ipkg.py 2008-04-08 18:45:28.000000000 +0800
+@@ -139,6 +139,10 @@
self.installed_size = None
self.filename = None
self.isdeb = 0
+ self.homepage = None
+ self.oe = None
+ self.priority = None
++ self.tags = None
self.fn = fn
if fn:
-@@ -211,7 +214,7 @@ class Package:
+@@ -212,7 +216,7 @@
elif self.__dict__.has_key(name):
self.__dict__[name] = value
else:
@@ -58,13 +59,14 @@ Index: ipkg-utils/ipkg.py
pass
if line and line[0] == '\n':
-@@ -402,6 +405,9 @@ class Package:
+@@ -413,6 +417,10 @@
if self.filename: out = out + "Filename: %s\n" % (self.filename)
if self.source: out = out + "Source: %s\n" % (self.source)
if self.description: out = out + "Description: %s\n" % (self.description)
+ if self.oe: out = out + "OE: %s\n" % (self.oe)
+ if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
+ if self.priority: out = out + "Priority: %s\n" % (self.priority)
++ if self.tags: out = out + "Tags: %s\n" % (self.tags)
out = out + "\n"
return out
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 054d2acb3ff8284167043e5554633713ebdba2cf
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 2fffa65764b445bac4b2ec9f7b7b01d1b11a0651
@@ -1,7 +1,7 @@ RDEPENDS = ""
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r16"
+PR = "r16.01"
inherit native
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb 53716efd0be08661e891166feef9298502f1ff73
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb 6ca2e19f7611e0124df8a7be84f3cab7f69e1963
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r18"
+PR = "r18.01"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
============================================================
--- packages/linux/linux-openmoko_2.6.24+git.bb 20255a61aa6d2525255c85da2f1d62a5c56e02bf
+++ packages/linux/linux-openmoko_2.6.24+git.bb b5191bd5a6a02812c00983b18becbb791e375c18
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux 2.6.x (development)
DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
-# If you use a rc, you will need to use this:
+PE = "1"
PV = "${KERNEL_RELEASE}+git${SRCDATE}"
PR = "r0"
============================================================
--- packages/openmoko-projects/assassin_svn.bb ec54896d60155ed78661fbb53074c68150c9077c
+++ packages/openmoko-projects/assassin_svn.bb 080e285125a168b5f6d613c3bbd62d5d53591ad0
@@ -2,7 +2,7 @@ DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm
HOMEPAGE = "http://assassin.projects.openmoko.org/"
LICENSE = "GPL"
DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
-PV = "0.2+svn${SRCREV}"
+PV = "0.2+svnr${SRCREV}"
PR = "r4"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
============================================================
--- packages/openmoko-projects/diversity-nav_svn.bb e70dd159aa10e5d331469df680d7a92b6a17ed69
+++ packages/openmoko-projects/diversity-nav_svn.bb 9370cdd9600c307c35b50ef38c35a344330e1f73
@@ -1,11 +1,12 @@ SECTION = "openmoko/applications"
DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
HOMEPAGE = "http://diversity.projects.openmoko.org/"
SECTION = "openmoko/applications"
+PKG_TAGS_${PN} = "group::maps"
LICENSE = "GPL"
DEPENDS = "evas edje ecore edbus ewl"
RDEPENDS_${PN} = "diversity-daemon"
PV = "0.0.1+svnr${SRCREV}"
-PR = "r3"
+PR = "r3.01"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
============================================================
--- packages/openmoko-projects/illume_svn.bb f0d1ea3f7f065e02920803bee606469fccb5db16
+++ packages/openmoko-projects/illume_svn.bb 41d78bc73011aab120638b3ff084513fbbeeeb4e
@@ -1,11 +1,10 @@ LICENSE = "MIT/BSD"
DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
HOMEPAGE = "http://illume.projects.openmoko.org/"
LICENSE = "MIT/BSD"
-
DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
-
+RRECOMMENDS = "wamerican"
PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
@@ -23,6 +22,4 @@ FILES_${PN} = "${libdir}/enlightenment/m
${libdir}/enlightenment/modules/*/*.desktop \
${libdir}/enlightenment/modules/*/*/* \
${datadir}/${PN} "
-
-
FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
============================================================
--- packages/settings-daemon/files/70settings-daemon 70c8c167bec306d4135dd5cbf159e6cae849a18a
+++ packages/settings-daemon/files/70settings-daemon fd2db3c1fc805b65926439f53fd8dba081004766
@@ -1,3 +1,3 @@
#!/bin/sh
+/usr/bin/settings-daemon
-/usr/bin/settings-daemon &
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb f266cffda5f763fbd31050c83eb2c9e97bfcaaac
+++ packages/settings-daemon/settings-daemon_svn.bb 232ef26e8f78ffc82665195719a830883eaf51d5
@@ -5,7 +5,7 @@ PV = "0.0+svnr${SRCREV}"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://70settings-daemon"
============================================================
--- packages/tslib/tslib_1.0.bb 5d5d2fe05b80425f25473bfe084177b902b207f9
+++ packages/tslib/tslib_1.0.bb d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
SECTION = "base"
LICENSE = "LGPL"
-PR = "r17"
+PR = "r18"
SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
file://tslib-input_raw-grab_events.patch;patch=1 \
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 2915a14313602fff89685477aaabe69d4e32a457
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b6120434f910d084652aecf6c1d3d4c501be78cc
@@ -16,6 +16,7 @@ if [ -f /usr/bin/Xglamo ]; then
XSERVER=/usr/bin/Xomap
fi
if [ -f /usr/bin/Xglamo ]; then
+ export USE_EXA=no
XSERVER=/usr/bin/Xglamo
fi
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 60b23f2d6507ed740f14d2d710ab0b1fe8f1dca0
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb e41ab9242ae6d5e9acea897aa94ca13e00b76f1b
@@ -2,7 +2,7 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r27"
+PR = "r27.01"
SRC_URI = "\
file://Xdefaults \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080411/8696af6e/attachment.htm
-------------- next part --------------
#
#
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
# from [ea17b13c96864a64f96b121b88a66ec7b5f3daf7]
# to [02e2c207f0fd749919681c772b4289100a327dc2]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb ea17b13c96864a64f96b121b88a66ec7b5f3daf7
+++ packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb 02e2c207f0fd749919681c772b4289100a327dc2
@@ -9,9 +9,9 @@ PE = "1"
RDEPENDS_${PN} = "xserver-kdrive"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r2"
+PR = "r3"
-XGLAMO_GIT_REV = "cbb4094468e69aab70fac495988eb3b37685c49a"
+XGLAMO_GIT_REV = "9a7f5bc90c3e385e9b0d82d5a49af65dca0e73a6"
SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
file://kmode.patch;patch=1 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080411/8696af6e/attachment-0001.htm
More information about the commitlog
mailing list
