Skip to contentSkip to conversation

Small fixes

PATCH Applied Martin Jansa 2 participants 4 messages Aug 18, 2011 – Aug 23, 2011

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover Small fixes

The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:

kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Martin Jansa (2):
task-core-boot: allow distribution to override default dev_manager
provider with VIRTUAL-RUNTIME_dev_manager
bluez4: update recipe from meta-oe

 meta/recipes-connectivity/bluez/bluez4_4.96.bb |   17 ++++++-----------
 meta/recipes-core/tasks/task-core-boot.bb      |    5 ++++-
 2 files changed, 10 insertions(+), 12 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/2 task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-core/tasks/task-core-boot.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-core/tasks/task-core-boot.bb +4 -1
index eb2b548..9116c38 100644
@@ -17,6 +17,9 @@ PR = "r8"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+# Distro can override dev_manager provider
+VIRTUAL-RUNTIME_dev_manager ?= "udev"
+
 PACKAGES = "\
     task-core-boot \
     task-core-boot-dbg \

@@ -33,7 +36,7 @@ RDEPENDS_task-core-boot = "\
     netbase \
     sysvinit \
     tinylogin \
-    udev \
+    ${VIRTUAL-RUNTIME_dev_manager} \
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/2 bluez4: update recipe from meta-oe

* fix DEPENDS
* fix typo in --enable-pandd option
* remove unsupported options
* update packaging
* remove distro override which doesn't belong to oe-core

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-connectivity/bluez/bluez4_4.96.bb |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
meta/recipes-connectivity/bluez/bluez4_4.96.bb +6 -11
index ebd2849..edba167 100644
@@ -7,12 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
                     file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
                     file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
+DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath"
 RDEPENDS_${PN}-dev = "bluez-hcidump"
 
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
 ASNEEDED = ""
 
 PR = "r0"

@@ -24,6 +21,7 @@ SRC_URI = "\
 
 SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
 SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
+
 S = "${WORKDIR}/bluez-${PV}"
 
 inherit autotools

@@ -32,20 +30,16 @@ EXTRA_OECONF = "\
   --enable-gstreamer \
   --enable-alsa \
   --enable-usb \
-  --enable-netlink \
   --enable-tools \
   --enable-bccmd \
   --enable-hid2hci \
   --enable-dfutool \
   --enable-hidd \
-  --enable-pandd \
+  --enable-pand \
   --enable-dund \
   --disable-cups \
   --enable-test \
-  --enable-manpages \
   --enable-configfiles \
-  --enable-initscripts \
-  --disable-pcmciarules \
 "
 
 do_install_append() {

@@ -59,8 +53,8 @@ do_install_append() {
 PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
 
 FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \

@@ -70,4 +64,5 @@ FILES_${PN}-dev += "\
 FILES_${PN}-dbg += "\
   ${libdir}/bluetooth/plugins/.debug \
   ${libdir}/*/.debug \
+  ${base_libdir}/udev/.debug \
 "
Signature · 1 line
1.7.6
Applied
#3 lore raw
In reply to Martin Jansa
Quoted 8 lines · Martin Jansa

The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:

kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Quoted 9 lines

Martin Jansa (2):
task-core-boot: allow distribution to override default dev_manager
provider with VIRTUAL-RUNTIME_dev_manager
bluez4: update recipe from meta-oe

  meta/recipes-connectivity/bluez/bluez4_4.96.bb |   17 ++++++-----------
  meta/recipes-core/tasks/task-core-boot.bb      |    5 ++++-
  2 files changed, 10 insertions(+), 12 deletions(-)

Merged into OE-Core

Thanks
Sau!