Re: [PATCH] matrix-demos: Recipes for Matrix demos for keystone 2 platforms

[Denys Dmytriyenko <denys@ti.com>]

Franklin, Sam,

Have you guys agreed on anything re: matrix-apps?


On Mon, Mar 17, 2014 at 04:59:36PM -0400, Cooper Jr., Franklin wrote:
> 
> 
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> > Sent: Monday, March 17, 2014 2:57 PM
> > To: Maupin, Chase
> > Cc: meta-arago@arago-project.org
> > Subject: Re: [meta-arago] [PATCH] matrix-demos: Recipes for Matrix demos for
> > keystone 2 platforms
> > 
> > On Mon, Mar 17, 2014 at 03:46:17PM -0400, Maupin, Chase wrote:
> > > >-----Original Message-----
> > > >From: Dmytriyenko, Denys
> > > >Sent: Monday, March 17, 2014 1:49 PM
> > > >To: Maupin, Chase
> > > >Cc: Nelson, Sam; meta-arago@arago-project.org
> > > >Subject: Re: [meta-arago] [PATCH] matrix-demos: Recipes for Matrix
> > > >demos for keystone 2 platforms
> > > >
> > > >On Fri, Mar 14, 2014 at 12:43:17PM +0000, Maupin, Chase wrote:
> > > >> >-----Original Message-----
> > > >> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > > >> >bounces@arago-project.org] On Behalf Of Nelson, Sam
> > > >> >Sent: Monday, March 03, 2014 2:02 PM
> > > >> >To: meta-arago@arago-project.org
> > > >> >Subject: [meta-arago] [PATCH] matrix-demos: Recipes for Matrix
> > > >> >demos for keystone 2 platforms
> > > >> >
> > > >> >- Recipes bring images and menus needed for keystone2 demos
> > > >>
> > > >> NAK
> > > >>
> > > >> These should be pushed to the shared matrix repositories.  There
> > > >is no
> > > >> reason to duplicate all these recipes and include files.  The
> > > >purpose of
> > > >> matrix being modular is to enable you to share and not fork.  If
> > > >you add
> > > >> these to the shared repo then you can create simple recipes to
> > > >package you
> > > >> individual demos and install those for ks2 devices.  Please
> > > >refer to how
> > > >> this is done for other devices.
> > > >
> > > >I don't get it. Specifically due to matrix being modular, it should
> > > >be possible to have additional demos in separate repositories - the
> > > >way it's done here. And the corresponding recipes that pull from
> > > >those additional repositories and package them up for matrix to use.
> > > >I don't see this as being a fork, I see this as being an out-of-tree
> > > >extenstion. Getting those extensions in to the main tree has some
> > > >benefits, but reduces control...

> [Franklin] We generally have this only occur when there is a non SDK team 
> that owns their application and Matrix demo that is pulled into an SDK. A 
> good example would be the Wilink demos. But there is no reasons why any team 
> that owns their own sdk can't sure the Matrix repo.
> 
> 
> > > It also tends to reduce re-use.  I think it is first worth looking
> > > into adding to the shared repo first.
> > 
> > Then we should outline the process to get 3rd-party changes to the matrix
> > repositories (patches, pull requests). Is Franklin the current owner?

> [Franklin] No issue in adding things to matrix or the matrix apps repo. 
> In terms of processes we can follow the same approach we have taken for all 
> of our scripts which is just sending patches to this mailing list.
> 
> > 
> > 
> > > Also, even if you want an external repo for additions it seems strange that
> > > the .inc files needed to be copied as well.  For example:
> > 
> > Indeed, I was not commenting on the recipes themselves, but on the method
> > to
> > add additional functionality to the matrix. Recipes do require more work.
> > 
> > 
> > > Matrix-gui-apps-ks2-git.inc is almost a direct copy of
> > > matrix-gui-apps-git.inc with the SRC_URI and SRCREV changed.  At a
> > mimimum
> > > why not inherit matrix-gui-apps-git.inc and change those few settings for
> > > your demos, images, submenu, etc recipes to inherit.
> > >
> > > For matrix-gui-apps-ks2.inc there are also a few changes that could either
> > > be common or look wrong and don't match the comments above the install
> > > function.  I'll send some additional feedback on that section.  The main
> > > changes I see are:
> > > 	1. changing the .sh scripts to be installed into the
> > > 	${MATRIX_APP_DIR}/$appdir/ directory instead of ${bindir}.  This is
> > > 	contrary to all other matrix apps.
> > > 	2. there seem to be .cgi files added and they are being installed into
> > > 	the root of the ${MATRIX_APP_DIR} even though the directory
> > > 	${MATRIX_APP_DIR}/$appdir/cgi-bin was created.
> > >
> > > These changed could be rolled into the generic .inc instead of forking.
> > >
> > > >
> > > >
> > > >> As a side note, if you were going to do tis you should break
> > > >this up into
> > > >> separate patches for the different recipes, not one mega patch
> > > >adding
> > > >> everything.  Also, you have recipes like matrix-gui-demos-demos
> > > >which
> > > >> doesn't seem right.
> > > >>
> > > >> >
> > > >> >Signed-off-by: Sam Nelson <sam.nelson@ti.com>
> > > >> >---
> > > >> > .../matrix/matrix-gui-apps-ks2-git.inc             |   13
> > > >+++++
> > > >> > .../matrix/matrix-gui-apps-ks2-images_2.0.bb       |   19
> > > >> >++++++++
> > > >> > .../recipes-core/matrix/matrix-gui-apps-ks2.inc    |   51
> > > >> >++++++++++++++++++++
> > > >> > .../matrix/matrix-gui-demos-demos_2.0.bb           |   18
> > > >+++++++
> > > >> > .../matrix/matrix-gui-submenus-ks2_2.0.bb          |   38
> > > >> >+++++++++++++++
> > > >> > .../matrix/matrix-gui-utility-demos_2.0.bb         |   18
> > > >+++++++
> > > >> > 6 files changed, 157 insertions(+)
> > > >> > create mode 100755 meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-apps-ks2-git.inc
> > > >> > create mode 100644 meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-apps-ks2-images_2.0.bb
> > > >> > create mode 100755 meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-apps-ks2.inc
> > > >> > create mode 100755 meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-demos-demos_2.0.bb
> > > >> > create mode 100755 meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-submenus-ks2_2.0.bb
> > > >> > create mode 100755 meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-utility-demos_2.0.bb
> > > >> >
> > > >> >diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >> >apps-ks2-git.inc b/meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-apps-ks2-git.inc
> > > >> >new file mode 100755
> > > >> >index 0000000..4a7b21d
> > > >> >--- /dev/null
> > > >> >+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-
> > > >ks2-
> > > >> >git.inc
> > > >> >@@ -0,0 +1,13 @@
> > > >> >+LICENSE = "CC-BY-SA"
> > > >> >+#By default all Matrix v2 applications use the same license.
> > > >> >+LICENSE_CHECKSUM =
> > > >"LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9"
> > > >> >+LIC_FILES_CHKSUM := "file://../${LICENSE_CHECKSUM}"
> > > >> >+
> > > >> >+BRANCH ?= "master"
> > > >> >+# commit corresponds to DEV.MATRIX.APPS.01.00.00.02
> > > >> >+SRCREV = "7af0ec5ad5ca9464a981b1c9683ec66bb075331d"
> > > >> >+SRC_URI = "git://git.ti.com/keystone-demos/matrix-
> > > >> >apps.git;protocol=git;branch=${BRANCH}"
> > > >> >+INC_PR = "r0"
> > > >> >+
> > > >> >+# Pull in the base package for installing matrix applications
> > > >> >+require matrix-gui-apps-ks2.inc
> > > >> >diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >> >apps-ks2-images_2.0.bb b/meta-arago-extras/recipes-
> > > >> >core/matrix/matrix-gui-apps-ks2-images_2.0.bb
> > > >> >new file mode 100644
> > > >> >index 0000000..cf69d81
> > > >> >--- /dev/null
> > > >> >+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-
> > > >ks2-
> > > >> >images_2.0.bb
> > > >> >@@ -0,0 +1,19 @@
> > > >> >+DESCRIPTION = "Images package for Matrix GUI v2 Applications
> > > >for
> > > >> >Keystone II"
> > > >> >+HOMEPAGE = "http://git.ti.com/cgit/cgit.cgi/keystone-
> > > >> >demos/matrix-apps.git"
> > > >> >+LICENSE = "CC-BY-SA"
> > > >> >+
> > > >> >+require matrix-gui-apps-ks2-git.inc
> > > >> >+require matrix-gui-paths.inc
> > > >> >+
> > > >> >+PR = "${INC_PR}.0"
> > > >> >+
> > > >> >+inherit allarch
> > > >> >+
> > > >> >+S = "${WORKDIR}/git/images"
> > > >> >+
> > > >> >+do_install(){
> > > >> >+    install -d ${D}${MATRIX_APP_DIR}
> > > >> >+    cp -rf ${S}/ ${D}${MATRIX_APP_DIR}
> > > >> >+}
> > > >> >+
> > > >> >+FILES_${PN} += "${MATRIX_BASE_DIR}/*"
> > > >> >diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >> >apps-ks2.inc b/meta-arago-extras/recipes-core/matrix/matrix-
> > > >gui-
> > > >> >apps-ks2.inc
> > > >> >new file mode 100755
> > > >> >index 0000000..fb3c866
> > > >> >--- /dev/null
> > > >> >+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-
> > > >> >ks2.inc
> > > >> >@@ -0,0 +1,51 @@
> > > >> >+require matrix-gui-paths.inc
> > > >> >+
> > > >> >+MATRIX_FILES_DIR ?= "${S}"
> > > >> >+
> > > >> >+# Append a generic function to the do_install step that will
> > > >look
> > > >> >in the
> > > >> >+# MATRIX_FILES_DIR for .desktop files and then:
> > > >> >+#   1.  Install all non-script files into the MATRIX_APP_DIR
> > > >> >+#   2.  Install all script files into ${bindir}
> > > >> >+do_install_append(){
> > > >> >+    cd ${MATRIX_FILES_DIR}
> > > >> >+    applist=`find . -name "*.desktop"`
> > > >> >+
> > > >> >+    for app in $applist
> > > >> >+    do
> > > >> >+        appdir=`dirname $app`
> > > >> >+        install -d ${D}${MATRIX_APP_DIR}/$appdir
> > > >> >+
> > > >> >+        # Get the matrix metadata
> > > >> >+        matrix_desktop=`find $appdir -type f -name
> > > >"*.desktop"`
> > > >> >+        for m in $matrix_desktop
> > > >> >+        do
> > > >> >+            install -m 0644 ${MATRIX_FILES_DIR}/$m
> > > >> >${D}${MATRIX_APP_DIR}/$appdir/
> > > >> >+        done
> > > >> >+
> > > >> >+        matrix_html=`find $appdir -type f -name  "*.html"`
> > > >> >+        for m in $matrix_html
> > > >> >+        do
> > > >> >+            install -m 0644 ${MATRIX_FILES_DIR}/$m
> > > >> >${D}${MATRIX_APP_DIR}/$appdir/
> > > >> >+        done
> > > >> >+
> > > >> >+        # Get the script files as executables
> > > >> >+        scripts=`find $appdir -type f -name "*.sh"`
> > > >> >+        for s in $scripts
> > > >> >+        do
> > > >> >+            install -m 0755 ${MATRIX_FILES_DIR}/$s
> > > >> >${D}${MATRIX_APP_DIR}/$appdir/
> > > >> >+        done
> > > >> >+
> > > >> >+        # Get the cgi files as executables
> > > >> >+        matrix_cgi=`find $appdir -type f -name "*.cgi"`
> > > >> >+
> > > >> >+        for c in $matrix_cgi
> > > >> >+        do
> > > >> >+            install -d ${D}${MATRIX_APP_DIR}/$appdir/cgi-bin
> > > >> >+            install -m 0755 ${MATRIX_FILES_DIR}/$c
> > > >> >${D}${MATRIX_APP_DIR}/$c
> > > >> >+        done
> > > >> >+    done
> > > >> >+
> > > >> >+    # Go back to the directory we started from in case there
> > > >are
> > > >> >+    # other appends.
> > > >> >+    cd -
> > > >> >+}
> > > >> >diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >> >demos-demos_2.0.bb b/meta-arago-extras/recipes-
> > > >core/matrix/matrix-
> > > >> >gui-demos-demos_2.0.bb
> > > >> >new file mode 100755
> > > >> >index 0000000..eb89cca
> > > >> >--- /dev/null
> > > >> >+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-demos-
> > > >> >demos_2.0.bb
> > > >> >@@ -0,0 +1,18 @@
> > > >> >+DESCRIPTION = "Demo description for Matrix v2"
> > > >> >+HOMEPAGE = "http://git.ti.com/cgit/cgit.cgi/keystone-
> > > >> >demos/matrix-apps.git"
> > > >> >+LICENSE = "CC-BY-SA"
> > > >> >+
> > > >> >+require matrix-gui-apps-ks2-git.inc
> > > >> >+
> > > >> >+PR = "${INC_PR}.0"
> > > >> >+
> > > >> >+inherit allarch
> > > >> >+
> > > >> >+S = "${WORKDIR}/git/demo_apps"
> > > >> >+
> > > >> >+PACKAGES += "${PN}-demos"
> > > >> >+
> > > >> >+# Make sure crypto submenu and app images has been installed.
> > > >> >Also make sure openssl is available
> > > >> >+RDEPENDS_${PN} += "matrix-gui-apps-ks2-images matrix-gui-
> > > >> >submenus-ks2-demos"
> > > >> >+
> > > >> >+FILES_${PN} += "${MATRIX_BASE_DIR}/*"
> > > >> >diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >> >submenus-ks2_2.0.bb b/meta-arago-extras/recipes-
> > > >> >core/matrix/matrix-gui-submenus-ks2_2.0.bb
> > > >> >new file mode 100755
> > > >> >index 0000000..2936ad1
> > > >> >--- /dev/null
> > > >> >+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >submenus-
> > > >> >ks2_2.0.bb
> > > >> >@@ -0,0 +1,38 @@
> > > >> >+DESCRIPTION = "Submenu packages for Matrix GUI v2 for Keystone
> > > >> >II"
> > > >> >+HOMEPAGE = "http://git.ti.com/cgit/cgit.cgi/keystone-
> > > >> >demos/matrix-apps.git"
> > > >> >+LICENSE = "CC-BY-SA"
> > > >> >+
> > > >> >+require matrix-gui-apps-ks2-git.inc
> > > >> >+require matrix-gui-paths.inc
> > > >> >+
> > > >> >+# This package does not use a subdirectory as ${S} so we need
> > > >to
> > > >> >+# reset the LIC_FILES_CHKSUM setting from the matrix-gui-apps-
> > > >> >git.inc file
> > > >> >+LIC_FILES_CHKSUM =
> > > >> >"file://LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9"
> > > >> >+
> > > >> >+PR = "${INC_PR}.0"
> > > >> >+
> > > >> >+# These packages make submenus in matrix and are not
> > > >architecture
> > > >> >specific
> > > >> >+inherit allarch
> > > >> >+
> > > >> >+S = "${WORKDIR}/git"
> > > >> >+
> > > >> >+# List of submenus to build packages for
> > > >> >+SUBMENUS = "utilities_submenu demos_submenu"
> > > >> >+
> > > >> >+do_install(){
> > > >> >+    install -d ${D}${MATRIX_APP_DIR}
> > > >> >+
> > > >> >+    for x in ${SUBMENUS}
> > > >> >+    do
> > > >> >+        cp -rf ${S}/$x ${D}${MATRIX_APP_DIR}/
> > > >> >+    done
> > > >> >+}
> > > >> >+
> > > >> >+PACKAGES += "${PN}-utility ${PN}-demos"
> > > >> >+
> > > >> >+# Make sure app images has been installed
> > > >> >+RDEPENDS_${PN} += "matrix-gui-apps-ks2-images"
> > > >> >+
> > > >> >+# Add the files for each submenu package
> > > >> >+FILES_${PN}-utility = "${MATRIX_APP_DIR}/utilities_submenu/*"
> > > >> >+FILES_${PN}-demos = "${MATRIX_APP_DIR}/demos_submenu/*"
> > > >> >diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
> > > >> >utility-demos_2.0.bb b/meta-arago-extras/recipes-
> > > >> >core/matrix/matrix-gui-utility-demos_2.0.bb
> > > >> >new file mode 100755
> > > >> >index 0000000..8f769e9
> > > >> >--- /dev/null
> > > >> >+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-
> > > >> >demos_2.0.bb
> > > >> >@@ -0,0 +1,18 @@
> > > >> >+DESCRIPTION = "Utility app demo descriptions for Matrix v2"
> > > >> >+HOMEPAGE = "http://git.ti.com/cgit/cgit.cgi/keystone-
> > > >> >demos/matrix-apps.git"
> > > >> >+LICENSE = "CC-BY-SA"
> > > >> >+
> > > >> >+require matrix-gui-apps-ks2-git.inc
> > > >> >+
> > > >> >+PR = "${INC_PR}.0"
> > > >> >+
> > > >> >+inherit allarch
> > > >> >+
> > > >> >+S = "${WORKDIR}/git/utility_apps"
> > > >> >+
> > > >> >+PACKAGES += "${PN}-utility"
> > > >> >+
> > > >> >+# Make sure crypto submenu and app images has been installed.
> > > >> >Also make sure openssl is available
> > > >> >+RDEPENDS_${PN} += "matrix-gui-apps-ks2-images matrix-gui-
> > > >> >submenus-ks2-utility"
> > > >> >+
> > > >> >+FILES_${PN} += "${MATRIX_BASE_DIR}/*"
> > > >> >--
> > > >> >1.7.9.5
> > > >> >
> > > >> >_______________________________________________
> > > >> >meta-arago mailing list
> > > >> >meta-arago@arago-project.org
> > > >> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > > >> _______________________________________________
> > > >> meta-arago mailing list
> > > >> meta-arago@arago-project.org
> > > >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago