* [PATCH V2 0/4] BlueZ 5.3 new package
@ 2013-03-12 17:03 Cristian Iorga
2013-03-12 17:03 ` [PATCH V2 1/4] libical: add recipe back in oe-core Cristian Iorga
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Cristian Iorga @ 2013-03-12 17:03 UTC (permalink / raw)
To: openembedded-core
- BlueZ 5 v5.3 experimental new package;
- bluez5 package does not replace bluez4 package,
as a lot of components that interact with bluez
are not prepared to work correctly with bluez5;
- bluez5 is not an upgrade path from bluez4.
- libical is added back, as it is a requirement for
bluez OBEX feature.
- bluez5 conflicts with bluez4.
Cristian Iorga (4):
libical: add recipe back in oe-core
bluez5: new package for v5.3
bluez5: conflicts with bluez4
bluez4: conflicts with bluez5
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 4 +-
.../bluez5/bluez5-5.3/bluetooth.conf | 16 ++++++
.../bluez5/bluez5-5.3/fix-udev-paths.patch | 35 +++++++++++++
meta/recipes-connectivity/bluez5/bluez5.inc | 45 +++++++++++++++++
meta/recipes-connectivity/bluez5/bluez5_5.3.bb | 37 ++++++++++++++
.../libical/files/pthread-fix.patch | 52 ++++++++++++++++++++
meta/recipes-support/libical/libical_0.48.bb | 17 +++++++
7 files changed, 205 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5-5.3/bluetooth.conf
create mode 100644 meta/recipes-connectivity/bluez5/bluez5-5.3/fix-udev-paths.patch
create mode 100644 meta/recipes-connectivity/bluez5/bluez5.inc
create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.3.bb
create mode 100644 meta/recipes-support/libical/files/pthread-fix.patch
create mode 100644 meta/recipes-support/libical/libical_0.48.bb
--
1.7.10.4
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH V2 1/4] libical: add recipe back in oe-core 2013-03-12 17:03 [PATCH V2 0/4] BlueZ 5.3 new package Cristian Iorga @ 2013-03-12 17:03 ` Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 2/4] bluez5: new package for v5.3 Cristian Iorga ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Cristian Iorga @ 2013-03-12 17:03 UTC (permalink / raw) To: openembedded-core version: 0.48. reason: libical is needed by bluez. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- .../libical/files/pthread-fix.patch | 52 ++++++++++++++++++++ meta/recipes-support/libical/libical_0.48.bb | 17 +++++++ 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-support/libical/files/pthread-fix.patch create mode 100644 meta/recipes-support/libical/libical_0.48.bb diff --git a/meta/recipes-support/libical/files/pthread-fix.patch b/meta/recipes-support/libical/files/pthread-fix.patch new file mode 100644 index 0000000..877b808 --- /dev/null +++ b/meta/recipes-support/libical/files/pthread-fix.patch @@ -0,0 +1,52 @@ +New added pthread feature leads to some deadlock with some unlock code missing. +This patch fix it. + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +Upstream-Status: Pending + +Index: libical-0.47/src/libical/icaltimezone.c +=================================================================== +--- libical-0.47.orig/src/libical/icaltimezone.c 2011-12-16 13:42:25.000000000 +0800 ++++ libical-0.47/src/libical/icaltimezone.c 2011-12-16 14:16:25.000000000 +0800 +@@ -1773,7 +1773,7 @@ + filename = (char*) malloc (filename_len); + if (!filename) { + icalerror_set_errno(ICAL_NEWFAILED_ERROR); +- return; ++ goto out; + } + + snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(), +@@ -1783,7 +1783,7 @@ + free (filename); + if (!fp) { + icalerror_set_errno(ICAL_FILE_ERROR); +- return; ++ goto out; + } + + +@@ -1807,7 +1807,7 @@ + + if (!subcomp) { + icalerror_set_errno(ICAL_PARSE_ERROR); +- return; ++ goto out; + } + + icaltimezone_get_vtimezone_properties (zone, subcomp); +@@ -1817,10 +1817,12 @@ + icalcomponent_free(comp); + } + #endif +-#ifdef HAVE_PTHREAD ++ + out: ++#ifdef HAVE_PTHREAD + pthread_mutex_unlock(&builtin_mutex); + #endif ++ return; + } + + diff --git a/meta/recipes-support/libical/libical_0.48.bb b/meta/recipes-support/libical/libical_0.48.bb new file mode 100644 index 0000000..80f629c --- /dev/null +++ b/meta/recipes-support/libical/libical_0.48.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "http://sourceforge.net/projects/freeassociation/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077" +LICENSE = "LGPLv2.1 | MPL-1" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ + file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" +SECTION = "libs" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz\ + file://pthread-fix.patch" + +SRC_URI[md5sum] = "e549f434d5fbf9cd156c60ed4943618f" +SRC_URI[sha256sum] = "2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0" + +inherit autotools -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH V2 2/4] bluez5: new package for v5.3 2013-03-12 17:03 [PATCH V2 0/4] BlueZ 5.3 new package Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 1/4] libical: add recipe back in oe-core Cristian Iorga @ 2013-03-12 17:03 ` Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 3/4] bluez5: conflicts with bluez4 Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 4/4] bluez4: conflicts with bluez5 Cristian Iorga 3 siblings, 0 replies; 8+ messages in thread From: Cristian Iorga @ 2013-03-12 17:03 UTC (permalink / raw) To: openembedded-core - bluez5 does not replace bluez4 - bluez5 is integrated with systemd Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- .../bluez5/bluez5-5.3/bluetooth.conf | 16 +++++++ .../bluez5/bluez5-5.3/fix-udev-paths.patch | 35 +++++++++++++++ meta/recipes-connectivity/bluez5/bluez5.inc | 45 ++++++++++++++++++++ meta/recipes-connectivity/bluez5/bluez5_5.3.bb | 35 +++++++++++++++ 4 files changed, 131 insertions(+) create mode 100644 meta/recipes-connectivity/bluez5/bluez5-5.3/bluetooth.conf create mode 100644 meta/recipes-connectivity/bluez5/bluez5-5.3/fix-udev-paths.patch create mode 100644 meta/recipes-connectivity/bluez5/bluez5.inc create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.3.bb diff --git a/meta/recipes-connectivity/bluez5/bluez5-5.3/bluetooth.conf b/meta/recipes-connectivity/bluez5/bluez5-5.3/bluetooth.conf new file mode 100644 index 0000000..ca5e9e4 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5-5.3/bluetooth.conf @@ -0,0 +1,16 @@ +<!-- This configuration file specifies the required security policies + for Bluetooth core daemon to work. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- ../system.conf have denied everything, so we just punch some holes --> + + <policy context="default"> + <allow own="org.bluez"/> + <allow send_destination="org.bluez"/> + <allow send_interface="org.bluez.Agent"/> + </policy> + +</busconfig> diff --git a/meta/recipes-connectivity/bluez5/bluez5-5.3/fix-udev-paths.patch b/meta/recipes-connectivity/bluez5/bluez5-5.3/fix-udev-paths.patch new file mode 100644 index 0000000..37362f5 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5-5.3/fix-udev-paths.patch @@ -0,0 +1,35 @@ +Add udevdir/udevrulesdir options + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> +Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> + +Index: bluez-5.0/Makefile.am +=================================================================== +--- bluez-5.0.orig/Makefile.am 2012-12-24 19:46:54.000000000 +0200 ++++ bluez-5.0/Makefile.am 2013-01-30 14:33:15.760615474 +0200 +@@ -175,7 +175,7 @@ + include Makefile.obexd + + if HID2HCI +-rulesdir = @UDEV_DIR@/rules.d ++rulesdir = @UDEV_RULES_DIR@ + + rules_DATA = tools/97-hid2hci.rules + +Index: bluez-5.0/configure.ac +=================================================================== +--- bluez-5.0.orig/configure.ac 2012-12-24 19:46:54.000000000 +0200 ++++ bluez-5.0/configure.ac 2013-01-30 14:34:59.068613895 +0200 +@@ -160,6 +160,11 @@ + AC_SUBST(UDEV_DIR, [${path_udevdir}]) + fi + ++AC_ARG_WITH([udevrulesdir], ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]), ++ [], [with_udevrulesdir=/lib/udev/rules.d]) ++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir]) ++ + AM_CONDITIONAL(HID2HCI, test "${enable_tools}" != "no" && + test "${enable_udev}" != "no" && test "${enable_usb}" != "no") + diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc new file mode 100644 index 0000000..db9c766 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -0,0 +1,45 @@ +SUMMARY = "Linux Bluetooth Stack Userland V5" +DESCRIPTION = "Linux Bluetooth stack V5 userland components. These include a system configurations, daemons, tools and system libraries." +HOMEPAGE = "http://www.bluez.org" +SECTION = "libs" +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ + file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck libical" + +PACKAGECONFIG ??= "\ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ + ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ +" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," + +ASNEEDED = "" + +SRC_URI = "\ + ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ +" +S = "${WORKDIR}/bluez-${PV}" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF = "\ + --disable-gstreamer \ + --enable-usb \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + --disable-hidd \ + --disable-pand \ + --disable-dund \ + --disable-cups \ + --enable-test \ + --enable-datafiles \ + --with-udevdir=${base_libdir}/udev \ + --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d \ + ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \ +" + +SYSTEMD_SERVICE_${PN} = "bluetooth.service" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb new file mode 100644 index 0000000..311562f --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb @@ -0,0 +1,35 @@ +require bluez5.inc + +SRC_URI += "file://bluetooth.conf \ + file://fix-udev-paths.patch" + +SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed" +SRC_URI[sha256sum] = "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6" + +do_install_append() { + install -d ${D}${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT + install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ +} + +ALLOW_EMPTY_libasound-module-bluez = "1" +PACKAGES =+ "libasound-module-bluez ${PN}-test" + +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" +FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES_${PN}-dev += "\ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/alsa-lib/*.la \ +" + +FILES_${PN}-test = "${libdir}/bluez/test/*" + +FILES_${PN}-dbg += "\ + ${libdir}/${PN}/bluetooth/.debug \ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/*/.debug \ + ${base_libdir}/udev/.debug \ + " -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH V2 3/4] bluez5: conflicts with bluez4 2013-03-12 17:03 [PATCH V2 0/4] BlueZ 5.3 new package Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 1/4] libical: add recipe back in oe-core Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 2/4] bluez5: new package for v5.3 Cristian Iorga @ 2013-03-12 17:03 ` Cristian Iorga 2013-03-12 21:48 ` Martin Jansa 2013-03-12 17:03 ` [PATCH V2 4/4] bluez4: conflicts with bluez5 Cristian Iorga 3 siblings, 1 reply; 8+ messages in thread From: Cristian Iorga @ 2013-03-12 17:03 UTC (permalink / raw) To: openembedded-core Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- meta/recipes-connectivity/bluez5/bluez5_5.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb index 311562f..5963483 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb @@ -6,6 +6,8 @@ SRC_URI += "file://bluetooth.conf \ SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed" SRC_URI[sha256sum] = "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6" +RCONFLICTS_${PN} = "bluez4" + do_install_append() { install -d ${D}${sysconfdir}/bluetooth/ install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2 3/4] bluez5: conflicts with bluez4 2013-03-12 17:03 ` [PATCH V2 3/4] bluez5: conflicts with bluez4 Cristian Iorga @ 2013-03-12 21:48 ` Martin Jansa 2013-03-13 4:42 ` Burton, Ross 0 siblings, 1 reply; 8+ messages in thread From: Martin Jansa @ 2013-03-12 21:48 UTC (permalink / raw) To: Cristian Iorga; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 1249 bytes --] On Tue, Mar 12, 2013 at 07:03:14PM +0200, Cristian Iorga wrote: > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > --- > meta/recipes-connectivity/bluez5/bluez5_5.3.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb > index 311562f..5963483 100644 > --- a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb > +++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb > @@ -6,6 +6,8 @@ SRC_URI += "file://bluetooth.conf \ > SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed" > SRC_URI[sha256sum] = "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6" > > +RCONFLICTS_${PN} = "bluez4" That's not enough for upgrade path, add RREPLACES/RPROVIDES too. > + > do_install_append() { > install -d ${D}${sysconfdir}/bluetooth/ > install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ > -- > 1.7.10.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 3/4] bluez5: conflicts with bluez4 2013-03-12 21:48 ` Martin Jansa @ 2013-03-13 4:42 ` Burton, Ross 2013-03-22 21:23 ` Saul Wold 0 siblings, 1 reply; 8+ messages in thread From: Burton, Ross @ 2013-03-13 4:42 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 1611 bytes --] But bluez4 doesn't provide bluez5 and vice versa - the runtime API are different. Ross -- Ross Burton Sent with Sparrow <http://www.sparrowmailapp.com/?sig> On Tuesday, 12 March 2013 at 14:48, Martin Jansa wrote: On Tue, Mar 12, 2013 at 07:03:14PM +0200, Cristian Iorga wrote: Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- meta/recipes-connectivity/bluez5/bluez5_5.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bbb/meta/recipes-connectivity/bluez5/ bluez5_5.3.bb index 311562f..5963483 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb @@ -6,6 +6,8 @@ SRC_URI += "file://bluetooth.conf \ SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed" SRC_URI[sha256sum] = "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6" +RCONFLICTS_${PN} = "bluez4" That's not enough for upgrade path, add RREPLACES/RPROVIDES too. + do_install_append() { install -d ${D}${sysconfdir}/bluetooth/ install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core [-- Attachment #2: Type: text/html, Size: 3288 bytes --] ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2 3/4] bluez5: conflicts with bluez4 2013-03-13 4:42 ` Burton, Ross @ 2013-03-22 21:23 ` Saul Wold 0 siblings, 0 replies; 8+ messages in thread From: Saul Wold @ 2013-03-22 21:23 UTC (permalink / raw) To: Burton, Ross; +Cc: Martin Jansa, openembedded-core On 03/12/2013 09:42 PM, Burton, Ross wrote: > But bluez4 doesn't provide bluez5 and vice versa - the runtime API are > different. > Is there going to be a v3 version that has RREPLACES since they can not co-exisit, but they also don't PROVIDE. As Ross pointed out in a previous email, the package manager needs to be able to remove the older bluez package when migrating from 4 -> 5. Thanks Sau! > Ross > -- > Ross Burton > Sent with Sparrow <http://www.sparrowmailapp.com/?sig> > > On Tuesday, 12 March 2013 at 14:48, Martin Jansa wrote: > >> On Tue, Mar 12, 2013 at 07:03:14PM +0200, Cristian Iorga wrote: >>> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com >>> <mailto:cristian.iorga@intel.com>> >>> --- >>> meta/recipes-connectivity/bluez5/bluez5_5.3.bb <http://bluez5_5.3.bb> >>> | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb >>> <http://bluez5_5.3.bb> >>> b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb <http://bluez5_5.3.bb> >>> index 311562f..5963483 100644 >>> --- a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb >>> <http://bluez5_5.3.bb> >>> +++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb >>> <http://bluez5_5.3.bb> >>> @@ -6,6 +6,8 @@ SRC_URI += "file://bluetooth.conf \ >>> SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed" >>> SRC_URI[sha256sum] = >>> "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6" >>> +RCONFLICTS_${PN} = "bluez4" >> >> That's not enough for upgrade path, add RREPLACES/RPROVIDES too. >>> + >>> do_install_append() { >>> install -d ${D}${sysconfdir}/bluetooth/ >>> install -m 0644 ${S}/profiles/audio/audio.conf >>> ${D}/${sysconfdir}/bluetooth/ >>> -- >>> 1.7.10.4 >>> >>> >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> <mailto:Openembedded-core@lists.openembedded.org> >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> >> -- >> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com >> <mailto:Martin.Jansa@gmail.com> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> <mailto:Openembedded-core@lists.openembedded.org> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2 4/4] bluez4: conflicts with bluez5 2013-03-12 17:03 [PATCH V2 0/4] BlueZ 5.3 new package Cristian Iorga ` (2 preceding siblings ...) 2013-03-12 17:03 ` [PATCH V2 3/4] bluez5: conflicts with bluez4 Cristian Iorga @ 2013-03-12 17:03 ` Cristian Iorga 3 siblings, 0 replies; 8+ messages in thread From: Cristian Iorga @ 2013-03-12 17:03 UTC (permalink / raw) To: openembedded-core Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- meta/recipes-connectivity/bluez/bluez4_4.101.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb index 3ea2f25..6af2ebb 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb @@ -1,6 +1,6 @@ require bluez4.inc -PR = "r5" +PR = "r6" SRC_URI += "file://bluetooth.conf \ file://sbc_mmx.patch \ @@ -11,6 +11,8 @@ SRC_URI += "file://bluetooth.conf \ SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487" +RCONFLICTS_${PN} = "bluez5" + do_install_append() { install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-03-22 21:40 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-03-12 17:03 [PATCH V2 0/4] BlueZ 5.3 new package Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 1/4] libical: add recipe back in oe-core Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 2/4] bluez5: new package for v5.3 Cristian Iorga 2013-03-12 17:03 ` [PATCH V2 3/4] bluez5: conflicts with bluez4 Cristian Iorga 2013-03-12 21:48 ` Martin Jansa 2013-03-13 4:42 ` Burton, Ross 2013-03-22 21:23 ` Saul Wold 2013-03-12 17:03 ` [PATCH V2 4/4] bluez4: conflicts with bluez5 Cristian Iorga
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox