[oe-commits] org.oe.dev merge of '848e56fa546fe4f9defbbca37a6baee4fab0c6fc'
oe commit
openembedded-commits at lists.openembedded.org
Thu Dec 20 22:18:47 UTC 2007
merge of '848e56fa546fe4f9defbbca37a6baee4fab0c6fc'
and 'b0214fe2d462308558a4fdd18ac2097bc53e51b2'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d8704c548ce3f4b681847003a642608d26644766
ViewMTN: http://monotone.openembedded.org/revision/info/d8704c548ce3f4b681847003a642608d26644766
Files:
1
packages/flumotion/flumotion_0.4.1.bb
packages/python/python-pygtk_2.10.4.bb
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig
packages/linux/linux_2.6.23+2.6.24-rc5.bb
Diffs:
#
# mt diff -r848e56fa546fe4f9defbbca37a6baee4fab0c6fc -rd8704c548ce3f4b681847003a642608d26644766
#
#
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [a68266133285a96c73795675b00eddfeb29e80bd]
# to [70c85428af57546952476b8d1a63581c1f51b43b]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [7a42ce19de5c3967c7030768ff9e0901ac72a20c]
# to [97365313b90449385ae4470aba6254d39ecdd2ab]
#
============================================================
--- packages/flumotion/flumotion_0.4.1.bb a68266133285a96c73795675b00eddfeb29e80bd
+++ packages/flumotion/flumotion_0.4.1.bb 70c85428af57546952476b8d1a63581c1f51b43b
@@ -1,13 +1,19 @@ LICENSE = "GPL"
DESCRIPTION = "Fluendo Streaming Server"
LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk2"
-RDEPENDS = " python-resource python-pprint python-threading python-imaging python-xml python-curses python-compression python-fcntl python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface python-textutils python-core python-gst python-misc"
-RDEPENDS_${PN}-gui = "${PN} python-pygtk2 python-pycairo "
-PR = "r7"
+DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
+RDEPENDS = "python-resource python-pprint python-threading \
+ python-imaging python-xml python-curses \
+ python-compression python-fcntl python-pygobject \
+ python-pickle python-netclient python-datetime \
+ python-crypt python-twisted-core python-twisted-web \
+ python-lang python-zopeinterface python-textutils \
+ python-gst python-misc"
+RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
+PR = "r9"
SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
file://python-path.patch;patch=1 \
- file://no-check-for-python-stuff.patch;patch=1"
+ file://no-check-for-python-stuff.patch;patch=1"
inherit autotools distutils-base pkgconfig
============================================================
--- packages/python/python-pygtk_2.10.4.bb 7a42ce19de5c3967c7030768ff9e0901ac72a20c
+++ packages/python/python-pygtk_2.10.4.bb 97365313b90449385ae4470aba6254d39ecdd2ab
@@ -1,7 +1,7 @@ SECTION = "devel/python"
DESCRIPTION = "Python GTK+ 2.10.x Bindings"
SECTION = "devel/python"
# needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pycairo"
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
RDEPENDS = "python-shell python-pycairo python-pygobject"
PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
@@ -13,8 +13,10 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
file://acinclude.m4"
S = "${WORKDIR}/${SRCNAME}-${PV}"
-EXTRA_OECONF = "--disable-docs"
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+EXTRA_OECONF = "\
+ --disable-docs \
+ --with-python-includes=${STAGING_INCDIR}/../ \
+"
inherit autotools pkgconfig distutils-base
#
# mt diff -rb0214fe2d462308558a4fdd18ac2097bc53e51b2 -rd8704c548ce3f4b681847003a642608d26644766
#
#
#
# patch "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig"
# from [8483c6f77370ab189aeb3d4f9246d1b2563fc301]
# to [1f0a662c7c964c58fcbbcbe3c168823f70b1a668]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [ea7f634ff11fe3d829b90eacf2f7e442fda2de65]
# to [10bd26a9c944ea3da366540d190b545b290bad27]
#
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig 8483c6f77370ab189aeb3d4f9246d1b2563fc301
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig 1f0a662c7c964c58fcbbcbe3c168823f70b1a668
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc5
-# Sat Dec 15 16:31:42 2007
+# Tue Dec 18 12:02:51 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -315,6 +315,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
#
# Network testing
@@ -328,10 +329,18 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
#
# Wireless
#
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_RCSIMPLE=y
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -525,7 +534,18 @@ CONFIG_DM9000=y
# Wireless LAN
#
# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_USB is not set
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_RT2X00 is not set
#
# USB Network Adapters
@@ -984,7 +1004,7 @@ CONFIG_MMC=m
#
# CONFIG_USB_GADGET is not set
CONFIG_MMC=m
-CONFIG_MMC_DEBUG=y
+# CONFIG_MMC_DEBUG=y
# CONFIG_MMC_UNSAFE_RESUME is not set
#
@@ -1178,7 +1198,47 @@ CONFIG_FRAME_POINTER=y
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
#
# Library routines
============================================================
--- packages/linux/linux_2.6.23+2.6.24-rc5.bb ea7f634ff11fe3d829b90eacf2f7e442fda2de65
+++ packages/linux/linux_2.6.23+2.6.24-rc5.bb 10bd26a9c944ea3da366540d190b545b290bad27
@@ -1,9 +1,9 @@ DEFAULT_PREFERENCE = "-1"
require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
-PR = "r0"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \
More information about the Openembedded-commits
mailing list