[oe-commits] org.oe.dev merge of '0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2'

pfalcon commit openembedded-commits at lists.openembedded.org
Wed Feb 13 10:07:43 UTC 2008 

merge of '0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2'
     and '16ce3628a1d3a9a9700cc501a3cb77666ed8c4a0'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f26d3059129388297f1542283ce17d100f8c8acc
ViewMTN: http://monotone.openembedded.org/revision/info/f26d3059129388297f1542283ce17d100f8c8acc
Files:
1
packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
packages/gpe-login/files/lock-on-supend.patch
packages/gpe-login/files/size-autolock-properly.patch
packages/keylaunch/files/unbreak-keyevents.patch
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/libpcap/libpcap_0.9.6.bb
packages/libpcap/libpcap.inc
packages/anki
packages/anki/files
packages/anki/anki.inc
packages/anki/anki_0.4.3.bb
packages/anki/files/no-need-for-pyqt-at-buildtime.patch
packages/anki/libanki_0.4.3.bb
packages/libpcap/libpcap_0.9.3.bb
packages/libpcap/libpcap_0.9.5.bb
packages/rxtx/rxtx_2.1-7r2.bb
packages/swt/swt-gtk.inc
Diffs:

#
# mt diff -r0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2 -rf26d3059129388297f1542283ce17d100f8c8acc
#
# 
# 
# patch "packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch"
#  from [6fa3a2c1e0cb701a608210a0843aabcb82734d4d]
#    to [a5c1496221900c044e6c6483458094b98034ba9a]
# 
# patch "packages/gpe-login/files/lock-on-supend.patch"
#  from [20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9]
#    to [5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8]
# 
# patch "packages/gpe-login/files/size-autolock-properly.patch"
#  from [63db2b126d2eaaa270c82ccc859e7c367b7912e5]
#    to [c1a466579b9fd2ebfe11028e600aeeb50995c3c0]
# 
# patch "packages/keylaunch/files/unbreak-keyevents.patch"
#  from [2adb5ed37a6c319f1de6d797029f20c67ba92bb6]
#    to [9f39923446520b5769f8d37beadc51063c9d2831]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
#  from [a204b75bf54f6f1f8a6ef7240e5e8b1f004a4b0a]
#    to [f8e3a8db216aee6aca3ccc73509629eabfe4b7af]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
#  from [23ca782d6f472d1e761a6093f95804a8b9791c01]
#    to [11e1b83cd36052b91b2a7fb0d2c83bea4d94ac60]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
#  from [f658be1e3ac73663c8b97072413fc3195361acc3]
#    to [dafb4310f38feb21519762495cd6aab1cbd450aa]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
#  from [f2da0d1b2981cc28521553858baffe9be357b7fb]
#    to [828cdf2285631389ea3f3be66db4d0f2be3fad16]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
#  from [ac242fcf2177317324b66596e9141fedd42efd6b]
#    to [60595eee63f81963ed4f58ed96707082b9a5a226]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
#  from [3c0488eb28e105d6462adbb24b45254313e68d9a]
#    to [008e963413f842d5b6ebdff5674209597dc5b0fc]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
#  from [5036d3297766c21733bc7cb3dd0e9041372fc268]
#    to [7c5aa3bf26025ae39441a8014c52d17d8fe5f75d]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
#  from [46085effa51a509b4586652bc3552e738b09cae2]
#    to [817ece80142e95d6b77ee2e7fc9f4ca3456d87c3]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
#  from [eea8af66869932f5258f41d195452406fa3fccee]
#    to [4311ca7f9215517f300060255b5f8f2e4c5b06ff]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
#  from [1608a8a900fbfe373d8c3adf15bbc5ebc10e5705]
#    to [881be5d663f4f599897be2db56d052b7d071e432]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
#  from [5855a7efbbc40ce36dc3168815f963ecbd0b2775]
#    to [348429aa40689c2db4038e669221a60b28d6a355]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
#  from [3b465d5a2c441d5d0be82a4ac2404697d67a5389]
#    to [9928a3e38a5be9c3291ae2100ab72fa2fa7d1fbc]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
#  from [5a4edbc07215c7454b6cc3cf1b11185fa10d581c]
#    to [291b18feb43e010485b57fa4af6c3bd366a959fa]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
#  from [a00ad847e0ff51df836937b16d36a14c999251a9]
#    to [6983192573323e3ce27a9c5a0403dbdda1bc7bc6]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
#  from [d2dfa8c48ea3365f189acbdd681508f85bc577e6]
#    to [0b4da127c1a0aaa95f65ae63254bf4db15c64cd2]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
#  from [2c256ea7858368490b3b310d708708762ddfad00]
#    to [d2ac56e548d71b2a58c9d52bb2174505bc299774]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
#  from [2233fbc1493eeb6144d4fa69a39147b8e32c5b8e]
#    to [3979a757a6390b7878c8f110879c16053c99d77f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
#  from [709959ce6dad6b087a4ed4ccdaf25c883c0e17e1]
#    to [5badee1f88e843603429234790dff51d8d5e2fdc]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
#  from [f9a95661b3adc248bbc695111f87b4ea71d22880]
#    to [61d25537df7d34eb32c61f62053e455790109b4e]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
#  from [cc9b0a83d5a309443ce52868a64d2ef8daeaa4fa]
#    to [10b01ced26df5bdd5fed1fffedbef1f3e7cb8dba]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
#  from [e21a60a2a4216f2069bdef53ae6340426992c992]
#    to [e405b46c56ca807e9736efbf8e745c5be2974f32]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
#  from [01b426c233dd9312f97e9dc54d118b7dd30c98ef]
#    to [3d07b1bc59ea440df124fada8ef0b959a8c30a8e]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
#  from [ce060a769fba7b737d9eb6778613d8e8c0d09612]
#    to [1a4579f3546b0699ab09315892303e48f538990e]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
#  from [79587145b997777e6efca24a5fd56b92cf4154f4]
#    to [180611e63474da710360bf52fc7bfac32bafcb34]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [6ad48d1f06a1ebcf04856c1d9d9952a9c39fc161]
#    to [ab9f51a943d6aa29ec5636df8430e32283831244]
# 
============================================================
--- packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch	6fa3a2c1e0cb701a608210a0843aabcb82734d4d
+++ packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch	a5c1496221900c044e6c6483458094b98034ba9a
@@ -1,3 +1,5 @@
+upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=124
+
 diff -r 976c01632fea gpe-login.keylaunchrc
 --- a/gpe-login.keylaunchrc	Sun Nov 25 22:39:23 2007 +0200
 +++ b/gpe-login.keylaunchrc	Mon Nov 26 01:12:14 2007 +0200
