[oe-commits] org.oe.dev merge of '44e174b3ce2f7bdec89689f8329e4fe03a345f08'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Dec 10 13:24:47 UTC 2007
merge of '44e174b3ce2f7bdec89689f8329e4fe03a345f08'
and 'b075adcf4c74f28e1d73ec39796adb35c127dcce'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 4f68340cb0037cf244935ee0f691beda3ab76136
ViewMTN: http://monotone.openembedded.org/revision/info/4f68340cb0037cf244935ee0f691beda3ab76136
Files:
1
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/bluez/bluez-cups-backend_3.23.bb
packages/bluez/bluez-gstreamer-plugin_3.23.bb
packages/bluez/bluez-libs_3.23.bb
packages/bluez/bluez-utils-alsa_3.23.bb
packages/bluez/bluez-utils_3.23.bb
Diffs:
#
# mt diff -r44e174b3ce2f7bdec89689f8329e4fe03a345f08 -r4f68340cb0037cf244935ee0f691beda3ab76136
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [469e259ca0c6962e5aebabe8670af39d0e0ea80d]
# to [a64e90095f6442e2dfb62961b3a54918c8c17519]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [c253a50a75d42e45a78388571d0e841b3b6b51b8]
# to [c2bc580c5af6e6a1a1fa2ed9220455a8ca8c55f8]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh 469e259ca0c6962e5aebabe8670af39d0e0ea80d
+++ packages/zaurus-updater/zaurus-updater/updater.sh a64e90095f6442e2dfb62961b3a54918c8c17519
@@ -164,6 +164,7 @@ do_flashing()
fi
if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+ then
#check version
/sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
============================================================
--- packages/zaurus-updater/zaurus-updater.bb c253a50a75d42e45a78388571d0e841b3b6b51b8
+++ packages/zaurus-updater/zaurus-updater.bb c2bc580c5af6e6a1a1fa2ed9220455a8ca8c55f8
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r16"
+PR = "r17"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# mt diff -rb075adcf4c74f28e1d73ec39796adb35c127dcce -r4f68340cb0037cf244935ee0f691beda3ab76136
#
#
#
# add_file "packages/bluez/bluez-cups-backend_3.23.bb"
# content [6d3dd18f0576378f8bae0c3e251bce0ca132176e]
#
# add_file "packages/bluez/bluez-gstreamer-plugin_3.23.bb"
# content [f67c210c4018f045ec0a87f2baff07aefd2c19ae]
#
# add_file "packages/bluez/bluez-libs_3.23.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils-alsa_3.23.bb"
# content [b7eb82c734b71cf61ac35a052d87da836df665d4]
#
# add_file "packages/bluez/bluez-utils_3.23.bb"
# content [585b498ec4a54ca79531aca3aabb3569a3dd6476]
#
============================================================
--- packages/bluez/bluez-cups-backend_3.23.bb 6d3dd18f0576378f8bae0c3e251bce0ca132176e
+++ packages/bluez/bluez-cups-backend_3.23.bb 6d3dd18f0576378f8bae0c3e251bce0ca132176e
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "cups"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_${PN} = "cups"
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.23.bb f67c210c4018f045ec0a87f2baff07aefd2c19ae
+++ packages/bluez/bluez-gstreamer-plugin_3.23.bb f67c210c4018f045ec0a87f2baff07aefd2c19ae
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --enable-gstreamer \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
============================================================
--- packages/bluez/bluez-libs_3.23.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.23.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils-alsa_3.23.bb b7eb82c734b71cf61ac35a052d87da836df665d4
+++ packages/bluez/bluez-utils-alsa_3.23.bb b7eb82c734b71cf61ac35a052d87da836df665d4
@@ -0,0 +1,24 @@
+require bluez-utils3.inc
+
+DEPENDS += "alsa-lib"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --disable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/alsa-lib/libasound*"
============================================================
--- packages/bluez/bluez-utils_3.23.bb 585b498ec4a54ca79531aca3aabb3569a3dd6476
+++ packages/bluez/bluez-utils_3.23.bb 585b498ec4a54ca79531aca3aabb3569a3dd6476
@@ -0,0 +1,29 @@
+require bluez-utils3.inc
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
More information about the Openembedded-commits
mailing list