[oe-commits] org.oe.dev merge of '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Dec 20 18:05:35 UTC 2007
merge of '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
and '96df5dae22f2fb36fef351f22763d1b0524d1dfa'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: b0214fe2d462308558a4fdd18ac2097bc53e51b2
ViewMTN: http://monotone.openembedded.org/revision/info/b0214fe2d462308558a4fdd18ac2097bc53e51b2
Files:
1
conf/distro/openwrt-sdk.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/images/base-image.bb
packages/linux/linux-rp_2.6.20.bb
packages/linux/linux-rp_2.6.21.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/flumotion/flumotion_0.4.1.bb
packages/python/python-pygtk_2.10.4.bb
Diffs:
#
# mt diff -r0ac48f1fc79ebbccb1647c7d31278fc06fe421ef -rb0214fe2d462308558a4fdd18ac2097bc53e51b2
#
#
#
# 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 "packages/images/base-image.bb"
# from [b505988725f2bce81ebd364549ae0d4a1bcfca4f]
# to [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
#
# 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/openmoko2/openmoko-dialer2_svn.bb"
# from [79c69a220cf9a3002d88a1ec0d5bb3e0bf492acc]
# to [d37afe89e905deef090ef0996202047c614de03a]
#
============================================================
--- 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"
============================================================
--- 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-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/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"
#
# mt diff -r96df5dae22f2fb36fef351f22763d1b0524d1dfa -rb0214fe2d462308558a4fdd18ac2097bc53e51b2
#
#
#
# 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
More information about the Openembedded-commits
mailing list