============================================================
--- packages/gpe-login/files/lock-on-supend.patch	20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9
+++ packages/gpe-login/files/lock-on-supend.patch	5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8
@@ -1,3 +1,5 @@
+upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=125
+
 Lock screen when device goes to suspend, not after some time has passed
 since resume and they stole your data from the unprotected screen.
 
============================================================
--- packages/gpe-login/files/size-autolock-properly.patch	63db2b126d2eaaa270c82ccc859e7c367b7912e5
+++ packages/gpe-login/files/size-autolock-properly.patch	c1a466579b9fd2ebfe11028e600aeeb50995c3c0
@@ -1,3 +1,5 @@
+upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=152
+
 # HG changeset patch
 # User "Paul Sokolovsky <pfalcon at users.sourceforge.net>"
 # Date 1196345352 -7200
============================================================
--- packages/keylaunch/files/unbreak-keyevents.patch	2adb5ed37a6c319f1de6d797029f20c67ba92bb6
+++ packages/keylaunch/files/unbreak-keyevents.patch	9f39923446520b5769f8d37beadc51063c9d2831
@@ -1,3 +1,5 @@
+upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=123
+
 # HG changeset patch
 # User "Paul Sokolovsky <pfalcon at users.sourceforge.net>"
 # Date 1196027570 -7200
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig	a204b75bf54f6f1f8a6ef7240e5e8b1f004a4b0a
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig	f8e3a8db216aee6aca3ccc73509629eabfe4b7af
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:18 2008
+# Tue Feb 12 22:00:35 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig	23ca782d6f472d1e761a6093f95804a8b9791c01
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig	11e1b83cd36052b91b2a7fb0d2c83bea4d94ac60
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:19 2008
+# Tue Feb 12 22:00:36 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig	f658be1e3ac73663c8b97072413fc3195361acc3
+++ packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig	dafb4310f38feb21519762495cd6aab1cbd450aa
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:19 2008
+# Tue Feb 12 22:00:37 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig	f2da0d1b2981cc28521553858baffe9be357b7fb
+++ packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig	828cdf2285631389ea3f3be66db4d0f2be3fad16
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:20 2008
+# Tue Feb 12 22:00:37 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -95,14 +95,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig	ac242fcf2177317324b66596e9141fedd42efd6b
+++ packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig	60595eee63f81963ed4f58ed96707082b9a5a226
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:20 2008
+# Tue Feb 12 22:00:38 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig	3c0488eb28e105d6462adbb24b45254313e68d9a
+++ packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig	008e963413f842d5b6ebdff5674209597dc5b0fc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:21 2008
+# Tue Feb 12 22:00:39 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig	5036d3297766c21733bc7cb3dd0e9041372fc268
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig	7c5aa3bf26025ae39441a8014c52d17d8fe5f75d
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:21 2008
+# Tue Feb 12 22:00:39 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig	46085effa51a509b4586652bc3552e738b09cae2
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig	817ece80142e95d6b77ee2e7fc9f4ca3456d87c3
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:21 2008
+# Tue Feb 12 22:00:40 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig	eea8af66869932f5258f41d195452406fa3fccee
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig	4311ca7f9215517f300060255b5f8f2e4c5b06ff
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:22 2008
+# Tue Feb 12 22:00:41 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
 
 #
 # System Type
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig	1608a8a900fbfe373d8c3adf15bbc5ebc10e5705
+++ packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig	881be5d663f4f599897be2db56d052b7d071e432
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Sun Feb 10 21:02:22 2008
+# Tue Feb 12 22:00:42 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,14 +96,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONF%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r16ce3628a1d3a9a9700cc501a3cb77666ed8c4a0 -rf26d3059129388297f1542283ce17d100f8c8acc
#
# 
# 
# rename "packages/libpcap/libpcap_0.9.6.bb"
#     to "packages/libpcap/libpcap.inc"
# 
# add_dir "packages/anki"
# 
# add_dir "packages/anki/files"
# 
# add_file "packages/anki/anki.inc"
#  content [b1e32d660c7ade15202f05cc0b592a34d5a7928a]
# 
# add_file "packages/anki/anki_0.4.3.bb"
#  content [bbc71d5b420649c30e0f4e7ca986a9f3516be13e]
# 
# add_file "packages/anki/files/no-need-for-pyqt-at-buildtime.patch"
#  content [6571cb08a09777569df3da024d4527228b24c5e9]
# 
# add_file "packages/anki/libanki_0.4.3.bb"
#  content [bac0bb159ca340f60033b4cf6e74b6578550e281]
# 
# add_file "packages/libpcap/libpcap_0.9.6.bb"
#  content [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
# 
# patch "packages/libpcap/libpcap.inc"
#  from [722b9181c176704a1a8b52dcb63e595991e439fc]
#    to [b3fa7b30b55bc1b58d98951e6af205002321959e]
# 
# patch "packages/libpcap/libpcap_0.9.3.bb"
#  from [763b8478be56b0a412ec922f2a53da47b3cc4442]
#    to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
# 
# patch "packages/libpcap/libpcap_0.9.5.bb"
#  from [763b8478be56b0a412ec922f2a53da47b3cc4442]
#    to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
# 
# patch "packages/rxtx/rxtx_2.1-7r2.bb"
#  from [261fb1dbbffc4e2294a5a6838e4defa40431abd5]
#    to [feb6090d9eff9d3f7bfe883a3e6ac6a35893e0a5]
# 
# patch "packages/swt/swt-gtk.inc"
#  from [bcadfa700e7fc0872ab1d3a38e456f41e5ebefed]
#    to [63792d964f1f171ba6f802dc502978513888f9d1]
# 
============================================================
--- packages/anki/anki.inc	b1e32d660c7ade15202f05cc0b592a34d5a7928a
+++ packages/anki/anki.inc	b1e32d660c7ade15202f05cc0b592a34d5a7928a
@@ -0,0 +1,15 @@
+DESCRIPTION = "Anki is a program designed to help you remember facts \
+(such as words and phrases in a foreign language) \
+as easily, quickly and efficiently as possible"
+HOMEPAGE = "http://ichi2.net/anki/"
+AUTHOR = "Damien Elmes"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+RDEPENDS = "python-pyqt"
+RRECOMMENDS = "kakasi virtual/japanese-font"
+
+SRC_URI = "http://ichi2.net/anki/download/anki-${PV}.tgz"
+
+inherit setuptools
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/anki/anki_0.4.3.bb	bbc71d5b420649c30e0f4e7ca986a9f3516be13e
+++ packages/anki/anki_0.4.3.bb	bbc71d5b420649c30e0f4e7ca986a9f3516be13e
@@ -0,0 +1,9 @@
+require anki.inc
+
+RDEPENDS += "libanki"
+PR = "r0"
+
+export PV
+
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1"
+S = "${WORKDIR}/anki-${PV}"
============================================================
--- packages/anki/files/no-need-for-pyqt-at-buildtime.patch	6571cb08a09777569df3da024d4527228b24c5e9
+++ packages/anki/files/no-need-for-pyqt-at-buildtime.patch	6571cb08a09777569df3da024d4527228b24c5e9
@@ -0,0 +1,28 @@
+#
+# (C) Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+#
+Index: anki-0.4.3/setup.py
+===================================================================
+--- anki-0.4.3.orig/setup.py	2008-02-12 19:17:56.000000000 +0000
++++ anki-0.4.3/setup.py	2008-02-12 19:19:29.000000000 +0000
+@@ -3,10 +3,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+ 
+-import ankiqt
+-
+ setup(name='ankiqt',
+-      version=ankiqt.appVersion,
++      version=os.environ["PV"],
+       description='An intelligent spaced-repetition memory training program',
+       long_description="",
+       # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+@@ -24,7 +22,7 @@
+       license='GPLv2',
+       packages=find_packages(),
+       include_package_data=True,
+-      install_requires = 'anki >= ' + ankiqt.appVersion,
++      install_requires = 'anki >= ' + os.environ["PV"],
+       zip_safe=False,
+       package_data={'ankiqt':
+                     ['locale/*/*/*']},
============================================================
--- packages/anki/libanki_0.4.3.bb	bac0bb159ca340f60033b4cf6e74b6578550e281
+++ packages/anki/libanki_0.4.3.bb	bac0bb159ca340f60033b4cf6e74b6578550e281
@@ -0,0 +1,5 @@
+require anki.inc
+
+PR = "r0"
+
+S = "${WORKDIR}/anki-${PV}/libanki"
============================================================
--- packages/libpcap/libpcap_0.9.6.bb	750ff592061ab45c7cc4a1cc20407fd1688a8e6f
+++ packages/libpcap/libpcap_0.9.6.bb	750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -0,0 +1,3 @@
+require libpcap.inc
+
+PR = "r2"
============================================================
--- packages/libpcap/libpcap_0.9.6.bb	722b9181c176704a1a8b52dcb63e595991e439fc
+++ packages/libpcap/libpcap.inc	b3fa7b30b55bc1b58d98951e6af205002321959e
@@ -1,12 +1,9 @@
-# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
 DESCRIPTION = "Network Packet Capture Library"
 HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
 SECTION = "libs/network"
-PR = "r1"
+LICENSE = "BSD"
+DEPENDS = "flex-native bison-native"
 
-
 # Don't forget to edit shared.patch to have the correct version number inside
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
            file://shared.patch;patch=1"
============================================================
--- packages/libpcap/libpcap_0.9.3.bb	763b8478be56b0a412ec922f2a53da47b3cc4442
+++ packages/libpcap/libpcap_0.9.3.bb	750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -1,32 +1,3 @@
-DESCRIPTION = "Network Packet Capture Library"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "libs/network"
-PR = "r1"
+require libpcap.inc
 
+PR = "r2"
-SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
-           file://shared.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-pcap=linux"
-
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
-do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cat aclocal.m4 > acinclude.m4
-	fi
-}
-
-do_stage () {
-	install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
-	install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
-	install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h
-	oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/net
-	ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h
-	install -m 0644 acinclude.m4 ${STAGING_DATADIR}/aclocal/libpcap.m4
-}
============================================================
--- packages/libpcap/libpcap_0.9.5.bb	763b8478be56b0a412ec922f2a53da47b3cc4442
+++ packages/libpcap/libpcap_0.9.5.bb	750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -1,32 +1,3 @@
-DESCRIPTION = "Network Packet Capture Library"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "libs/network"
-PR = "r1"
+require libpcap.inc
 
