Patchwork [1/2] ofono: fix packaging and clean up custom do_install

login
register
mail settings
Submitter Koen Kooi
Date July 13, 2011, 10:53 a.m.
Message ID <1310554388-28844-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/7535/
State New, archived
Headers show

Comments

Koen Kooi - July 13, 2011, 10:53 a.m.
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>
---
 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(-)
Richard Purdie - July 13, 2011, 11:31 a.m.
On Wed, 2011-07-13 at 12:53 +0200, Koen Kooi wrote:
> 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>

Merged to master, thanks (along with 2/2).

Cheers,

Richard

Patch

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 4fc969c..a14b35a 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 eb82e39..4635386 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 4e55745..dbad5a1 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}"