[oe-commits] org.oe.dev merge of '08302dde2b0020a01fd78d658d7aa2d736941c62'
oe commit
openembedded-commits at lists.openembedded.org
Sun Jan 27 17:27:57 UTC 2008
merge of '08302dde2b0020a01fd78d658d7aa2d736941c62'
and 'f82b7629fd983d380c1a4abf1ae7928c3b40216a'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 56cbeead11814c3b967afd53829a76771597db07
ViewMTN: http://monotone.openembedded.org/revision/info/56cbeead11814c3b967afd53829a76771597db07
Files:
1
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/opie-taskbar/opie-taskbar-images.inc
packages/gnuplot/gnuplot-4.2.0
packages/gnuplot/files/debian-separate-x11-package.patch
packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch
packages/gnuplot/files/matrix.patch
packages/gnuplot/gnuplot-4.0.0/matrix.patch
packages/gnuplot/files/subdirs.patch
packages/gnuplot/gnuplot-4.0.0/subdirs.patch
packages/gnuplot/files/term.patch
packages/gnuplot/gnuplot-4.0.0/term.patch
packages/gnuplot/gnuplot-4.2.0/subdirs.patch
packages/gnuplot/gnuplot-4.2.0/term.patch
packages/gnuplot/gnuplot_4.2.0.bb
packages/gnuplot/gnuplot_4.2.2.bb
packages/gnuplot/gnuplot-4.0.0
packages/gnuplot/gnuplot_cvs.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:
#
# mt diff -r08302dde2b0020a01fd78d658d7aa2d736941c62 -r56cbeead11814c3b967afd53829a76771597db07
#
#
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
# from [3814ee8cbc809c84b046aac1bf952ef5981100f9]
# to [353d424071722bb08a5d44d17014678b2b596e85]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
# from [363f5d30de5942a15360c92401daac81476b245c]
# to [494f89ed824f98ebcb49e070df0a66ac57e5aee4]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
# from [81d89fda130401f230126767a667fee7d46b9da1]
# to [c0a7a49ebd54096d5fbabb741ee212f1271ae124]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
# from [21f7cfe001a47773dedbfb5e12d829b2371a17da]
# to [5ef862812a62b7f8d26c16f5dd5acba53ee0ff47]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
# from [94eec496420a0cfadc69b160dd3b320fe8402d49]
# to [e203f8ae8e1c34479b547dfd17f1115e332bd340]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
# from [126f77daee944356b406684f1bb65c39a8deb30a]
# to [6b985231206df1f496690f920fcf64892cbf2721]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
# from [f46899777982ca8945b5ad74dc7fcd0b3f90ac7a]
# to [8ccc9de12d1a6067d11f10d96fdbf242cd3cb896]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
# from [995ef9c8b52a910c0651b04d5579759f77d5de5a]
# to [c31efd2ad93b5cfca15b4ab5bb8f403d644b95f7]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
# from [89b5aef1bee00e4cf64fc4793d2aa26b2d8b5e5d]
# to [4b839eef26f99a3db586ea9a419e31bc9df18fd8]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
# from [8acc45d65c979ab9f4e774809f6714e7a922ad8f]
# to [f25d551e627afef90df79f2f51a917674373d50e]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
# from [ae562041a5ba05ae87cb673887ec8ccf0b5b2c7c]
# to [e21e7acdee39dd400c3ccd56b82795cd667d4f41]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
# from [d31b1427664a2bb6219c06d9a9d4de2298699a59]
# to [6f5c2a4a4c0eac599311028634a7e32d05df6381]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
# from [21785b4e87a83053dfea6925cf36fff679b2b8fb]
# to [e9f69b1579f74309e88fa746ccdb32895c87d844]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
# from [59b1747192806209a8f444f2877df63c207453e1]
# to [3186af2c181339291a5299b8e91d8164c1d0f15d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
# from [8973ad64b45d538ad48455567e20a86df9a3d3e6]
# to [c14fa31c0f48042cca0996543959488e48014aeb]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
# from [5eab7da9cf65bb25758144aff0cf182f7e63d0b7]
# to [be7a48b29966bc7e8aa74dc63543153544c293ef]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
# from [b9088320c599b3c9c3403ceb124fc406d0648ad2]
# to [66f1920fe7298cf26f134fbec55b8f5d1652cd02]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
# from [6e0845be4704f964b863b9bd4de81f289a4fa402]
# to [9f9726fe9a46176a647c095878a5a50b98883580]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
# from [328857f3fba9893a238d5be4eb28cfe804318c00]
# to [1d635e7cbdca9ce40886f71144f183c69681fda5]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
# from [2db6e1e10e6476d09a2b417301588b06c409c0a1]
# to [7b995bbf12d4ae1d5ba8d7b969fe701417092000]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
# from [040564d2f3191c47dc6a891a28068de16586c0d3]
# to [b5d25cafdb1c6c1e8df89dd0b9aab9e190cfed79]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
# from [e31deee951b0002cd2e8c87e629b2c11b88f4dbb]
# to [2458e0225f0792debfd8afc62e9b7876565003d9]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
# from [c0ba90f1012e392d9d06aa8d4112ec1ce5d5cab1]
# to [5c5e4a088c687c764e394a638271d522d8924eff]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
# from [099d541ddb6b7b151b06d74947f03fc94fb22fae]
# to [da8ce239862ce60f7599998d34812bb7d56e26b0]
#
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
# from [48afd0705ba3cf2efdc1b4a6186d371cee28cfd9]
# to [078509952dd4672e806f529f7547d793f8efa1e4]
#
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig 3814ee8cbc809c84b046aac1bf952ef5981100f9
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig 353d424071722bb08a5d44d17014678b2b596e85
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:31 2007
+# Sun Jan 27 01:32:39 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -534,8 +534,8 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig 363f5d30de5942a15360c92401daac81476b245c
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig 494f89ed824f98ebcb49e070df0a66ac57e5aee4
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:31 2007
+# Sun Jan 27 01:32:40 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -527,8 +527,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig 81d89fda130401f230126767a667fee7d46b9da1
+++ packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig c0a7a49ebd54096d5fbabb741ee212f1271ae124
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:32 2007
+# Sun Jan 27 01:32:40 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -518,8 +518,8 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig 21f7cfe001a47773dedbfb5e12d829b2371a17da
+++ packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig 5ef862812a62b7f8d26c16f5dd5acba53ee0ff47
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:32 2007
+# Sun Jan 27 01:32:41 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -507,8 +507,8 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig 94eec496420a0cfadc69b160dd3b320fe8402d49
+++ packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig e203f8ae8e1c34479b547dfd17f1115e332bd340
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:32 2007
+# Sun Jan 27 01:32:41 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -516,8 +516,8 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig 126f77daee944356b406684f1bb65c39a8deb30a
+++ packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig 6b985231206df1f496690f920fcf64892cbf2721
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:33 2007
+# Sun Jan 27 01:32:42 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -604,8 +604,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
@@ -834,14 +835,14 @@ CONFIG_NET_PCMCIA=y
# PCMCIA network device support
#
CONFIG_NET_PCMCIA=y
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-# CONFIG_PCMCIA_PCNET is not set
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
#
# Wan interfaces
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig f46899777982ca8945b5ad74dc7fcd0b3f90ac7a
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig 8ccc9de12d1a6067d11f10d96fdbf242cd3cb896
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:33 2007
+# Sun Jan 27 01:32:42 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -498,8 +498,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig 995ef9c8b52a910c0651b04d5579759f77d5de5a
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig c31efd2ad93b5cfca15b4ab5bb8f403d644b95f7
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:34 2007
+# Sun Jan 27 01:32:42 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -496,8 +496,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig 89b5aef1bee00e4cf64fc4793d2aa26b2d8b5e5d
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig 4b839eef26f99a3db586ea9a419e31bc9df18fd8
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:34 2007
+# Sun Jan 27 01:32:43 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -534,8 +534,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig 8acc45d65c979ab9f4e774809f6714e7a922ad8f
+++ packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig f25d551e627afef90df79f2f51a917674373d50e
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:34 2007
+# Sun Jan 27 01:32:43 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -602,8 +602,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig ae562041a5ba05ae87cb673887ec8ccf0b5b2c7c
+++ packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig e21e7acdee39dd400c3ccd56b82795cd667d4f41
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Wed Dec 26 16:55:35 2007
+# Sun Jan 27 01:32:44 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -164,6 +164,7 @@ CONFIG_IPAQ_H5400_BL=y
CONFIG_IPAQ_H5400_BT=m
CONFIG_IPAQ_H5400_LCD=y
CONFIG_IPAQ_H5400_BL=y
+CONFIG_IPAQ_H5400_WIFI=m
# CONFIG_MACH_HIMALAYA is not set
# CONFIG_MACH_HTCUNIVERSAL is not set
# CONFIG_MACH_HTCALPINE is not set
@@ -524,7 +525,10 @@ CONFIG_IRTTY_SIR=m
#
# FIR device drivers
#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
CONFIG_PXA_FICP=m
+# CONFIG_MCS_FIR is not set
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
@@ -538,9 +542,19 @@ CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
+# CONFIG_BT_HCIUSB is not set
# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
# CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
+CONFIG_WIRELESS_EXT=y
#
# Device Drivers
@@ -577,8 +591,9 @@ CONFIG_MTD_CHAR=m
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
@@ -674,6 +689,7 @@ CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -746,9 +762,18 @@ CONFIG_TUN=m
#
# Wireless LAN (non-hamradio)
#
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_ACX is not set
+
+#
# Wan interfaces
#
# CONFIG_WAN is not set
@@ -933,6 +958,7 @@ CONFIG_W1=y
#
# 1-wire Bus Masters
#
+# CONFIG_W1_MASTER_DS2490 is not set
# CONFIG_W1_MASTER_DS2482 is not set
CONFIG_W1_MASTER_DS1WM=y
@@ -1037,6 +1063,7 @@ CONFIG_LEDS_TRIGGER_SHARED=y
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
#
# Graphics support
@@ -1130,6 +1157,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_RECON is not set
#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
# SoC audio support
#
CONFIG_SND_SOC=m
@@ -1194,13 +1226,121 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf82b7629fd983d380c1a4abf1ae7928c3b40216a -r56cbeead11814c3b967afd53829a76771597db07
#
#
#
# delete "packages/gnuplot/gnuplot-4.2.0"
#
# rename "packages/gnuplot/files/debian-separate-x11-package.patch"
# to "packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch"
#
# rename "packages/gnuplot/files/matrix.patch"
# to "packages/gnuplot/gnuplot-4.0.0/matrix.patch"
#
# rename "packages/gnuplot/files/subdirs.patch"
# to "packages/gnuplot/gnuplot-4.0.0/subdirs.patch"
#
# rename "packages/gnuplot/files/term.patch"
# to "packages/gnuplot/gnuplot-4.0.0/term.patch"
#
# rename "packages/gnuplot/gnuplot-4.2.0/subdirs.patch"
# to "packages/gnuplot/files/subdirs.patch"
#
# rename "packages/gnuplot/gnuplot-4.2.0/term.patch"
# to "packages/gnuplot/files/term.patch"
#
# rename "packages/gnuplot/gnuplot_4.2.0.bb"
# to "packages/gnuplot/gnuplot_4.2.2.bb"
#
# add_dir "packages/gnuplot/gnuplot-4.0.0"
#
# add_file "packages/gnuplot/gnuplot_cvs.bb"
# content [fc07214c5ba39477584bd102d53aa602c87ab77c]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [cb176be489c8cc84cc322cac2f96f85758f594fe]
# to [c768b9d1c19df1d7e887abfa05c239ccf9218529]
#
# patch "packages/gnuplot/gnuplot_4.2.2.bb"
# from [03f32275753ca6d0330c16d5e953d3076ae0a61c]
# to [2735c3e3ef088dab319af681d7d090294056717c]
#
============================================================
--- packages/gnuplot/gnuplot_cvs.bb fc07214c5ba39477584bd102d53aa602c87ab77c
+++ packages/gnuplot/gnuplot_cvs.bb fc07214c5ba39477584bd102d53aa602c87ab77c
@@ -0,0 +1,17 @@
+require gnuplot.inc
+
+PV = "4.3.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \
+ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+ file://subdirs.patch;patch=1 \
+ file://term.patch;patch=1 \
+ file://gnuplot.desktop \
+ file://gnuplot.png"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+ ./prepare
+}
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc cb176be489c8cc84cc322cac2f96f85758f594fe
+++ conf/distro/include/angstrom-2007-preferred-versions.inc c768b9d1c19df1d7e887abfa05c239ccf9218529
@@ -509,7 +509,7 @@ PREFERRED_VERSION_gnupg ?= "1.4.2.2"
PREFERRED_VERSION_gnuchess ?= "5.05"
PREFERRED_VERSION_gnumeric ?= "1.6.3"
PREFERRED_VERSION_gnupg ?= "1.4.2.2"
-PREFERRED_VERSION_gnuplot ?= "4.2.0"
+PREFERRED_VERSION_gnuplot ?= "4.2.2"
PREFERRED_VERSION_gnuradio ?= "3.0.4"
PREFERRED_VERSION_gnutls ?= "1.6.3"
PREFERRED_VERSION_gob2 ?= "2.0.14"
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb 03f32275753ca6d0330c16d5e953d3076ae0a61c
+++ packages/gnuplot/gnuplot_4.2.2.bb 2735c3e3ef088dab319af681d7d090294056717c
@@ -1,6 +1,6 @@ require gnuplot.inc
require gnuplot.inc
-PR = "r1"
+PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
More information about the Openembedded-commits
mailing list