aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/preferred-opie-git-versions.inc1
-rw-r--r--recipes-opie/opie-bluepin/opie-bluepin_git.bb5
-rw-r--r--recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager.inc1
-rw-r--r--recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_1.2.5.bb4
4 files changed, 4 insertions, 7 deletions
diff --git a/conf/distro/include/preferred-opie-git-versions.inc b/conf/distro/include/preferred-opie-git-versions.inc
index 8387edd..afd947f 100644
--- a/conf/distro/include/preferred-opie-git-versions.inc
+++ b/conf/distro/include/preferred-opie-git-versions.inc
@@ -38,7 +38,6 @@ SRCREV_pn-opie-backgammon ?= "${OPIE_SRCREV}"
SRCREV_pn-opie-backup ?= "${OPIE_SRCREV}"
SRCREV_pn-opie-bartender ?= "${OPIE_SRCREV}"
SRCREV_pn-opie-batteryapplet ?= "${OPIE_SRCREV}"
-SRCREV_pn-opie-bluepin ?= "${OPIE_SRCREV}"
SRCREV_pn-opie-bluetoothapplet ?= "${OPIE_SRCREV}"
SRCREV_pn-opie-bluetoothmanager ?= "${OPIE_SRCREV}"
SRCREV_pn-opie-bounce ?= "${OPIE_SRCREV}"
diff --git a/recipes-opie/opie-bluepin/opie-bluepin_git.bb b/recipes-opie/opie-bluepin/opie-bluepin_git.bb
deleted file mode 100644
index aa56ab2..0000000
--- a/recipes-opie/opie-bluepin/opie-bluepin_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-PV = "${OPIE_GIT_PV}"
-
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/blue-pin"
diff --git a/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager.inc b/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager.inc
index 4a87a1e..e1325ff 100644
--- a/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager.inc
+++ b/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager.inc
@@ -1,7 +1,6 @@
DESCRIPTION = "Bluetooth manager for Opie"
SECTION = "opie/settings"
DEPENDS = "libopietooth1 obexftp"
-RDEPENDS_${PN} = "opie-bluepin"
LICENSE = "GPL"
# FIXME stopgap until split archives have license files included
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
diff --git a/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_1.2.5.bb b/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_1.2.5.bb
index 8a8e5ac..b0b91af 100644
--- a/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_1.2.5.bb
+++ b/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_1.2.5.bb
@@ -1,5 +1,9 @@
require ${PN}.inc
+RDEPENDS_${PN} += "opie-bluepin"
+
+PR = "r1"
+
SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_noncore_net_opietooth_manager.tar.bz2;name=split_noncore_net_opietooth_manager \
http://sources.openembedded.org/opie-1.2.5-split_apps.tar.bz2;name=split_apps \
http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics"