matrix 2.0: first round of fixes

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

12 files changed, 29 insertions, 47 deletions

diff --git a/recipes-ti/matrix/matrix-gui-3d-demos_1.0.bb b/recipes-ti/matrix/matrix-gui-3d-demos_1.0.bb
index c653c6fc..ece9b2e1 100644
--- a/recipes-ti/matrix/matrix-gui-3d-demos_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-3d-demos_1.0.bb
@@ -1,9 +1,7 @@
 DESCRIPTION = "3D demo descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/603/5030/3ddemos_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui-clocks_1.0.bb b/recipes-ti/matrix/matrix-gui-clocks_1.0.bb
index 2b5c1b3f..177a617b 100644
--- a/recipes-ti/matrix/matrix-gui-clocks_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-clocks_1.0.bb
@@ -1,11 +1,8 @@
 DESCRIPTION = "Clock setting descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
-
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/612/5031/clocks_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui-coming-soon_1.0.bb b/recipes-ti/matrix/matrix-gui-coming-soon_1.0.bb
index 076388d4..500eee47 100644
--- a/recipes-ti/matrix/matrix-gui-coming-soon_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-coming-soon_1.0.bb
@@ -1,15 +1,13 @@
 DESCRIPTION = "coming soon descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
+LIC_FILES_CHKSUM = "file://comingsoon/comingsoon.desktop;md5=01ebad171fad40705288fcabccc770a2"
 
-PR = "r0"
-
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/616/5029/comingsoon_1.0.tar.gz"
 
-S = ${WORKDIR}
+S = "${WORKDIR}"
 
 require matrix-gui-apps.inc
 
diff --git a/recipes-ti/matrix/matrix-gui-common_1.4.bb b/recipes-ti/matrix/matrix-gui-common_1.4.bb
index add2a261..018f7af3 100644
--- a/recipes-ti/matrix/matrix-gui-common_1.4.bb
+++ b/recipes-ti/matrix/matrix-gui-common_1.4.bb
@@ -5,4 +5,3 @@ require matrix-gui-common.inc
 RRECOMMENDS_${PN} = "am-sysinfo"
 
 SRCREV = "275"
-PR = "${INC_PR}.6"
diff --git a/recipes-ti/matrix/matrix-gui-crypto-demos_1.0.bb b/recipes-ti/matrix/matrix-gui-crypto-demos_1.0.bb
index 11589b39..13e97061 100644
--- a/recipes-ti/matrix/matrix-gui-crypto-demos_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-crypto-demos_1.0.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "Cryptography demo descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
 
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/609/5033/cryptodemos_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui-display-control_1.0.bb b/recipes-ti/matrix/matrix-gui-display-control_1.0.bb
index 72c7d62a..c9f1bdb7 100644
--- a/recipes-ti/matrix/matrix-gui-display-control_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-display-control_1.0.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "Display control descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
 
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/611/5034/displaycontrol_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui-e_1.3.bb b/recipes-ti/matrix/matrix-gui-e_1.3.bb
index bddb3e03..b4797b05 100644
--- a/recipes-ti/matrix/matrix-gui-e_1.3.bb
+++ b/recipes-ti/matrix/matrix-gui-e_1.3.bb
@@ -3,5 +3,4 @@ require matrix-gui-e.inc
 SRCREV = "275"
 SRC_URI += "file://0001-matrix_gui.pro-add-dbus-to-QT-features-to-fix-linkin.patch"
 
-PR = "${INC_PR}.1"
 
diff --git a/recipes-ti/matrix/matrix-gui-pm-demos_1.0.bb b/recipes-ti/matrix/matrix-gui-pm-demos_1.0.bb
index f11ac940..85d251fc 100644
--- a/recipes-ti/matrix/matrix-gui-pm-demos_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-pm-demos_1.0.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "Power management demo descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
 
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/610/5035/pmdemos_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui-qt4-demos_1.0.bb b/recipes-ti/matrix/matrix-gui-qt4-demos_1.0.bb
index fd941043..e4e43c7d 100644
--- a/recipes-ti/matrix/matrix-gui-qt4-demos_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-qt4-demos_1.0.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "Qt4 demo descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
 
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/608/5036/qt4demos_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui-submenus_1.0.bb b/recipes-ti/matrix/matrix-gui-submenus_1.0.bb
index c62e5fb8..b517ce2b 100644
--- a/recipes-ti/matrix/matrix-gui-submenus_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-submenus_1.0.bb
@@ -1,14 +1,12 @@
 DESCRIPTION = "Submenu packages for Matrix GUI v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
-
-PR = "r0"
+LIC_FILES_CHKSUM = "file://settings/settings.desktop;md5=a447e92dfe653e63e5b91b305e969d6c"
 
 require matrix-gui-paths.inc
 
 # These packages make submenus in matrix and are not architecture specific
-PACKAGE_ARCH = "all"
+inherit allarch
 
 # List of submenu tarballs to use.  Each tarball contains a desktop file
 # and PNG graphic file for the submenu.
@@ -45,6 +43,9 @@ PACKAGES += "${PN}-arm ${PN}-3d ${PN}-cryptos ${PN}-display ${PN}-ethernet ${PN}
 # All submenu packages should depend on matrix-gui being installed
 RDEPENDS +=  matrix-gui
 
+RRECOMMENDS_${PN} = "${PN}-arm ${PN}-3d ${PN}-cryptos ${PN}-display ${PN}-ethernet ${PN}-multimedia ${PN}-power ${PN}-pru ${PN}-qt4 ${PN}-settings ${PN}-usb ${PN}-wifi"
+ALLOW_EMPTY_${PN} = "1"
+
 # Add the files for each submenu package
 FILES_${PN}-arm = "${MATRIX_APP_DIR}/arm/*"
 FILES_${PN}-3d = "${MATRIX_APP_DIR}/3d/*"
diff --git a/recipes-ti/matrix/matrix-gui-wifi-demos_1.0.bb b/recipes-ti/matrix/matrix-gui-wifi-demos_1.0.bb
index f33cba1b..f1041b07 100644
--- a/recipes-ti/matrix/matrix-gui-wifi-demos_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-wifi-demos_1.0.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "Wifi demo descriptions for Matrix v2"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrixguiv2apps/"
 LICENSE = "CC-BY-SA"
-PRIORITY = "optional"
 
-PR = "r0"
 
-PACKAGE_ARCH = "all"
+inherit allarch
 
 SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/617/5049/wifi_1.0.tar.gz"
 
diff --git a/recipes-ti/matrix/matrix-gui_2.0.bb b/recipes-ti/matrix/matrix-gui_2.0.bb
index 378a1f9e..f9981b4c 100644
--- a/recipes-ti/matrix/matrix-gui_2.0.bb
+++ b/recipes-ti/matrix/matrix-gui_2.0.bb
@@ -1,23 +1,20 @@
 DESCRIPTION = "Matrix GUI Application launcher"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrix-gui-v2/"
-LICENSE = "BSD MIT Apache"
-SECTION = "multimedia"
-PRIORITY = "optional"
 
-PR = "r3"
+LICENSE = "BSD MIT Apache"
+LIC_FILES_CHKSUM = "file://scripts/jquery-1.6.2.min.js;md5=a1a8cb16a060f6280a767187fd22e037"
 
-INITSCRIPT_NAME = "matrix-gui-2.0"
-INITSCRIPT_PARAMS = "defaults 99"
+SECTION = "multimedia"
 
-PACKAGE_ARCH = "all"
+PR = "r1"
 
-inherit update-rc.d
+inherit allarch
 
 BRANCH ?= "master"
 SRCREV = "c6db82baffcd96b20e67aa5cfdb4c0c98ef208b9"
 
 SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH} \
-           file://init"
+           file://matrix-gui.service"
 
 require matrix-gui-paths.inc
 
@@ -28,12 +25,15 @@ do_install(){
         cp -rf ${S}/* ${D}${MATRIX_BASE_DIR}
 
     # Set the proper path in the init script
-    sed -i -e s=__MATRIX_BASE_DIR__=${MATRIX_BASE_DIR}= ${WORKDIR}/init
+    sed -i -e s=__MATRIX_BASE_DIR__=${MATRIX_BASE_DIR}=g ${WORKDIR}/matrix-gui.service
 
-        install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui-2.0
-}
+        install -d ${D}${base_libdir}/systemd/system/
+    install -m 0755 ${WORKDIR}/matrix-gui.service ${D}${base_libdir}/systemd/system/
 
-RDEPENDS_${PN} += nodejs
+        # activate it on first boot
+        install -d ${D}${base_libdir}/systemd/system/multi-user.target.wants
+        ln -sf ../matrix-gui.service ${D}${base_libdir}/systemd/system/multi-user.target.wants/
+}
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+RDEPENDS_${PN} += "nodejs"
+FILES_${PN} += "${MATRIX_BASE_DIR}/* ${base_libdir}/systemd/system"