aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-04-23 22:27:56 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-04-23 22:27:56 +0100
commit6916cfe284843049a68ae8f1f28346d966ca2e16 (patch)
tree366bce405ad19aa2ce118712582f587977eead42
parentefa3892b20a4ef80274e56e5633ebd62c16f9731 (diff)
downloadmeta-opie-6916cfe284843049a68ae8f1f28346d966ca2e16.tar.gz
opie-init: fix missing inherit of palmtop-defs
This recipe refers to palmtopdir but unfortunately got missed when the definition was moved to palmtop-defs as the searches I was using at the time explicitly excluded files containing "inherit opie", which the .inc file did except it was commented out. Also remove the commented out "inherit opie" line as it serves no purpose and might lead to the same mistake happening again. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-opie/opie-init/opie-init.inc3
-rw-r--r--recipes-opie/opie-init/opie-init_1.2.5.bb2
2 files changed, 2 insertions, 3 deletions
diff --git a/recipes-opie/opie-init/opie-init.inc b/recipes-opie/opie-init/opie-init.inc
index 3e89664..99ebbe0 100644
--- a/recipes-opie/opie-init/opie-init.inc
+++ b/recipes-opie/opie-init/opie-init.inc
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
#S = "${WORKDIR}/launcher"
-#inherit opie
-inherit update-rc.d
+inherit palmtop-defs update-rc.d
INITSCRIPT_NAME = "opie"
INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
diff --git a/recipes-opie/opie-init/opie-init_1.2.5.bb b/recipes-opie/opie-init/opie-init_1.2.5.bb
index 5effa73..4af6095 100644
--- a/recipes-opie/opie-init/opie-init_1.2.5.bb
+++ b/recipes-opie/opie-init/opie-init_1.2.5.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "file://opie-reorgfiles \
file://opie \