* Created matrix-tui.inc to abstract the common recipe functionality. * Created the matrix-tui_1.0.bb recipe in place of the matrix-tui_svn.bb recipe. * This is to allow for multiple versions of this recipe to exist.
Signed-off-by: Chase Maupin <chase.mau...@ti.com> --- recipes/ti/matrix-tui.inc | 42 ++++++++++++++++++++++++++++++++++++++ recipes/ti/matrix-tui_1.0.bb | 5 ++++ recipes/ti/matrix-tui_svn.bb | 46 ------------------------------------------ 3 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 recipes/ti/matrix-tui.inc create mode 100644 recipes/ti/matrix-tui_1.0.bb delete mode 100644 recipes/ti/matrix-tui_svn.bb diff --git a/recipes/ti/matrix-tui.inc b/recipes/ti/matrix-tui.inc new file mode 100644 index 0000000..c8fd70d --- /dev/null +++ b/recipes/ti/matrix-tui.inc @@ -0,0 +1,42 @@ +DESCRIPTION = "Matrix TUI" +HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_tui/" +LICENSE = "BSD" +SECTION = "multimedia" +PRIORITY = "optional" +DEPENDS = "libxml2 zlib ncurses" + +INSANE_SKIP_${PN} = "True" + +SRC_URI = "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anonymous;pswd='' \ + file://init \ +" + +S = "${WORKDIR}/trunk" + +# Do not auto-start TUI by default, uncomment otherwise +#inherit update-rc.d +#INITSCRIPT_NAME = "matrix-tui" +#INITSCRIPT_PARAMS = "defaults 99" + +do_configure() { + sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:' makefile.init + sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk +} + +do_compile() { + # don't build debug version + touch debug + export CROSS_COMPILE=${TARGET_PREFIX} + export TUI_INCLUDE_PATH=${STAGING_INCDIR} + export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2 + export TUI_LIB_PATH=${STAGING_LIBDIR} + make release +} + +do_install() { + make DESTDIR=${D} install + install -d ${D}${sysconfdir}/init.d/ + install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-tui +} + +FILES_${PN} += "${datadir}/matrix/*" diff --git a/recipes/ti/matrix-tui_1.0.bb b/recipes/ti/matrix-tui_1.0.bb new file mode 100644 index 0000000..c82dc14 --- /dev/null +++ b/recipes/ti/matrix-tui_1.0.bb @@ -0,0 +1,5 @@ +require matrix-tui.inc + +SRCREV = "29" +PV = "1.0" +PR = "r4" diff --git a/recipes/ti/matrix-tui_svn.bb b/recipes/ti/matrix-tui_svn.bb deleted file mode 100644 index 4a223e4..0000000 --- a/recipes/ti/matrix-tui_svn.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Matrix TUI" -HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_tui/" -LICENSE = "BSD" -SECTION = "multimedia" -PRIORITY = "optional" -DEPENDS = "libxml2 zlib ncurses" - -SRCREV = "29" -PV = "1.0" -PR = "r3+svnr${SRCPV}" - -INSANE_SKIP_${PN} = "True" - -SRC_URI = "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anonymous;pswd='' \ - file://init \ -" - -S = "${WORKDIR}/trunk" - -# Do not auto-start TUI by default, uncomment otherwise -#inherit update-rc.d -#INITSCRIPT_NAME = "matrix-tui" -#INITSCRIPT_PARAMS = "defaults 99" - -do_configure() { - sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:' makefile.init - sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk -} - -do_compile() { - # don't build debug version - touch debug - export CROSS_COMPILE=${TARGET_PREFIX} - export TUI_INCLUDE_PATH=${STAGING_INCDIR} - export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2 - export TUI_LIB_PATH=${STAGING_LIBDIR} - make release -} - -do_install() { - make DESTDIR=${D} install - install -d ${D}${sysconfdir}/init.d/ - install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-tui -} - -FILES_${PN} += "${datadir}/matrix/*" -- 1.7.0.4 _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel