[oe-commits] org.oe.dev merge of '0a1bbba5cea50e04cabcd0105f2b2fc40814b7a7'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Aug 28 01:32:16 UTC 2007
merge of '0a1bbba5cea50e04cabcd0105f2b2fc40814b7a7'
and '3b73bd5ada8f044f5d14445933e426ec92ff9f9e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c288a6b0de570eee76783fd7b34698c396cd22fb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c288a6b0de570eee76783fd7b34698c396cd22fb
Files:
1
packages/qemu/qemu-gcc3-check.inc
packages/qemu/qemu-native.inc
packages/qemu/qemu-native_20070613.bb
packages/bluez/bluez-libs_3.15.bb
packages/bluez/bluez-utils_3.15.bb
packages/dbus/dbus-glib-native_0.72.bb
Diffs:
#
# mt diff -r0a1bbba5cea50e04cabcd0105f2b2fc40814b7a7 -rc288a6b0de570eee76783fd7b34698c396cd22fb
#
#
#
# add_file "packages/qemu/qemu-gcc3-check.inc"
# content [2e11e76ecd0c388cdcfd1319c8601c429ba5888e]
#
# patch "packages/qemu/qemu-native.inc"
# from [740a86de6db274cb5c05df97968b02f1bc33a4cf]
# to [22b8987bdaa1e51e0eaff486b9303f0957b086d5]
#
# patch "packages/qemu/qemu-native_20070613.bb"
# from [342f872dda508387c0cfd231275c9f7fa10f3a9e]
# to [750dd1e695e2d0105b93941f87c372ddd4f9f0a1]
#
============================================================
--- packages/qemu/qemu-gcc3-check.inc 2e11e76ecd0c388cdcfd1319c8601c429ba5888e
+++ packages/qemu/qemu-gcc3-check.inc 2e11e76ecd0c388cdcfd1319c8601c429ba5888e
@@ -0,0 +1,20 @@
+python __anonymous() {
+ from bb import which, data
+
+ path = data.getVar('PATH', d)
+ oldOeConf = data.getVar('EXTRA_OECONF', d)
+ if not oldOeConf: oldOeConf = ""
+ if len(which(path, 'gcc-3.4')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d)
+ elif len(which(path, 'gcc34')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d)
+ elif len(which(path, 'gcc33')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d)
+ elif len(which(path, 'gcc-3.3')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
+ elif len(which(path, 'gcc-3.3.6')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d)
+ elif len(which(path, 'gcc-3.4.6')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d)
+}
+
============================================================
--- packages/qemu/qemu-native.inc 740a86de6db274cb5c05df97968b02f1bc33a4cf
+++ packages/qemu/qemu-native.inc 22b8987bdaa1e51e0eaff486b9303f0957b086d5
@@ -1,26 +1,8 @@ DEPENDS = "libsdl-native zlib-native"
FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
# prefix = "${STAGING_DIR}/${BUILD_SYS}"
DEPENDS = "libsdl-native zlib-native"
-python __anonymous() {
- from bb import which, data
-
- path = data.getVar('PATH', d)
- oldOeConf = data.getVar('EXTRA_OECONF', d)
- if not oldOeConf: oldOeConf = ""
- if len(which(path, 'gcc-3.4')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d)
- elif len(which(path, 'gcc34')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d)
- elif len(which(path, 'gcc33')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d)
- elif len(which(path, 'gcc-3.3')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
- elif len(which(path, 'gcc-3.3.6')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d)
- elif len(which(path, 'gcc-3.4.6')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d)
-}
+require qemu-gcc3-check.inc
do_stage() {
find . -name "qemu-*" -type f -perm -755 -exec install -m 0755 {} ${STAGING_BINDIR} \;
============================================================
--- packages/qemu/qemu-native_20070613.bb 342f872dda508387c0cfd231275c9f7fa10f3a9e
+++ packages/qemu/qemu-native_20070613.bb 750dd1e695e2d0105b93941f87c372ddd4f9f0a1
@@ -1,20 +1,7 @@ prefix = "${STAGING_DIR}/${BUILD_SYS}"
require qemu_${PV}.bb
inherit native
DEPENDS = "zlib-native"
prefix = "${STAGING_DIR}/${BUILD_SYS}"
+require qemu-gcc3-check.inc
+
-python __anonymous() {
- from bb import which, data
-
- path = data.getVar('PATH', d)
- oeconf = data.getVar('EXTRA_OECONF', d) or ''
- if len(which(path, 'gcc-3.4.6')) != 0:
- data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4.6", d)
- elif len(which(path, 'gcc-3.4')) != 0:
- data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4", d)
- elif len(which(path, 'gcc34')) != 0:
- data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc34", d)
- elif len(which(path, 'gcc-3.3')) != 0:
- data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.3", d)
- #data.setVarFlag('PKG_CONFIG_PATH', 'unexport', '1', d)
-}
#
# mt diff -r3b73bd5ada8f044f5d14445933e426ec92ff9f9e -rc288a6b0de570eee76783fd7b34698c396cd22fb
#
#
#
# add_file "packages/bluez/bluez-libs_3.15.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils_3.15.bb"
# content [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
#
# patch "packages/dbus/dbus-glib-native_0.72.bb"
# from [278c6e1074af019c5bf108638bebfba814ddc160]
# to [5c8a08a3c0bc93f2de4060d523738b5500cd88c0]
#
============================================================
--- packages/bluez/bluez-libs_3.15.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.15.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils_3.15.bb a6515be5f7deaf5c7ae08f4d976c5b84644d682f
+++ packages/bluez/bluez-utils_3.15.bb a6515be5f7deaf5c7ae08f4d976c5b84644d682f
@@ -0,0 +1,116 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+# ti patch doesn't apply, people using it should rediff it and send it upstream
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+# file://hciattach-ti-bts.patch;patch=1 \
+ "
+PR = "r0"
+
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+# The config options are explained below:
+
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+# --enable-glib For systems that use and install GLib anyway
+# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+# --enable-network
+# --enable-serial
+# --enable-input
+# --enable-audio
+# --enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+# --enable-configfile
+# --enable-initscripts
+
+#For even smaller -doc packages
+# --disable-manpages
+# --disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+# --disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/*.service \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ ${libdir}/cups/backend/.debug \
+ ${libdir}/alsa-lib/.debug \
+ "
+
+FILES_${PN}-compat = " \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_sbindir}/hid2hci \
+ ${base_bindir}/passkey-agent \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
============================================================
--- packages/dbus/dbus-glib-native_0.72.bb 278c6e1074af019c5bf108638bebfba814ddc160
+++ packages/dbus/dbus-glib-native_0.72.bb 5c8a08a3c0bc93f2de4060d523738b5500cd88c0
@@ -1,5 +1,5 @@ SECTION = "base"
SECTION = "base"
-PR = "r0"
+PR = "r1"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
DESCRIPTION = "message bus system for applications to talk to one another"
LICENSE = "GPL"
@@ -19,4 +19,5 @@ do_stage() {
install -d ${STAGING_DATADIR}/dbus
install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
+ install -m 0755 dbus/.libs/dbus-binding-tool ${STAGING_BINDIR}/
}
More information about the Openembedded-commits
mailing list