[oe-commits] org.oe.dev merge of '471c60fc447650d2ed0a31e10815380ac513ee4a'

mickeyl commit oe at amethyst.openembedded.net
Thu Jul 17 19:09:56 UTC 2008


merge of '471c60fc447650d2ed0a31e10815380ac513ee4a'
     and '61c6959ed326b7433e68378046533cb8fa3b76dd'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7fb19ff722fe0f3e88a9d45230442af71ee72960
ViewMTN: http://monotone.openembedded.org/revision/info/7fb19ff722fe0f3e88a9d45230442af71ee72960
Files:
1
packages/python/python-cython-native_0.9.6.9.bb
packages/python/python-cython-native_0.9.8.bb
packages/python/python-cython_0.9.6.9.bb
packages/python/python-cython_0.9.8.bb
packages/python/python-pyrex-native_0.9.5.1a.bb
packages/python/python-pyrex-native_0.9.8.4.bb
packages/python/python-pyrex_0.9.5.1a.bb
packages/python/python-pyrex_0.9.8.4.bb
packages/images/fso-image.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r471c60fc447650d2ed0a31e10815380ac513ee4a -r7fb19ff722fe0f3e88a9d45230442af71ee72960
#
#
#
# rename "packages/python/python-cython-native_0.9.6.9.bb"
#     to "packages/python/python-cython-native_0.9.8.bb"
# 
# rename "packages/python/python-cython_0.9.6.9.bb"
#     to "packages/python/python-cython_0.9.8.bb"
# 
# rename "packages/python/python-pyrex-native_0.9.5.1a.bb"
#     to "packages/python/python-pyrex-native_0.9.8.4.bb"
# 
# rename "packages/python/python-pyrex_0.9.5.1a.bb"
#     to "packages/python/python-pyrex_0.9.8.4.bb"
# 
# patch "packages/images/fso-image.bb"
#  from [dce081cba6576f35793e776422e81e47ea57d62b]
#    to [ed48a221328cfc4e99587341b1139811a37425d9]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
#  from [57c2c0d28ca9963ed016ec055d47e1d2c288dbb4]
#    to [61306895c6b0bae840d63008e1d83ad6488255cb]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [eb078f8af706ba7a440d3995a28430d718d0a006]
#    to [e6f17b9cec8b3cfa0d93d2fd47b21c197a3b7d7a]
# 
# patch "packages/python/python-cython_0.9.8.bb"
#  from [0a9a75ec77d6190dc80054f14140c6d397f4f97c]
#    to [0ab6745711c0f5ec95353a0d374403fa169ef687]
#
============================================================
--- packages/images/fso-image.bb	dce081cba6576f35793e776422e81e47ea57d62b
+++ packages/images/fso-image.bb	ed48a221328cfc4e99587341b1139811a37425d9
@@ -39,6 +39,7 @@ TOOLS_INSTALL = "\
 TOOLS_INSTALL = "\
 #  bash \
   htop \
+  mickeydbus \
   mickeyterm \
   nano \
   powertop \
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig	57c2c0d28ca9963ed016ec055d47e1d2c288dbb4
+++ packages/linux/linux-omap2-git/beagleboard/defconfig	61306895c6b0bae840d63008e1d83ad6488255cb
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc8-omap1
-# Sun Jul  6 15:22:47 2008
+# Linux kernel version: 2.6.26-rc9-omap1
+# Tue Jul  8 15:36:02 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1037,6 +1037,7 @@ CONFIG_MEDIA_TUNER_TDA8290=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
@@ -1048,9 +1049,17 @@ CONFIG_VIDEO_V4L1=m
 CONFIG_MEDIA_TUNER_XC5000=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_CX2341X=m
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
@@ -1059,23 +1068,29 @@ CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_TUNER_3036 is not set
 # CONFIG_VIDEO_AU0828 is not set
 CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_VIDEO_PVRUSB2 is not set
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 # CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
 # CONFIG_USB_ET61X251 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_STV680 is not set
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
 # CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_PWC is not set
-# CONFIG_USB_ZR364XX is not set
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_ZR364XX=m
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_RADIO_ADAPTERS=y
============================================================
--- packages/linux/linux-omap2_git.bb	eb078f8af706ba7a440d3995a28430d718d0a006
+++ packages/linux/linux-omap2_git.bb	e6f17b9cec8b3cfa0d93d2fd47b21c197a3b7d7a
@@ -5,7 +5,7 @@ PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCRE
 SRCREV = "7786cd7a00ae0b18923185789380a88052f4eee7"
 
 PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r39"
+PR = "r40"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
============================================================
--- packages/python/python-cython_0.9.6.9.bb	0a9a75ec77d6190dc80054f14140c6d397f4f97c
+++ packages/python/python-cython_0.9.8.bb	0ab6745711c0f5ec95353a0d374403fa169ef687
@@ -4,10 +4,10 @@ LICENSE = "GPL"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-SRCNAME = "cython"
+SRCNAME = "Cython"
 PR = "ml0"
 
-SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.zip"
+SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils


#
# mt diff -r61c6959ed326b7433e68378046533cb8fa3b76dd -r7fb19ff722fe0f3e88a9d45230442af71ee72960
#
#
# no changes
#






More information about the Openembedded-commits mailing list