From 79b124de74305e2827f0b98d8b3ef97302bfb83a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 13 Jul 2011 12:53:07 +0200
Subject: ofono: fix packaging and clean up custom do_install

The makefile installs the udev rule in the proper place already. Also fix:

WARNING: For recipe ofono, the following files were installed but not shipped in any package:
WARNING:   /lib/udev/rules.d/97-ofono.rules
WARNING:   /lib/systemd/system/ofono.service

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-connectivity/ofono/ofono.inc     | 3 +--
 meta/recipes-connectivity/ofono/ofono_0.50.bb | 2 +-
 meta/recipes-connectivity/ofono/ofono_git.bb  | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'meta/recipes-connectivity/ofono')

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 4fc969c94..a14b35a84 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -15,7 +15,6 @@ INITSCRIPT_PARAMS = "defaults 22"
 do_install_append() {
   install -d ${D}${sysconfdir}/init.d/
   install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
-  install -d ${D}${sysconfdir}/udev/rules.d/
-  install -m 0644 ${S}/plugins/97-ofono.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
+FILES_${PN} += "${base_libdir}/udev ${base_libdir}/systemd"
diff --git a/meta/recipes-connectivity/ofono/ofono_0.50.bb b/meta/recipes-connectivity/ofono/ofono_0.50.bb
index eb82e3967..463538688 100644
--- a/meta/recipes-connectivity/ofono/ofono_0.50.bb
+++ b/meta/recipes-connectivity/ofono/ofono_0.50.bb
@@ -1,6 +1,6 @@
 require ofono.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \
 	          file://ofono"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index 4e557451c..dbad5a1b6 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -1,5 +1,7 @@
 require ofono.inc
 
+PR = "r1"
+
 S	 = "${WORKDIR}/git"
 SRCREV = "14544d5996836f628613c2ce544380ee6fc8f514"
 PV	 = "0.12-git${SRCPV}"
-- 
cgit v1.2.3