[oe-commits] org.oe.dev merge of 'ad0c1c90501edf142b7f2f658fe2c819ce9e0608'
thebohemian commit
openembedded-commits at lists.openembedded.org
Fri Dec 21 08:36:58 UTC 2007
merge of 'ad0c1c90501edf142b7f2f658fe2c819ce9e0608'
and 'd8704c548ce3f4b681847003a642608d26644766'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 6ef6c9770f1a61263cf501b4aacd6162e3d3d7e1
ViewMTN: http://monotone.openembedded.org/revision/info/6ef6c9770f1a61263cf501b4aacd6162e3d3d7e1
Files:
1
conf/distro/openwrt-sdk.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
contrib/angstrom/build-feeds.sh
contrib/angstrom/build-release.sh
packages/flumotion/flumotion_0.4.1.bb
packages/images/base-image.bb
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig
packages/linux/linux-rp_2.6.20.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/python/python-pygtk_2.10.4.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/hal/hal_0.5.9.bb
Diffs:
#
# mt diff -rad0c1c90501edf142b7f2f658fe2c819ce9e0608 -r6ef6c9770f1a61263cf501b4aacd6162e3d3d7e1
#
#
#
# add_file "conf/distro/openwrt-sdk.conf"
# content [8b396941add259495d68102ab8ff2429a211f943]
#
# patch "conf/machine/fic-gta01.conf"
# from [56e3567a9b043a97909716a4bb78777a1f1f48a2]
# to [f27cbc4ecf805a9d8cb70b26d9922a2880880dfc]
#
# patch "conf/machine/fic-gta02.conf"
# from [5a64c25ce56c6c837bea67eadf19100fe0d59337]
# to [ccf9b87c36d24e1c3e118f08f60012f6c27e2dd8]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [94751537edad00e471f43c6fa461aea634716679]
# to [3ccfd168723e3ef76a4a34ac3f630adb2dc4df3b]
#
# patch "contrib/angstrom/build-release.sh"
# from [f2199cfa4af0b86c2d7bf508cb53516c468b13f5]
# to [47b470ed8a0841c920889e9c992dc07dc4334413]
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [a68266133285a96c73795675b00eddfeb29e80bd]
# to [70c85428af57546952476b8d1a63581c1f51b43b]
#
# patch "packages/images/base-image.bb"
# from [b505988725f2bce81ebd364549ae0d4a1bcfca4f]
# to [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
#
# patch "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig"
# from [8483c6f77370ab189aeb3d4f9246d1b2563fc301]
# to [1f0a662c7c964c58fcbbcbe3c168823f70b1a668]
#
# patch "packages/linux/linux-rp_2.6.20.bb"
# from [4543ed5404a5182988a9eead29310aba8694dafc]
# to [eb1dff546d288eb653bbb9baf68106c2b1af947d]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [aa7370a28343ffa48a4725518e97cc7407f2d7d1]
# to [25dc346e91edc0878c34b927fbdbdba4d7d1317b]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [ea7f634ff11fe3d829b90eacf2f7e442fda2de65]
# to [10bd26a9c944ea3da366540d190b545b290bad27]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [79c69a220cf9a3002d88a1ec0d5bb3e0bf492acc]
# to [d37afe89e905deef090ef0996202047c614de03a]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [7a42ce19de5c3967c7030768ff9e0901ac72a20c]
# to [97365313b90449385ae4470aba6254d39ecdd2ab]
#
# patch "packages/qt/qt4-x11-free_4.3.2.bb"
# from [706fc53c8f4c041fca267bea9825aa99010fa460]
# to [b7e59e0489502bdfca8e0b0220da5df284fb0995]
#
============================================================
--- conf/distro/openwrt-sdk.conf 8b396941add259495d68102ab8ff2429a211f943
+++ conf/distro/openwrt-sdk.conf 8b396941add259495d68102ab8ff2429a211f943
@@ -0,0 +1,26 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenWRT-SDK
+#@DESCRIPTION: Building packages for OpenWRT using its official SDK.
+#
+#@COMMENT: This allows to build packages only, not the whole images.
+#@COMMENT: You should install and have in path an SDK from the www.openwrt.org.
+#@COMMENT: SDK installers are both host and target specific (so look in download
+#@COMMENT: dir for your target). If there is no SDK for your host arch,
+#@COMMENT: you can also look at downloads of x-wrt.org, a sister project.
+#@COMMENT: To build a package, use command like:
+#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package>
+#-----------------------------------------------------------------------------
+
+require conf/distro/generic-uclibc.conf
+
+#
+# Header
+#
+DISTRO_NAME = "OpenWRT"
+
+# This is what lives in SDK
+ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+
+# Make sure that we have correct package dependencies for SDK-provided libs.
+ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
============================================================
--- conf/machine/fic-gta01.conf 56e3567a9b043a97909716a4bb78777a1f1f48a2
+++ conf/machine/fic-gta01.conf f27cbc4ecf805a9d8cb70b26d9922a2880880dfc
@@ -11,7 +11,7 @@ UBOOT_ENTRYPOINT = "30008000"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
============================================================
--- conf/machine/fic-gta02.conf 5a64c25ce56c6c837bea67eadf19100fe0d59337
+++ conf/machine/fic-gta02.conf ccf9b87c36d24e1c3e118f08f60012f6c27e2dd8
@@ -11,7 +11,7 @@ UBOOT_ENTRYPOINT = "30008000"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
============================================================
--- contrib/angstrom/build-feeds.sh 94751537edad00e471f43c6fa461aea634716679
+++ contrib/angstrom/build-feeds.sh 3ccfd168723e3ef76a4a34ac3f630adb2dc4df3b
@@ -35,16 +35,16 @@ do
for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz
do
BUILD_MACHINE=$machine
- BUILD_CLEAN="libtool-cross"
+ BUILD_CLEAN="libtool-cross qmake2-native"
BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \
task-proper-tools mc screen \
mono perl python ruby \
gtk+ qt-x11-free qt4-x11-free \
gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
- boa cherokee lighttpd thttpd \
- gpe-gallery gpe-scap pidgin \
+ apache2 boa cherokee lighttpd thttpd \
+ gpe-gallery gpe-scap notecase pidgin \
gpsdrive navit \
- xmms mplayer \
+ xmms mplayer quasar \
wpa-gui wifi-radar \
gpe-bluetooth bluez-gnome python-pybluez \
abiword gnumeric evince gimp \
============================================================
--- contrib/angstrom/build-release.sh f2199cfa4af0b86c2d7bf508cb53516c468b13f5
+++ contrib/angstrom/build-release.sh 47b470ed8a0841c920889e9c992dc07dc4334413
@@ -95,10 +95,10 @@ done
done
# populate feeds
-for machine in ep93xx a780 efika collie ixp4xxbe
-do
- BUILD_MACHINE=$machine
- BUILD_TARGETS="meta-angstrom-2007"
- do_build
-done
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+# BUILD_MACHINE=$machine
+# BUILD_TARGETS="meta-angstrom-2007"
+# do_build
+#done
============================================================
--- 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/images/base-image.bb b505988725f2bce81ebd364549ae0d4a1bcfca4f
+++ packages/images/base-image.bb a1e5aad1ac0a18575912aad884dfdc89508d7d46
@@ -24,7 +24,8 @@ DEPENDS = "\
task-distro-base task-machine-base \
${DISTRO_SSH_DAEMON} \
${DISTRO_PACKAGE_MANAGER} \
- task-base-usbhost task-base-ext2 \
+ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
"
IMAGE_INSTALL = "\
@@ -32,7 +33,8 @@ IMAGE_INSTALL = "\
task-distro-base task-machine-base \
${DISTRO_SSH_DAEMON} \
${DISTRO_PACKAGE_MANAGER} \
- task-base-usbhost task-base-ext2 \
+ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
"
export IMAGE_BASENAME = "base-image"
============================================================
--- 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-rp_2.6.20.bb 4543ed5404a5182988a9eead29310aba8694dafc
+++ packages/linux/linux-rp_2.6.20.bb eb1dff546d288eb653bbb9baf68106c2b1af947d
@@ -1,8 +1,9 @@ DEFAULT_PREFERENCE_poodle = "-99"
require linux-rp.inc
PR = "r19"
DEFAULT_PREFERENCE_poodle = "-99"
+DEFAULT_PREFERENCE_collie = "1"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
============================================================
--- packages/linux/linux-rp_2.6.21.bb aa7370a28343ffa48a4725518e97cc7407f2d7d1
+++ packages/linux/linux-rp_2.6.21.bb 25dc346e91edc0878c34b927fbdbdba4d7d1317b
@@ -1,9 +1,9 @@ DEFAULT_PREFERENCE_poodle = "-99"
require linux-rp.inc
PR = "r12"
DEFAULT_PREFERENCE_poodle = "-99"
-DEFAULT_PREFERENCE_collie = "1"
+DEFAULT_PREFERENCE_collie = "-1"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
============================================================
--- 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 \
============================================================
--- packages/openmoko2/openmoko-dialer2_svn.bb 79c69a220cf9a3002d88a1ec0d5bb3e0bf492acc
+++ packages/openmoko2/openmoko-dialer2_svn.bb d37afe89e905deef090ef0996202047c614de03a
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
DESCRIPTION = "The OpenMoko Dialer"
SECTION = "openmoko/pim"
-DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio libnotify"
+DEPENDS = "libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
PV = "0.1.0+svnr${SRCREV}"
PR = "r6"
PE = "1"
============================================================
--- 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
============================================================
--- packages/qt/qt4-x11-free_4.3.2.bb 706fc53c8f4c041fca267bea9825aa99010fa460
+++ packages/qt/qt4-x11-free_4.3.2.bb b7e59e0489502bdfca8e0b0220da5df284fb0995
@@ -62,7 +62,7 @@ do_compile() {
# FIXME: Might want to compile the cross tools for the -dev packages as well...
do_compile() {
- unset CFLAGS CXXFLAGSi
+ unset CFLAGS CXXFLAGS
install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
#
# mt diff -rd8704c548ce3f4b681847003a642608d26644766 -r6ef6c9770f1a61263cf501b4aacd6162e3d3d7e1
#
#
#
# patch "packages/hal/hal_0.5.9.bb"
# from [2755b9938bea086e274d62d986064902f8cd8562]
# to [994ba969732d514b1c0e8f71493297a10204818c]
#
============================================================
--- packages/hal/hal_0.5.9.bb 2755b9938bea086e274d62d986064902f8cd8562
+++ packages/hal/hal_0.5.9.bb 994ba969732d514b1c0e8f71493297a10204818c
@@ -1,6 +1,6 @@ require hal.inc
require hal.inc
-DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb"
+DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb"
RDEPENDS += "udev hal-info"
#RDEPENDS_hal-device-manager = "python hal python-pygnome"
RRECOMMENDS = "udev-utils"
More information about the Openembedded-commits
mailing list