summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-13 12:53:07 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 12:34:29 +0100
commit1d6e661801016fd428155fc71df4030f4d1c9a34 (patch)
treec9791f72df874de0f7e171f7f189d3f593c25399
parent3fdd47a7acdf834b24e9ff2329aa5c1e78644244 (diff)
downloadpoky-1d6e661801016fd428155fc71df4030f4d1c9a34.tar.gz
poky-1d6e661801016fd428155fc71df4030f4d1c9a34.tar.bz2
poky-1d6e661801016fd428155fc71df4030f4d1c9a34.zip
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 (From OE-Core rev: 79b124de74305e2827f0b98d8b3ef97302bfb83a) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc3
-rw-r--r--meta/recipes-connectivity/ofono/ofono_0.50.bb2
-rw-r--r--meta/recipes-connectivity/ofono/ofono_git.bb2
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 4fc969c94a..a14b35a847 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 eb82e3967e..4635386884 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 4e557451c1..dbad5a1b68 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}"