+PR = "r2"
-SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
-           file://shared.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-pcap=linux"
-
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
-do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cat aclocal.m4 > acinclude.m4
-	fi
-}
-
-do_stage () {
-	install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
-	install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
-	install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h
-	oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/net
-	ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h
-	install -m 0644 acinclude.m4 ${STAGING_DATADIR}/aclocal/libpcap.m4
-}
============================================================
--- packages/rxtx/rxtx_2.1-7r2.bb	261fb1dbbffc4e2294a5a6838e4defa40431abd5
+++ packages/rxtx/rxtx_2.1-7r2.bb	feb6090d9eff9d3f7bfe883a3e6ac6a35893e0a5
@@ -1,8 +1,12 @@ HOMEPAGE = "http://rxtx.org"
 DESCRIPTION = "RXTX provides serial and parallel communication for Java applications"
 LICENSE = "LGPL"
 SECTION = "libs"
 HOMEPAGE = "http://rxtx.org"
 
+PR = "r1"
+
+DEPENDS = "classpath classpath-native virtual/javac-native"
+
 inherit autotools java-library
 
 SRC_URI = "\
@@ -10,6 +14,15 @@ SRC_URI = "\
     file://rxtx-fixes-from-debian.patch;patch=1 \
     "
 
+do_compile() {
+  # Whatever configure detected it is completely unusable. So we override heavily.
+  oe_runmake \
+    JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" \
+    JAR=gjar \
+    JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" \
+    JAVAINCLUDEDIR=${STAGING_INCDIR}/classpath
+}
+
 do_install() {
   install -d ${D}/${libdir_jni}
   install -d ${D}/${datadir_java}
============================================================
--- packages/swt/swt-gtk.inc	bcadfa700e7fc0872ab1d3a38e456f41e5ebefed
+++ packages/swt/swt-gtk.inc	63792d964f1f171ba6f802dc502978513888f9d1
@@ -1,9 +1,9 @@ inherit java-library
 DESCRIPTION = "SWT is an open source widget toolkit for Java designed to provide efficient, portable access to the user-interface facilities"
 LICENSE = "CPL MPL LGPL"
 
 inherit java-library
 
-DEPENDS = "cairo gtk+ atk libxtst"
+DEPENDS = "classpath-native cairo gtk+ atk libxtst"
 
 S = "${WORKDIR}/swt-source"
 
@@ -36,7 +36,6 @@ do_install() {
   oe_jarinstall swt.jar
   oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar
 
-  install -d ${D}${libdir_jni}
   oe_libinstall -so libswt-atk-gtk-${SWTVERSION} ${D}/${libdir_jni}
   oe_libinstall -so libswt-cairo-gtk-${SWTVERSION} ${D}/${libdir_jni}  
   oe_libinstall -so libswt-pi-gtk-${SWTVERSION} ${D}/${libdir_jni}

More information about the Openembedded-commits mailing list