pandora-scripts and pandora-configtray: Moved Bluetooth into Wifi-packages as well

diff --git a/recipes/pandora-system/pandora-configtray.bb b/recipes/pandora-system/pandora-configtray.bb
index 5f3e416..b6e1e3f 100755 (executable)
--- a/recipes/pandora-system/pandora-configtray.bb
+++ b/recipes/pandora-system/pandora-configtray.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A tray applet to change various Pandora-related settings"
 LICENSE = "zlib"
 
-PR = "r12"
+PR = "r13"
 
 PARALLEL_MAKE = ""
 DEPENDS = "gtk+"
@@ -48,5 +48,5 @@ do_install() {
 
 PACKAGES =+ "${PN}-wifi"
 PROVIDES += "${PN}-wifi"
-FILES_${PN}-wifi = "${datadir}/configbutton/wifi.so ${prefix}/share/icons/pandora/wifi.png"
+FILES_${PN}-wifi = "${datadir}/configbutton/wifi.so ${datadir}/configbutton/bluetooth.so ${prefix}/share/icons/pandora/wifi.png ${prefix}/share/icons/pandora/bt.png"
 FILES_${PN} += "${prefix} ${datadir}"

diff --git a/recipes/pandora-system/pandora-scripts-wifi.bb b/recipes/pandora-system/pandora-scripts-wifi.bb
index 2e8be94..75b54ab 100644 (file)
--- a/recipes/pandora-system/pandora-scripts-wifi.bb
+++ b/recipes/pandora-system/pandora-scripts-wifi.bb
@@ -5,23 +5,36 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 
 RDEPENDS = "pandora-scripts"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
           file://op_wifi.sh \
           file://op_wifi.pnd \  
           file://nettool.pnd \
+          file://op_bluetooth.sh \
+          file://op_bluetooth_work.sh \
+          file://op_bluetooth-check.desktop \
+          file://op_bluetooth.desktop \          
 "
 
 do_install() {
           install -d ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_wifi.sh ${D}${prefix}/pandora/scripts/
+          install -m 0755 ${WORKDIR}/op_bluetooth.sh ${D}${prefix}/pandora/scripts/
+          install -m 0755 ${WORKDIR}/op_bluetooth_work.sh ${D}${prefix}/pandora/scripts/
 
           install -d ${D}${prefix}/pandora/apps/
          install -m 0755 ${WORKDIR}/op_wifi.pnd ${D}${prefix}/pandora/apps/
 
          install -d ${D}${prefix}/pandora/mmenu/
          install -m 0755 ${WORKDIR}/nettool.pnd ${D}${prefix}/pandora/mmenu/
+         
+         install -d ${D}${datadir}/applications/
+          install -m 0644 ${WORKDIR}/op_bluetooth.desktop ${D}${datadir}/applications/
+          
+          install -d ${D}${sysconfdir}/xdg/autostart/
+          install -m 0644 ${WORKDIR}/op_bluetooth-check.desktop ${D}${sysconfdir}/xdg/autostart/op_bluetooth-check.desktop
+         
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth-check.desktop b/recipes/pandora-system/pandora-scripts-wifi/op_bluetooth-check.desktop
similarity index 100%
rename from recipes/pandora-system/pandora-scripts/op_bluetooth-check.desktop
rename to recipes/pandora-system/pandora-scripts-wifi/op_bluetooth-check.desktop

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth.desktop b/recipes/pandora-system/pandora-scripts-wifi/op_bluetooth.desktop
similarity index 100%
rename from recipes/pandora-system/pandora-scripts/op_bluetooth.desktop
rename to recipes/pandora-system/pandora-scripts-wifi/op_bluetooth.desktop

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh b/recipes/pandora-system/pandora-scripts-wifi/op_bluetooth.sh
similarity index 100%
rename from recipes/pandora-system/pandora-scripts/op_bluetooth.sh
rename to recipes/pandora-system/pandora-scripts-wifi/op_bluetooth.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth_work.sh b/recipes/pandora-system/pandora-scripts-wifi/op_bluetooth_work.sh
similarity index 100%
rename from recipes/pandora-system/pandora-scripts/op_bluetooth_work.sh
rename to recipes/pandora-system/pandora-scripts-wifi/op_bluetooth_work.sh

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 1297941..8165df1 100644 (file)
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -5,7 +5,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 
 RDEPENDS = "bash sed gawk grep zenity"
 
-PR = "r140"
+PR = "r141"
 
 SRC_URI = " \
           file://op_paths.sh \
@@ -19,10 +19,6 @@ SRC_URI = " \
           file://op_sysspeed.sh \
          file://op_createsd.sh \
          file://op_createsd.pnd \
-          file://op_bluetooth.sh \
-          file://op_bluetooth_work.sh \
-          file://op_bluetooth-check.desktop \
-          file://op_bluetooth.desktop \          
           file://op_startupmanager.sh \
           file://op_startupmanager.pnd \
           file://op_switchgui.sh \
@@ -103,8 +99,6 @@ do_install() {
           install -m 0755 ${WORKDIR}/op_sysspeed.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_cpusettings.sh ${D}${prefix}/pandora/scripts/
          install -m 0755 ${WORKDIR}/op_usbhost.sh ${D}${prefix}/pandora/scripts/
-          install -m 0755 ${WORKDIR}/op_bluetooth.sh ${D}${prefix}/pandora/scripts/
-          install -m 0755 ${WORKDIR}/op_bluetooth_work.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_startupmanager.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_switchgui.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_calibrate.sh ${D}${prefix}/pandora/scripts/
@@ -168,12 +162,6 @@ do_install() {
           install -m 0755 ${WORKDIR}/xchat.pnd ${D}${prefix}/pandora/mmenu/
          install -m 0755 ${WORKDIR}/gcalctool.pnd ${D}${prefix}/pandora/mmenu/
 
-          install -d ${D}${datadir}/applications/
-          install -m 0644 ${WORKDIR}/op_bluetooth.desktop ${D}${datadir}/applications/
-          
-          install -d ${D}${sysconfdir}/xdg/autostart/
-          install -m 0644 ${WORKDIR}/op_bluetooth-check.desktop ${D}${sysconfdir}/xdg/autostart/op_bluetooth-check.desktop
-
           install -d ${D}${sysconfdir}/pandora/conf/
           install -m 0644 ${WORKDIR}/gui.conf ${D}${sysconfdir}/pandora/conf/gui.conf
           install -m 0644 ${WORKDIR}/led.conf ${D}${sysconfdir}/pandora/conf/led.conf