[oe-commits] org.oe.dev merge of '4e808662b364403781cd4e899198db521c13afc9'
xora commit
oe at amethyst.openembedded.net
Fri May 9 15:39:48 UTC 2008
merge of '4e808662b364403781cd4e899198db521c13afc9'
and '88288139695df3e5cc87ecfe407fbad1d201c362'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: cacb5e5aa85fe20b14ed94f31e296e4efeb1de96
ViewMTN: http://monotone.openembedded.org/revision/info/cacb5e5aa85fe20b14ed94f31e296e4efeb1de96
Files:
1
packages/alsa/alsa-state/om-gta01
packages/alsa/alsa-state/om-gta01/asound.state
packages/alsa/alsa-state/om-gta01/capturehandset.state
packages/alsa/alsa-state/om-gta01/captureheadset.state
packages/alsa/alsa-state/om-gta01/gsmbluetooth.state
packages/alsa/alsa-state/om-gta01/gsmhandset.state
packages/alsa/alsa-state/om-gta01/gsmheadset.state
packages/alsa/alsa-state/om-gta01/gsmspeakerout.state
packages/alsa/alsa-state/om-gta01/stereoout.state
packages/alsa/alsa-state/om-gta01/voip-handset.state
packages/alsa/alsa-state/om-gta01/voip-headset.state
packages/alsa/alsa-state/om-gta02
packages/alsa/alsa-state/om-gta02/asound.state
packages/alsa/alsa-state/om-gta02/gsmhandset.state
packages/alsa/alsa-state/om-gta02/stereoout.state
packages/openmoko-projects/illume/illume-fix-includes.patch
packages/dvbtools/dvb-apps-1.1.1
packages/efl1/imlib2
packages/openmoko-projects/diversity-daemon
packages/openssl/openssl-0.9.7m
packages/openssl/openssl-0.9.8g
packages/classpath/classpath-native_0.97.1.bb
packages/dvbtools/dvb-apps-1.1.1/makefile.patch
packages/dvbtools/dvb-apps_1.1.1.bb
packages/e17/e-wm/enlightenment_start.oe
packages/e17/e-wm/pkgconfig-fix.patch
packages/e17/e-wm/profile-search.patch
packages/e17/exquisite_cvs.bb
packages/efl1/imlib2/remove-local-includes-20080421.patch
packages/efl1/imlib2/remove-local-includes.patch
packages/git/git_1.5.3.bb
packages/hal/hal-info_20080313.bb
packages/libnl/files/linux-header.patch
packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch
packages/libnl/libnl_1.0-pre8.bb
packages/notification-daemon/files/notification-daemon-fix-text-color.diff
packages/openmoko-projects/diversity-daemon/no-xmmp.patch
packages/openmoko-projects/diversity-maps-taipei_20080430.bb
packages/openmoko-projects/diversity-maps.inc
packages/openmoko-projects/enlazar_svn.bb
packages/openmoko-projects/illume/keyboard.patch
packages/openmoko-projects/illume-theme_svn.bb
packages/openmoko-tools/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
packages/openssl/openssl-0.9.7m/armeb.patch
packages/openssl/openssl-0.9.7m/avr32.patch
packages/openssl/openssl-0.9.7m/debian.patch
packages/openssl/openssl-0.9.7m/gnueabi-arm.patch
packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch
packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch
packages/openssl/openssl-0.9.8g/configure-targets.patch
packages/openssl/openssl-0.9.8g/debian.patch
packages/openssl/openssl-native_0.9.7m.bb
packages/openssl/openssl_0.9.7m.bb
packages/openssl/openssl_0.9.8g.bb
packages/python/python-etk_git.bb
classes/base.bbclass
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/om-gta02.conf
packages/alsa/alsa-state.bb
packages/e17/e-wm/applications.menu
packages/e17/e-wm_cvs.bb
packages/e17/examine_cvs.bb
packages/e17/exhibit_cvs.bb
packages/efl1/ecore.inc
packages/efl1/edbus_cvs.bb
packages/efl1/imlib2_cvs.bb
packages/git/git-native_1.5.3.bb
packages/git/git.inc
packages/networkmanager/networkmanager.inc
packages/networkmanager/networkmanager_0.6.5.bb
packages/networkmanager/networkmanager_svn.bb
packages/notification-daemon/notification-daemon_0.3.7.bb
packages/openmoko-projects/assassin_svn.bb
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
packages/openmoko-projects/illume_svn.bb
packages/openmoko2/openmoko-alsa-scenarios.bb
packages/openmoko2/openmoko-browser2_svn.bb
packages/python/python-gsmd_svn.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-openmoko-games.bb
packages/xorg-doc/xorg-doc-common.inc
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
packages/xorg-xserver/xserver-kdrive_1.1.0.bb
packages/xorg-xserver/xserver-xorg_1.2.0.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
packages/cairo/cairo_1.5.2.bb
packages/cairo/cairo_1.6.4.bb
packages/netperf/netperf_2.4.2.bb
packages/netperf/netperf_2.4.4.bb
packages/openipmi
packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff
conf/distro/angstrom-2008.1.conf
packages/anthy/anthy/native-helpers.patch
packages/anthy/anthy-native/native-helpers.patch
packages/anthy/files/2ch_t.patch
packages/anthy/files/not_build_elc.patch
packages/linux/linux-omap2_git.bb
Diffs:
#
# mt diff -r4e808662b364403781cd4e899198db521c13afc9 -rcacb5e5aa85fe20b14ed94f31e296e4efeb1de96
#
#
#
# delete "packages/alsa/alsa-state/om-gta01"
#
# delete "packages/alsa/alsa-state/om-gta01/asound.state"
#
# delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/stereoout.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"
#
# delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"
#
# delete "packages/alsa/alsa-state/om-gta02"
#
# delete "packages/alsa/alsa-state/om-gta02/asound.state"
#
# delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/om-gta02/stereoout.state"
#
# delete "packages/openmoko-projects/illume/illume-fix-includes.patch"
#
# add_dir "packages/dvbtools/dvb-apps-1.1.1"
#
# add_dir "packages/efl1/imlib2"
#
# add_dir "packages/openmoko-projects/diversity-daemon"
#
# add_dir "packages/openssl/openssl-0.9.7m"
#
# add_dir "packages/openssl/openssl-0.9.8g"
#
# add_file "packages/classpath/classpath-native_0.97.1.bb"
# content [4b052ebae756323751932779865b45cf50a920fa]
#
# add_file "packages/dvbtools/dvb-apps-1.1.1/makefile.patch"
# content [53e5a822fed5ab5130190362938ad037f477943f]
#
# add_file "packages/dvbtools/dvb-apps_1.1.1.bb"
# content [e6bd10253bca1ce854ad10588291cf42b9d0d50a]
#
# add_file "packages/e17/e-wm/enlightenment_start.oe"
# content [bd936fb2c5aca13675a033e4fcce807db8fab342]
#
# add_file "packages/e17/e-wm/pkgconfig-fix.patch"
# content [f9a5a8b724513748dd11a34a109b38a822d30b51]
#
# add_file "packages/e17/e-wm/profile-search.patch"
# content [ba211916093808b88a325df737f2c6cb045650d5]
#
# add_file "packages/e17/exquisite_cvs.bb"
# content [5bae4f4f6c4c55398c20d8a547eed13ab205bc8f]
#
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
# content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
#
# add_file "packages/efl1/imlib2/remove-local-includes.patch"
# content [575153404b4483b1dc4a71f3af556661d52804e5]
#
# add_file "packages/git/git_1.5.3.bb"
# content [0c464d9a2e683099651fb53fff054e6c2cdea2a7]
#
# add_file "packages/hal/hal-info_20080313.bb"
# content [5389659078578f1501bf847f45a6a405058621b7]
#
# add_file "packages/libnl/files/linux-header.patch"
# content [c80bf7e1a37a991954debd494073a91d32f42ede]
#
# add_file "packages/libnl/files/local-includes-and-avoid-wrong-ldflags.patch"
# content [c4d94662df225a0ee6e10889d64e44b213e8a5e8]
#
# add_file "packages/libnl/libnl_1.0-pre8.bb"
# content [75a1ae1e39545b0ba22753221a95f7101f36a2cb]
#
# add_file "packages/notification-daemon/files/notification-daemon-fix-text-color.diff"
# content [4dd28f5a824b69e10af37851a3ddb38462a9e6bd]
#
# add_file "packages/openmoko-projects/diversity-daemon/no-xmmp.patch"
# content [f06801dd8032224db24f159337d273803194afdc]
#
# add_file "packages/openmoko-projects/diversity-maps-taipei_20080430.bb"
# content [11b489f90d6c21f5517c296b58d7914d56b1d211]
#
# add_file "packages/openmoko-projects/diversity-maps.inc"
# content [8caa0339605461e88ecdadc914d21b7433a508f8]
#
# add_file "packages/openmoko-projects/enlazar_svn.bb"
# content [47b1f4f00fe055287bfa497c3b8f4a15ceb8e456]
#
# add_file "packages/openmoko-projects/illume/keyboard.patch"
# content [d0ab0f49ef182b624e0f667a2e062b013060de99]
#
# add_file "packages/openmoko-projects/illume-theme_svn.bb"
# content [1b8f6932f93b1ca178de665cfc71a366cdb05123]
#
# add_file "packages/openmoko-tools/pty-forward-native.bb"
# content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]
#
# add_file "packages/openmoko-tools/serial-forward.bb"
# content [32434a87a886be4c262ea2f13af0375bae297e48]
#
# add_file "packages/openssl/openssl-0.9.7m/armeb.patch"
# content [faf20afb99b155b2cddce4e15a0feca6c02bee82]
#
# add_file "packages/openssl/openssl-0.9.7m/avr32.patch"
# content [3b5c9b4ba8231648a8048095d6054f16289d3515]
#
# add_file "packages/openssl/openssl-0.9.7m/debian.patch"
# content [2e7b0df685842cedf705926ea7cfb1a5f6ffbee4]
#
# add_file "packages/openssl/openssl-0.9.7m/gnueabi-arm.patch"
# content [e12709094153709afff9c797c8fb84693556e5ab]
#
# add_file "packages/openssl/openssl-0.9.7m/gnueabi-armeb.patch"
# content [6667972d27eb2ab7dfbb6189e987578a7feb9a1e]
#
# add_file "packages/openssl/openssl-0.9.7m/uclibcgnueabi.patch"
# content [bd1bc954b5c2e8539a39128f09661d686716eba9]
#
# add_file "packages/openssl/openssl-0.9.8g/configure-targets.patch"
# content [40d57766f81e17ec56ee4b10fd84987ba1d73129]
#
# add_file "packages/openssl/openssl-0.9.8g/debian.patch"
# content [e2524f821f3c1693aabb548a7c6c9cfac5a7a56b]
#
# add_file "packages/openssl/openssl-native_0.9.7m.bb"
# content [aee940409bd5054fbf284dbe9b7adbfd5269d114]
#
# add_file "packages/openssl/openssl_0.9.7m.bb"
# content [e1c49f5a11a86d7eb04595e34aeed012e99f1071]
#
# add_file "packages/openssl/openssl_0.9.8g.bb"
# content [e326706f63f853e3243bfc002f2f8d924885404d]
#
# add_file "packages/python/python-etk_git.bb"
# content [3ebc7def0348080f9ddde7b1c7f505055eee4cc4]
#
# patch "classes/base.bbclass"
# from [1271ac943b8b7bf95706c4d16bba4f96f433dc61]
# to [1f2aa3e857574c705066c6e22b6697bfafc48da0]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [30a97196079a97d9c58ada036559086466b640f3]
# to [cf51729787fd2fd25f76ebaf652e629b2c27a8b4]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [ab98f16a11db3d5648ce60703f88e9417c3562d3]
# to [e993ffd4e275abdc019bd768b83fe75481e9f12a]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [66194c2a11de4d730e4bb8b41bd36aaeb73422e9]
# to [0a19a9220db8e4a5daecdc69f8cd9aa660f37f63]
#
# patch "conf/machine/om-gta02.conf"
# from [8a81b5b7224a98d62de1611265a26386dc77b5f2]
# to [11ccb7175df71581f7b6aa92b0065dcae04d5151]
#
# patch "packages/alsa/alsa-state.bb"
# from [f5ed106d3dce9fc8b495243ae43e56a3127b312e]
# to [04a454f9cf8be4d3f5c5f98b6d2889b0a49da343]
#
# patch "packages/e17/e-wm/applications.menu"
# from [3d8bf0502e169a69c95a7c52ec147ede6a8f47fc]
# to [4f7e730b41ad9992c457369c69a3b9abbf181b70]
#
# patch "packages/e17/e-wm_cvs.bb"
# from [5002700472e10c4056f6f0f86e315d894a880f22]
# to [10fac6f3469627d641a1a831d9875c86b8b3edc3]
#
# patch "packages/e17/examine_cvs.bb"
# from [9ca27ead428451e9f3791414f613edfe4f774159]
# to [e3e673894efe8cf2df1bc77643fdc5d83123d111]
#
# patch "packages/e17/exhibit_cvs.bb"
# from [300a7d6927ab40b6eb531c2bb1e498cef76349a1]
# to [f73da1927137a5f60bce85af9063e453353e4c37]
#
# patch "packages/efl1/ecore.inc"
# from [2ebb4427d05c26ac7aeea4cc122ac019813f57bb]
# to [b736e8d906a16691f28e2de920bf7b69469cb020]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [d3da1a158da97f38b8d2c32c4994ac557c07dc4e]
# to [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [5c3c8c06ae6d9a4d18d10a066fc8973ec535e871]
# to [c32847438359b0993cb9eadcf6f4b6019585f54c]
#
# patch "packages/git/git-native_1.5.3.bb"
# from [0eee3955b85d6ba2bd393cc5e7525c848366f62c]
# to [6d2f5b7e8b3ca3f8a01ee7f8f255f152a964de99]
#
# patch "packages/git/git.inc"
# from [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
# to [78d5cbf5201f942c64ae36ae924b01ac6152208a]
#
# patch "packages/networkmanager/networkmanager.inc"
# from [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
# to [9a93709e62dc590d2b4b7c3f8c4d0357c2a64b99]
#
# patch "packages/networkmanager/networkmanager_0.6.5.bb"
# from [c44eba44dd018961750b625359c57e42f53463aa]
# to [b6f945c3ef7f135e07832220bac70bc8b91016d8]
#
# patch "packages/networkmanager/networkmanager_svn.bb"
# from [9b937ee39ef7fa695a9532effa744c53c1caec94]
# to [013d4c276b3821e39ccb1d30cd038c332870a552]
#
# patch "packages/notification-daemon/notification-daemon_0.3.7.bb"
# from [2651b1bc5c5efb73799947ba1466e4ad1dec44cc]
# to [a7ebdf98090ed6e927affd6bbb3854a3ee53174d]
#
# patch "packages/openmoko-projects/assassin_svn.bb"
# from [ec54896d60155ed78661fbb53074c68150c9077c]
# to [7699f982b9dc486afabfd9d6dd687a29e56d1aba]
#
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
# from [2f221ccc7f8ad502be7a83b018be160aa88a2b77]
# to [e494ec28fd572c5403516cd03277f734eeb45959]
#
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
# from [2d3ef31739f95c0422c0d3c57e39f340692a41b9]
# to [62a724e74403ec3bbbff405d5a988a66e9a2221d]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [c0608172fae13bd898686c009658f6f8179e9c46]
# to [41d78bc73011aab120638b3ff084513fbbeeeb4e]
#
# patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
# from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
# to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
#
# patch "packages/openmoko2/openmoko-browser2_svn.bb"
# from [97e4a4e1045a6b79f8608840187670da897233e1]
# to [5e65e11d7c19f09f5eecfd6da04adb52eb876a92]
#
# patch "packages/python/python-gsmd_svn.bb"
# from [681db41291375649198b13f6903ca74e5d0dac02]
# to [02405435f1ef4c0da285f62f5bf4e0603fe06330]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [07573275a9eae995a46912fda4b58abc2cecbe66]
# to [7ef80d3236128df7070e50415a62f1b4e280d8d3]
#
# patch "packages/tasks/task-openmoko-games.bb"
# from [7136c47512f8e4dd2fd33f9a11c541660b9e081a]
# to [2168c735481bcce58ee46ceca0074f8edabdc80d]
#
# patch "packages/xorg-doc/xorg-doc-common.inc"
# from [1294fd3c0d85931642432d2ab20a9717966949b0]
# to [91f162af4ae035c6bbfbea6e4ef1cd51e6cadc2d]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
# to [77ad25b09ec5d7afb286d85075768e69fe9d566e]
#
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
# from [d9999335a38fb49bae5419528a518ebff7e010b6]
# to [6ba65398f17e685fcfadd21c36980528ac5cc775]
#
# patch "packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb"
# from [0e72a73ed8c431c237be94d012f71e1c0ba17de4]
# to [9e22e57d519a3db6506a03abb3832a698dd2580f]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.1.0.bb"
# from [e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a]
# to [025fb5ef7bbba8e693cf91a7f19966b41a61b6ac]
#
# patch "packages/xorg-xserver/xserver-xorg_1.2.0.bb"
# from [c73bffb1e3641cde21223b8fe821232c15036b4d]
# to [851bb3b6b25a7e03953ef2c03063779bdcc0ec9f]
#
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
# from [90ab10be4b7894e29fabbe78fccead9685ff87ac]
# to [228af28a9592f1bb445ca5ffd4054533d0a5498e]
#
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
# from [b205054696412235974c4bc8ba8c5ab1d7eb3104]
# to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#
============================================================
--- packages/classpath/classpath-native_0.97.1.bb 4b052ebae756323751932779865b45cf50a920fa
+++ packages/classpath/classpath-native_0.97.1.bb 4b052ebae756323751932779865b45cf50a920fa
@@ -0,0 +1,3 @@
+require classpath-native.inc
+
+PR = "r0"
============================================================
--- packages/dvbtools/dvb-apps-1.1.1/makefile.patch 53e5a822fed5ab5130190362938ad037f477943f
+++ packages/dvbtools/dvb-apps-1.1.1/makefile.patch 53e5a822fed5ab5130190362938ad037f477943f
@@ -0,0 +1,89 @@
+Index: linuxtv-dvb-apps-1.1.1/test/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/test/Makefile 2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/test/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,6 +1,6 @@
+ # Makefile for Linux DVB API Version 3 test programs
+
+-CC = gcc
++
+ CFLAGS = -g -O2 -W -Wall -I../include
+
+ TARGETS = \
+Index: linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/av7110_loadkeys/Makefile 2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,7 +1,6 @@
+-CC = gcc
+ CFLAGS = -g -Wall -O2
+
+-all: av7110_loadkeys evtest
++all: evtest
+
+ av7110_loadkeys: av7110_loadkeys.o
+
+Index: linuxtv-dvb-apps-1.1.1/util/lib/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/lib/Makefile 2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,5 +1,5 @@
+
+-CC = gcc
++
+ CFLAGS = -MD -g -Wall -O2 -I../../include -I.
+ LFLAGS = -g -Wall
+
+Index: linuxtv-dvb-apps-1.1.1/util/scan/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/scan/Makefile 2006-05-18 01:34:53.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,5 +1,5 @@
+
+-CC = gcc
++
+ CFLAGS = -MD -g -Wall -O2 -I../../include
+ LFLAGS = -g -Wall
+
+Index: linuxtv-dvb-apps-1.1.1/util/szap/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/szap/Makefile 2006-05-18 01:31:54.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,4 +1,4 @@
+-CC = gcc
++
+ CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
+ LFLAGS = -Wall -g -O2
+ RM = rm -f
+Index: linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/dvbdate/Makefile 2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,5 +1,4 @@
+
+-CC = gcc
+ CFLAGS = -g -O2 -MD -Wall -I. -I../../include
+ LFLAGS =
+
+Index: linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/dvbnet/Makefile 2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile 2008-03-25 20:04:23.000000000 +0100
+@@ -1,5 +1,4 @@
+
+-CC = gcc
+ CFLAGS = -g -O2 -MD -Wall -I. -I../../include
+ LFLAGS =
+
+Index: linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1.orig/util/dvbtraffic/Makefile 2004-01-19 18:10:16.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile 2008-03-25 20:09:00.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ dvbtraffic: dvbtraffic.c
+- gcc -MD -g -O2 -Wall -I../../include $< -o $@
++ $(CC) -MD -g -O2 -Wall -I../../include $< -o $@
+
+ clean:
+ rm -f *.o *.d dvbtraffic
============================================================
--- packages/dvbtools/dvb-apps_1.1.1.bb e6bd10253bca1ce854ad10588291cf42b9d0d50a
+++ packages/dvbtools/dvb-apps_1.1.1.bb e6bd10253bca1ce854ad10588291cf42b9d0d50a
@@ -0,0 +1,109 @@
+HOMEPAGE = "http://www.linuxtv.org"
+LICENSE = "GPL"
+S = "${WORKDIR}/linuxtv-dvb-apps-${PV}"
+
+SRC_URI = "http://linuxtv.org/downloads/linuxtv-dvb-apps-${PV}.tar.bz2 \
+ file://makefile.patch;patch=1"
+
+PACKAGES += "evtest evtest-dbg \
+ dvbapp-tests dvbapp-tests-dbg \
+ dvbdate dvbdate-dbg \
+ dvbtraffic dvbtraffic-dbg \
+ dvbnet dvbnet-dbg \
+ dvb-scan dvb-scan-dbg dvb-scan-data \
+ dvb-azap dvb-azap-dbg \
+ dvb-czap dvb-czap-dbg \
+ dvb-szap dvb-szap-dbg \
+ dvb-tzap dvb-tzap-dbg \
+ dvb-femon dvb-femon-dbg \
+ dvb-zap-data"
+
+
+FILES_${PN} = ""
+FILES_${PN}-dbg = ""
+FILES_${PN}-doc = ""
+
+FILES_evtest = "${bindir}/evtest"
+FILES_evtest-dbg = "${bindir}/.debug/evtest"
+
+FILES_dvbapp-tests = "${bindir}/test_*"
+FILES_dvbapp-tests-dbg = "${bindir}/.debug/test_*"
+
+FILES_dvbdate = "${bindir}/dvbdate"
+FILES_dvbdate-dbg = "${bindir}/.debug/dvbdate"
+
+FILES_dvbtraffic = "${bindir}/dvbtraffic"
+FILES_dvbtraffic-dbg = "${bindir}/.debug/dvbtraffic"
+
+FILES_dvbnet = "${bindir}/dvbnet"
+FILES_dvbnet-dbg = "${bindir}/.debug/dvbnet"
+
+FILES_dvb-scan = "${bindir}/scan"
+FILES_dvb-scan-dbg = "${bindir}/.debug/scan"
+FILES_dvb-scan-data = "${docdir}/dvb-apps/scan"
+
+FILES_dvb-azap = "${bindir}/azap"
+FILES_dvb-azap-%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r88288139695df3e5cc87ecfe407fbad1d201c362 -rcacb5e5aa85fe20b14ed94f31e296e4efeb1de96
#
#
#
# rename "packages/cairo/cairo_1.5.2.bb"
# to "packages/cairo/cairo_1.6.4.bb"
#
# rename "packages/netperf/netperf_2.4.2.bb"
# to "packages/netperf/netperf_2.4.4.bb"
#
# add_dir "packages/openipmi"
#
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch"
# content [d0cdbb246afa6d610fa35f606b35f75df4f46169]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff"
# content [5ce1b897fc176209672cc01f8ff7ed7597d66ef4]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [1426e85436d24f9292dd3115736fef8e6fae4887]
# to [947d891b5c7e5a12292a5157cb870e8fae548110]
#
# patch "packages/anthy/anthy/native-helpers.patch"
# from [93e91dd3974caa6b21f6b879c04ca9fbfff01f4f]
# to [d9523a709922e13fa5f4b41135cfa620b8538345]
#
# patch "packages/anthy/anthy-native/native-helpers.patch"
# from [803e92a2aa725818c04c1e113c7fc9880f8a2dbf]
# to [3f081afb06c0ce66c77b679d63d13544459bbd52]
#
# patch "packages/anthy/files/2ch_t.patch"
# from [d293db149658f25d17f1a770dfa35fe3988f9049]
# to [06950f2f1ea0b1e833aee237ad4dbe9872302f0e]
#
# patch "packages/anthy/files/not_build_elc.patch"
# from [b768a709c32eef8a20d17741e1121863b2d538be]
# to [f0858177beb7a0ed9464888a8cd3534399a03f63]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [51983441aa46ff6fdedad22db5955685518fa707]
# to [318d9950053ee9a54e1c0a7235e17c2f6f809dd8]
#
# patch "packages/netperf/netperf_2.4.4.bb"
# from [04ccea09108ac141e06977b7b5545f91cd5901f5]
# to [25eec6c603cb3b56d9cffcfd1f1e7ee0c27695b5]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch d0cdbb246afa6d610fa35f606b35f75df4f46169
+++ packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch d0cdbb246afa6d610fa35f606b35f75df4f46169
@@ -0,0 +1,43 @@
+From 3f8441b4e1fc297caf5cf712c1bc3f506ec28065 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at openembedded.org>
+Date: Thu, 8 May 2008 18:30:41 +0200
+Subject: [PATCH] This patch adds RTC support to the omap3 based beagleboard
+
+Signed-off-by: Koen Kooi <koen at openembedded.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 626f004..0c0cbfc 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -58,13 +58,25 @@ static struct omap_mmc_config omap3beagle_mmc_config __initdata = {
+ },
+ };
+
++static struct platform_device omap3_beagle_twl4030rtc_device = {
++ .name = "twl4030_rtc",
++ .id = -1,
++};
++
+ static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
+ { OMAP_TAG_UART, &omap3_beagle_uart_config },
+ { OMAP_TAG_MMC, &omap3beagle_mmc_config },
+ };
+
++static struct platform_device *omap3_beagle_devices[] __initdata = {
++#ifdef CONFIG_RTC_DRV_TWL4030
++ &omap3_beagle_twl4030rtc_device,
++#endif
++};
++
+ static void __init omap3_beagle_init(void)
+ {
++ platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
+ omap_board_config = omap3_beagle_config;
+ omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ omap_serial_init();
+--
+1.5.4.3
+
============================================================
--- packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff 5ce1b897fc176209672cc01f8ff7ed7597d66ef4
+++ packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff 5ce1b897fc176209672cc01f8ff7ed7597d66ef4
@@ -0,0 +1,187 @@
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0c0cbfc..c992cc7 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -63,12 +63,23 @@ static struct platform_device omap3_beagle_twl4030rtc_device = {
+ .id = -1,
+ };
+
++static struct platform_device omap3_beagle_lcd_device = {
++ .name = "omap3beagle_lcd",
++ .id = -1,
++};
++
++static struct omap_lcd_config omap3_beagle_lcd_config __initdata = {
++ .ctrl_name = "internal",
++};
++
+ static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
+ { OMAP_TAG_UART, &omap3_beagle_uart_config },
+ { OMAP_TAG_MMC, &omap3beagle_mmc_config },
++ { OMAP_TAG_LCD, &omap3_beagle_lcd_config },
+ };
+
+ static struct platform_device *omap3_beagle_devices[] __initdata = {
++ &omap3_beagle_lcd_device,
+ #ifdef CONFIG_RTC_DRV_TWL4030
+ &omap3_beagle_twl4030rtc_device,
+ #endif
+diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile
+index cad6a68..fe7ee5d 100644
+--- a/drivers/video/omap/Makefile
++++ b/drivers/video/omap/Makefile
+@@ -32,6 +32,7 @@ objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o
+ objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o
+ objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o
+ objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o
++objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o
+ objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
+
+ omapfb-objs := $(objs-yy)
+diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
+new file mode 100644
+index 0000000..99343b1
+--- /dev/null
++++ b/drivers/video/omap/lcd_omap3beagle.c
+@@ -0,0 +1,141 @@
++/*
++ * LCD panel support for the TI OMAP3 Beagle board
++ *
++ * Author: Koen Kooi <koen at openembedded.org>
++ *
++ * Derived from drivers/video/omap/lcd-omap3evm.c
++ *
++ * 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, or (at your
++ * option) any later version.
++ *
++ * 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 General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/i2c/twl4030.h>
++
++#include <asm/arch/gpio.h>
++#include <asm/arch/mux.h>
++#include <asm/arch/omapfb.h>
++#include <asm/mach-types.h>
++
++#define LCD_PANEL_ENABLE_GPIO 170
++
++#define LCD_XRES 1024
++#define LCD_YRES 768
++#define LCD_PIXCLOCK_MAX 16700 /* in pico seconds */
++#define LCD_PIXCLOCK_MIN 15200 /* in pico seconds */
++
++#define ENABLE_VDAC_DEDICATED 0x03
++#define ENABLE_VDAC_DEV_GRP 0x20
++#define ENABLE_VPLL2_DEDICATED 0x05
++#define ENABLE_VPLL2_DEV_GRP 0xE0
++
++static int omap3beagle_panel_init(struct lcd_panel *panel,
++ struct omapfb_device *fbdev)
++{
++ omap_request_gpio(LCD_PANEL_ENABLE_GPIO);
++
++ return 0;
++}
++
++static void omap3beagle_panel_cleanup(struct lcd_panel *panel)
++{
++}
++
++static int omap3beagle_panel_enable(struct lcd_panel *panel)
++{
++ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 0);
++ return 0;
++}
++
++static void omap3beagle_panel_disable(struct lcd_panel *panel)
++{
++ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1);
++}
++
++static unsigned long omap3beagle_panel_get_caps(struct lcd_panel *panel)
++{
++ return 0;
++}
++
++struct lcd_panel omap3beagle_panel = {
++ .name = "omap3beagle",
++ .config = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
++ OMAP_LCDC_INV_HSYNC,
++
++ .bpp = 16,
++ .data_lines = 18,
++ .x_res = LCD_XRES,
++ .y_res = LCD_YRES,
++ .hsw = 3, /* hsync_len (4) - 1 */
++ .hfp = 3, /* right_margin (4) - 1 */
++ .hbp = 39, /* left_margin (40) - 1 */
++ .vsw = 1, /* vsync_len (2) - 1 */
++ .vfp = 2, /* lower_margin */
++ .vbp = 7, /* upper_margin (8) - 1 */
++
++ .pixel_clock = LCD_PIXCLOCK_MAX,
++
++ .init = omap3beagle_panel_init,
++ .cleanup = omap3beagle_panel_cleanup,
++ .enable = omap3beagle_panel_enable,
++ .disable = omap3beagle_panel_disable,
++ .get_caps = omap3beagle_panel_get_caps,
++};
++
++static int omap3beagle_panel_probe(struct platform_device *pdev)
++{
++ omapfb_register_panel(&omap3beagle_panel);
++ return 0;
++}
++
++static int omap3beagle_panel_remove(struct platform_device *pdev)
++{
++ return 0;
++}
++
++static int omap3beagle_panel_suspend(struct platform_device *pdev,
++ pm_message_t mesg)
++{
++ return 0;
++}
++
++static int omap3beagle_panel_resume(struct platform_device *pdev)
++{
++ return 0;
++}
++
++struct platform_driver omap3beagle_panel_driver = {
++ .probe = omap3beagle_panel_probe,
++ .remove = omap3beagle_panel_remove,
++ .suspend = omap3beagle_panel_suspend,
++ .resume = omap3beagle_panel_resume,
++ .driver = {
++ .name = "omap3beagle_lcd",
++ .owner = THIS_MODULE,
++ },
++};
++
++static int __init omap3beagle_panel_drv_init(void)
++{
++ return platform_driver_register(&omap3beagle_panel_driver);
++}
++
++static void __exit omap3beagle_panel_drv_exit(void)
++{
++ platform_driver_unregister(&omap3beagle_panel_driver);
++}
++
++module_init(omap3beagle_panel_drv_init);
++module_exit(omap3beagle_panel_drv_exit);
============================================================
--- conf/distro/angstrom-2008.1.conf 1426e85436d24f9292dd3115736fef8e6fae4887
+++ conf/distro/angstrom-2008.1.conf 947d891b5c7e5a12292a5157cb870e8fae548110
@@ -156,6 +156,7 @@ PREFERRED_PROVIDER_libxss
PREFERRED_PROVIDER_ntp ?= "ntp"
PREFERRED_PROVIDER_hotplug = "udev"
PREFERRED_PROVIDER_libxss = "libxss"
+PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
# we don't ship gtk-directfb by default
PREFERRED_PROVIDER_gtk+ ?= "gtk+"
============================================================
--- packages/anthy/anthy/native-helpers.patch 93e91dd3974caa6b21f6b879c04ca9fbfff01f4f
+++ packages/anthy/anthy/native-helpers.patch d9523a709922e13fa5f4b41135cfa620b8538345
@@ -1,4 +1,6 @@
-Use native helpers staged by anthy-native.
+upstream: not applicable
+author: pH5
+comment: Use native helpers staged by anthy-native.
Index: anthy-9100e/mkanthydic/Makefile.am
===================================================================
============================================================
--- packages/anthy/anthy-native/native-helpers.patch 803e92a2aa725818c04c1e113c7fc9880f8a2dbf
+++ packages/anthy/anthy-native/native-helpers.patch 3f081afb06c0ce66c77b679d63d13544459bbd52
@@ -1,5 +1,7 @@
-Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic,
-calctrans and proccorpus.
+upstream: not applicable
+author: pH5
+comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic,
+comment: calctrans and proccorpus.
--- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900
+++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900
============================================================
--- packages/anthy/files/2ch_t.patch d293db149658f25d17f1a770dfa35fe3988f9049
+++ packages/anthy/files/2ch_t.patch 06950f2f1ea0b1e833aee237ad4dbe9872302f0e
@@ -1,3 +1,7 @@
+source: shamelessly stolen from debian ;-)
+purpose: add some entries particularly useful in Japanese 2channel anonymous website
+ (at least that is my understanding ;-))
+
--- anthy-5414.orig/mkanthydic/2ch.t
+++ anthy-5414/mkanthydic/2ch.t
@@ -0,0 +1,5055 @@
============================================================
--- packages/anthy/files/not_build_elc.patch b768a709c32eef8a20d17741e1121863b2d538be
+++ packages/anthy/files/not_build_elc.patch f0858177beb7a0ed9464888a8cd3534399a03f63
@@ -1,3 +1,6 @@
+upstream: not applicable
+source: stolen from debian
+
diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am
--- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900
+++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900
============================================================
--- packages/linux/linux-omap2_git.bb 51983441aa46ff6fdedad22db5955685518fa707
+++ packages/linux/linux-omap2_git.bb 318d9950053ee9a54e1c0a7235e17c2f6f809dd8
@@ -2,10 +2,10 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "1abd28c86f1771d4f31fc73e6ef83fedaa8f4ec2"
+SRCREV = "cb170dcdce58de20b045ae964a4ccfc29aad1647"
PV = "2.6.25+2.6.26-rc1+git${SRCREV}"
-PR = "r9"
+PR = "r10"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -14,6 +14,8 @@ SRC_URI_append_beagleboard = " file://no
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://usb-timout.patch;patch=1 \
file://l2-cache.patch;patch=1 \
+ file://0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch;patch=1 \
+# file://beagle-dvi-first-try.diff;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
============================================================
--- packages/netperf/netperf_2.4.2.bb 04ccea09108ac141e06977b7b5545f91cd5901f5
+++ packages/netperf/netperf_2.4.4.bb 25eec6c603cb3b56d9cffcfd1f1e7ee0c27695b5
@@ -3,7 +3,7 @@ LICENSE = "netperf"
HOMEPAGE = "http://www.netperf.org/"
LICENSE = "netperf"
-SRC_URI="${DEBIAN_MIRROR}/non-free/n/netperf/netperf_${PV}.orig.tar.gz \
+SRC_URI="ftp://ftp.netperf.org/netperf/netperf-${PV}.tar.bz2 \
file://init"
inherit update-rc.d autotools
@@ -12,11 +12,6 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6"
CFLAGS_append = " -DDO_UNIX -DDO_IPV6"
-do_configure_prepend() {
- install -m 0644 ${S}/m4/m4/m4/*.m4 ${S}/m4/
- install -m 0644 ${S}/src/missing/m4/*.m4 ${S}/m4/
-}
-
do_install() {
install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d
install -m 4755 src/netperf ${D}${bindir}
More information about the Openembedded-commits
mailing list