summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2011-11-24 22:15:59 +0100
committerJuergen Beisert <jbe@pengutronix.de>2012-07-17 16:52:50 +0200
commit5c2d144e8dfdf4ed7d981f80e17642fd21c78a62 (patch)
treedf80096317c2537bb11442954f8442e9310acd71
parent3db0b065e2ca7d455dadc9b7ad60f9e9ea274100 (diff)
downloadOSELAS.BSP-Pengutronix-Mini6410-5c2d144e8dfdf4ed7d981f80e17642fd21c78a62.tar.gz
OSELAS.BSP-Pengutronix-Mini6410-5c2d144e8dfdf4ed7d981f80e17642fd21c78a62.tar.xz
QML demo: add QML demo from the Mini2440 project
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--CONTRIBUTORS6
-rw-r--r--Changelog4
-rw-r--r--configs/ptxconfig.qt5
-rw-r--r--local_src/qml-demo-master/init/systemd/qmldemo.service10
-rw-r--r--local_src/qml-demo-master/init/sysv/startup12
-rw-r--r--local_src/qml-demo-master/qml-demo.pro15
-rw-r--r--local_src/qml-demo-master/qml/main.qml157
-rw-r--r--local_src/qml-demo-master/src/main.cpp34
-rw-r--r--local_src/qt4-demo-master/config.ui (renamed from local_src/qt4-demo-2011.11.0/config.ui)0
-rw-r--r--local_src/qt4-demo-master/configdialog.cpp (renamed from local_src/qt4-demo-2011.11.0/configdialog.cpp)0
-rw-r--r--local_src/qt4-demo-master/configdialog.h (renamed from local_src/qt4-demo-2011.11.0/configdialog.h)0
-rw-r--r--local_src/qt4-demo-master/init/systemd/qt4demo.service10
-rw-r--r--local_src/qt4-demo-master/init/sysv/startup (renamed from projectroot/etc/init.d/startup)0
-rw-r--r--local_src/qt4-demo-master/main.cpp (renamed from local_src/qt4-demo-2011.11.0/main.cpp)0
-rw-r--r--local_src/qt4-demo-master/mainwindow.ui (renamed from local_src/qt4-demo-2011.11.0/mainwindow.ui)0
-rw-r--r--local_src/qt4-demo-master/plotdata.cpp (renamed from local_src/qt4-demo-2011.11.0/plotdata.cpp)0
-rw-r--r--local_src/qt4-demo-master/plotdata.h (renamed from local_src/qt4-demo-2011.11.0/plotdata.h)0
-rw-r--r--local_src/qt4-demo-master/plothandler.cpp (renamed from local_src/qt4-demo-2011.11.0/plothandler.cpp)0
-rw-r--r--local_src/qt4-demo-master/plothandler.h (renamed from local_src/qt4-demo-2011.11.0/plothandler.h)0
-rw-r--r--local_src/qt4-demo-master/qt4-demo-load (renamed from local_src/qt4-demo-2011.11.0/qt4-demo-load)0
-rw-r--r--local_src/qt4-demo-master/qt4-demo.pro (renamed from local_src/qt4-demo-2011.11.0/qt4-demo.pro)0
-rw-r--r--rules/mini6410-demo.in59
-rw-r--r--rules/qml-demo.make92
-rw-r--r--rules/qt4-demo.in16
-rw-r--r--rules/qt4-demo.make16
-rw-r--r--rules/startup.in8
-rw-r--r--rules/startup.make91
27 files changed, 418 insertions, 117 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 28cf63c..ee1b730 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -8,3 +8,9 @@ N: Tomasz Figa
E: tomasz.figa@gmail.com
D: Developer
S: Poland
+
+N: Josef Holzmayr
+E: holzmayr@rsi-elektrotechnik.de
+D: Developer
+W: www.rsi-elektrotechnik.de
+S: Germany
diff --git a/Changelog b/Changelog
index 2ba0f23..fc11100 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+2011-11-24 Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
+
+ * QML demo: add QML demo from the Mini2440 project
+
2011-11-24 Juergen Beisert <jbe@pengutronix.de>
* BSP: add the long outstanding licence
diff --git a/configs/ptxconfig.qt b/configs/ptxconfig.qt
index 6ea97b2..c9361fa 100644
--- a/configs/ptxconfig.qt
+++ b/configs/ptxconfig.qt
@@ -1688,8 +1688,11 @@ PTXCONF_FBUTILS_FBCONVERT=y
#
# PTXCONF_ARORA is not set
# PTXCONF_LIBQXT is not set
-# PTXCONF_PYSIDE is not set
+PTXCONF_MINI6410_DEMO=y
PTXCONF_QT4_DEMO=y
+# PTXCONF_QML_DEMO is not set
+PTXCONF_MINI6410_DEMO_STARTUP_SCRIPT=y
+# PTXCONF_PYSIDE is not set
# PTXCONF_QT4_DEMOS is not set
# PTXCONF_QT4_EXAMPLES is not set
PTXCONF_QT4=y
diff --git a/local_src/qml-demo-master/init/systemd/qmldemo.service b/local_src/qml-demo-master/init/systemd/qmldemo.service
new file mode 100644
index 0000000..cb0fbf9
--- /dev/null
+++ b/local_src/qml-demo-master/init/systemd/qmldemo.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=QML Demo Application
+After=dev-input-event1.device
+
+[Service]
+Environment=QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen
+ExecStart=/usr/bin/qml-demo -qws
+
+[Install]
+WantedBy=multi-user.target
diff --git a/local_src/qml-demo-master/init/sysv/startup b/local_src/qml-demo-master/init/sysv/startup
new file mode 100644
index 0000000..26ca4db
--- /dev/null
+++ b/local_src/qml-demo-master/init/sysv/startup
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+# get important environment variables first
+. /etc/profile.environment
+
+case $1 in
+
+ start)
+ /usr/bin/qml-demo -qws &
+ ;;
+
+esac
diff --git a/local_src/qml-demo-master/qml-demo.pro b/local_src/qml-demo-master/qml-demo.pro
new file mode 100644
index 0000000..87b13a2
--- /dev/null
+++ b/local_src/qml-demo-master/qml-demo.pro
@@ -0,0 +1,15 @@
+CONFIG += qt
+
+TARGET = qml-demo
+
+SOURCES = src/main.cpp
+FORMS =
+HEADERS =
+
+QT += declarative
+
+MOC_DIR = moc
+
+OTHER_FILES += \
+ qml/main.qml
+
diff --git a/local_src/qml-demo-master/qml/main.qml b/local_src/qml-demo-master/qml/main.qml
new file mode 100644
index 0000000..c2c7e62
--- /dev/null
+++ b/local_src/qml-demo-master/qml/main.qml
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2011 Josef Holzmayr, holzmayr@rsi-elektrotechnik.de
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+import QtQuick 1.0
+
+Rectangle {
+ id: page
+ color: "grey"
+ width: 320
+ height: 240
+
+ property int boxsize: 50
+ property int markersize: 30
+ property int borderoffset: 10
+ property int boxoffset: (boxsize - markersize) / 2
+
+ Rectangle {
+ id: rectTL
+ width: boxsize
+ height: boxsize
+ color: "#00000000"
+ anchors.left: parent.left
+ anchors.leftMargin: borderoffset
+ anchors.top: parent.top
+ anchors.topMargin: borderoffset
+ border.color: "#000000"
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: page.state = 'TL'
+ }
+ }
+ Rectangle {
+ id: rectTR
+ width: boxsize
+ height: boxsize
+ color: "#00000000"
+ anchors.top: parent.top
+ anchors.topMargin: borderoffset
+ anchors.right: parent.right
+ anchors.rightMargin: borderoffset
+ border.color: "#000000"
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: page.state = 'TR'
+ }
+ }
+ Rectangle {
+ id: rectBL
+ width: boxsize
+ height: boxsize
+ color: "#00000000"
+ anchors.left: parent.left
+ anchors.leftMargin: borderoffset
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: borderoffset
+ border.color: "#000000"
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: page.state = 'BL'
+ }
+ }
+ Rectangle {
+ id: rectBR
+ width: boxsize
+ height: boxsize
+ color: "#00000000"
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: borderoffset
+ anchors.right: parent.right
+ anchors.rightMargin: borderoffset
+ border.color: "#000000"
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: page.state = 'BR'
+ }
+ }
+
+ Rectangle {
+ id: marker
+ x: (page.width / 2) - (marker.width / 2)
+ y: (page.height / 2) - (marker.height / 2)
+ width: markersize
+ height: markersize
+ color: "#ff0000"
+ }
+
+ Text {
+ id: text1
+ text: qsTr("Touch the black squares to move the red marker.")
+ anchors.right: parent.right
+ anchors.rightMargin: borderoffset
+ anchors.left: parent.left
+ anchors.leftMargin: borderoffset
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: (borderoffset * 2) + boxsize
+ anchors.top: parent.top
+ anchors.topMargin: (borderoffset * 2) + boxsize
+ wrapMode: Text.WordWrap
+ horizontalAlignment: Text.AlignHCenter
+ font.family: "Arial Black"
+ font.underline: true
+ font.pixelSize: 12
+ }
+ states: [
+ State {
+ name: "TL"
+
+ PropertyChanges {
+ target: marker
+ x: rectTL.x + boxoffset
+ y: rectTL.y + boxoffset
+ }
+ },
+ State {
+ name: "TR"
+ PropertyChanges {
+ target: marker
+ x: rectTR.x + boxoffset
+ y: rectTR.y + boxoffset
+ }
+ },
+ State {
+ name: "BL"
+ PropertyChanges {
+ target: marker
+ x: rectBL.x + boxoffset
+ y: rectBL.y + boxoffset
+ }
+ },
+ State {
+ name: "BR"
+ PropertyChanges {
+ target: marker
+ x: rectBR.x + boxoffset
+ y: rectBR.y + boxoffset
+ }
+ }
+ ]
+
+ transitions: Transition {
+ NumberAnimation { properties: "x, y"; easing.type: Easing.InOutQuad; duration: 500 }
+ }
+}
diff --git a/local_src/qml-demo-master/src/main.cpp b/local_src/qml-demo-master/src/main.cpp
new file mode 100644
index 0000000..8036f8b
--- /dev/null
+++ b/local_src/qml-demo-master/src/main.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 Josef Holzmayr, holzmayr@rsi-elektrotechnik.de
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <QtGui/QApplication>
+#include <QDeclarativeView>
+#include <QWSServer>
+
+int main(int argc, char **argv)
+{
+
+ QApplication app(argc, argv);
+
+/* Hide the mouse cursor. Guards are there to enable compileability on non-embedded qt systems*/
+#ifdef Q_WS_QWS
+ QWSServer::setCursorVisible( false );
+#endif
+
+ QDeclarativeView *qdv = new QDeclarativeView;
+ qdv->setSource(QUrl::fromLocalFile("/usr/lib/qml-demo/main.qml"));
+ qdv->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+ qdv->showFullScreen();
+
+ return app.exec();;
+}
diff --git a/local_src/qt4-demo-2011.11.0/config.ui b/local_src/qt4-demo-master/config.ui
index bc5c272..bc5c272 100644
--- a/local_src/qt4-demo-2011.11.0/config.ui
+++ b/local_src/qt4-demo-master/config.ui
diff --git a/local_src/qt4-demo-2011.11.0/configdialog.cpp b/local_src/qt4-demo-master/configdialog.cpp
index 10e265e..10e265e 100644
--- a/local_src/qt4-demo-2011.11.0/configdialog.cpp
+++ b/local_src/qt4-demo-master/configdialog.cpp
diff --git a/local_src/qt4-demo-2011.11.0/configdialog.h b/local_src/qt4-demo-master/configdialog.h
index 8fc9b29..8fc9b29 100644
--- a/local_src/qt4-demo-2011.11.0/configdialog.h
+++ b/local_src/qt4-demo-master/configdialog.h
diff --git a/local_src/qt4-demo-master/init/systemd/qt4demo.service b/local_src/qt4-demo-master/init/systemd/qt4demo.service
new file mode 100644
index 0000000..63ec836
--- /dev/null
+++ b/local_src/qt4-demo-master/init/systemd/qt4demo.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Qt4 Demo Application
+After=dev-input-event1.device
+
+[Service]
+Environment=QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen
+ExecStart=/usr/bin/qt4-demo -qws
+
+[Install]
+WantedBy=multi-user.target
diff --git a/projectroot/etc/init.d/startup b/local_src/qt4-demo-master/init/sysv/startup
index 3b27a32..3b27a32 100644
--- a/projectroot/etc/init.d/startup
+++ b/local_src/qt4-demo-master/init/sysv/startup
diff --git a/local_src/qt4-demo-2011.11.0/main.cpp b/local_src/qt4-demo-master/main.cpp
index d7dc180..d7dc180 100644
--- a/local_src/qt4-demo-2011.11.0/main.cpp
+++ b/local_src/qt4-demo-master/main.cpp
diff --git a/local_src/qt4-demo-2011.11.0/mainwindow.ui b/local_src/qt4-demo-master/mainwindow.ui
index 1fafb5d..1fafb5d 100644
--- a/local_src/qt4-demo-2011.11.0/mainwindow.ui
+++ b/local_src/qt4-demo-master/mainwindow.ui
diff --git a/local_src/qt4-demo-2011.11.0/plotdata.cpp b/local_src/qt4-demo-master/plotdata.cpp
index 6ef1bcf..6ef1bcf 100644
--- a/local_src/qt4-demo-2011.11.0/plotdata.cpp
+++ b/local_src/qt4-demo-master/plotdata.cpp
diff --git a/local_src/qt4-demo-2011.11.0/plotdata.h b/local_src/qt4-demo-master/plotdata.h
index f2ebc38..f2ebc38 100644
--- a/local_src/qt4-demo-2011.11.0/plotdata.h
+++ b/local_src/qt4-demo-master/plotdata.h
diff --git a/local_src/qt4-demo-2011.11.0/plothandler.cpp b/local_src/qt4-demo-master/plothandler.cpp
index 90d3924..90d3924 100644
--- a/local_src/qt4-demo-2011.11.0/plothandler.cpp
+++ b/local_src/qt4-demo-master/plothandler.cpp
diff --git a/local_src/qt4-demo-2011.11.0/plothandler.h b/local_src/qt4-demo-master/plothandler.h
index d860d39..d860d39 100644
--- a/local_src/qt4-demo-2011.11.0/plothandler.h
+++ b/local_src/qt4-demo-master/plothandler.h
diff --git a/local_src/qt4-demo-2011.11.0/qt4-demo-load b/local_src/qt4-demo-master/qt4-demo-load
index 929c288..929c288 100644
--- a/local_src/qt4-demo-2011.11.0/qt4-demo-load
+++ b/local_src/qt4-demo-master/qt4-demo-load
diff --git a/local_src/qt4-demo-2011.11.0/qt4-demo.pro b/local_src/qt4-demo-master/qt4-demo.pro
index 2f00dc7..2f00dc7 100644
--- a/local_src/qt4-demo-2011.11.0/qt4-demo.pro
+++ b/local_src/qt4-demo-master/qt4-demo.pro
diff --git a/rules/mini6410-demo.in b/rules/mini6410-demo.in
new file mode 100644
index 0000000..8163ece
--- /dev/null
+++ b/rules/mini6410-demo.in
@@ -0,0 +1,59 @@
+## SECTION=qt
+
+menuconfig MINI6410_DEMO
+ tristate
+ prompt "Mini6410 related Qt demos "
+ help
+ Enable this entry to get simple Mini6410 related Qt4 demos running at
+ startup on your target.
+
+if MINI6410_DEMO
+
+choice
+ prompt "Demo type"
+ default QT4_DEMO
+
+ config QT4_DEMO
+ select QT4
+ select RC_ONCE
+ select QT4_MOUSE_TSLIB
+ select QWT
+ bool
+ prompt "Qt4/QWT demo"
+ help
+ Enable this entry to get a simple Qt4/QWT demo running at startup on
+ your target. It can act as a simple example how to integrate your
+ own Qt4 based application into this PTXdist project.
+ Part of this entry is the installation of a start script that runs
+ this Qt4 application when the system starts.
+
+ config QML_DEMO
+ select QT4
+ select RC_ONCE
+ select QT4_MOUSE_TSLIB
+ select QT4_BUILD_DECLARATIVE
+ bool
+ prompt "Qt4/QML demo"
+ help
+ Enable this entry to get a simple QML demo running on
+ your target. It can act as a simple example how to integrate
+ your own QML based application into this PTXdist project.
+ Part of this entry is the installation of a start script that runs
+ this Qt4 application when the system starts.
+
+endchoice
+
+config MINI6410_DEMO_STARTUP_SCRIPT
+ bool
+ default y
+ depends on INITMETHOD_BBINIT
+ prompt "install a startup script for the demo"
+
+config MINI6410_DEMO_SYSTEMD_UNIT
+ bool
+ default y
+ depends on INITMETHOD_SYSTEMD
+ prompt "install systemd unit files for the demo"
+
+endif
+
diff --git a/rules/qml-demo.make b/rules/qml-demo.make
new file mode 100644
index 0000000..f4935e1
--- /dev/null
+++ b/rules/qml-demo.make
@@ -0,0 +1,92 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2009 by Michael Olbrich <m.olbrich@pengutronix.de>
+# Copyright (C) 2011 by Juergen Beisert <jbe@pengutronix.de>
+# Copyright (C) 2011 by Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_QML_DEMO) += qml-demo
+
+#
+# Paths and names
+#
+QML_DEMO_VERSION := master
+QML_DEMO := qml-demo-$(QML_DEMO_VERSION)
+QML_DEMO_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(QML_DEMO)
+QML_DEMO_DIR := $(BUILDDIR)/$(QML_DEMO)
+QML_DEMO_BUILD_OOT := YES
+QML_DEMO_BUILDDIR := $(BUILDDIR)/$(QML_DEMO)-build
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(QML_DEMO_SOURCE):
+ @$(call targetinfo)
+ @$(call get, QML_DEMO)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/qml-demo.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, qml-demo)
+ @$(call install_fixup, qml-demo,PACKAGE,qml-demo)
+ @$(call install_fixup, qml-demo,PRIORITY,optional)
+ @$(call install_fixup, qml-demo,VERSION,$(QML_DEMO_VERSION))
+ @$(call install_fixup, qml-demo,SECTION,base)
+ @$(call install_fixup, qml-demo,AUTHOR,"Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>")
+ @$(call install_fixup, qml-demo,DEPENDS,)
+ @$(call install_fixup, qml-demo,DESCRIPTION, "Simple QML Demo App")
+
+# install the essentials of this build to the target
+ @$(call install_copy, qml-demo, 0, 0, 0755, \
+ $(QML_DEMO_BUILDDIR)/qml-demo, \
+ /usr/bin/qml-demo)
+
+ @$(call install_copy, qml-demo, 0, 0, 0755, /usr/lib/qml-demo)
+
+# copy the QML tree to the target as-is.
+ @$(call install_tree, qml-demo, 0, 0, $(QML_DEMO_DIR)/qml, \
+ /usr/lib/qml-demo)
+ @$(call install_alternative, qml-demo, 0, 0, 0755, \
+ /etc/rc.once.d/tscalibrate)
+
+ifdef PTXCONF_MINI6410_DEMO_SYSTEMD_UNIT
+ @$(call install_copy, qml-demo, 0, 0, 0644, \
+ $(QML_DEMO_DIR)/init/systemd/qmldemo.service, \
+ /lib/systemd/system/qmldemo.service)
+ @$(call install_link, qml-demo, ../qmldemo.service, \
+ /lib/systemd/system/multi-user.target.wants/qmldemo.service)
+endif
+ifdef PTXCONF_MINI6410_DEMO_STARTUP_SCRIPT
+ @$(call install_copy, qml-demo, 0, 0, 0755, \
+ $(QML_DEMO_DIR)/init/sysv/startup, \
+ /etc/init.d/startup, n)
+ @$(call install_link, qml-demo, ../init.d/startup, /etc/rc.d/S99startup)
+endif
+
+ @$(call install_finish, qml-demo)
+
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+qml-demo_clean:
+ rm -rf $(STATEDIR)/qml-demo.*
+ rm -rf $(PKGDIR)/qml-demo_*
+ rm -rf $(QML_DEMO_DIR)
+
+# vim: syntax=make
diff --git a/rules/qt4-demo.in b/rules/qt4-demo.in
deleted file mode 100644
index e87d669..0000000
--- a/rules/qt4-demo.in
+++ /dev/null
@@ -1,16 +0,0 @@
-## SECTION=qt
-
-config QT4_DEMO
- tristate
- prompt "qt4-demo"
- select QT4
- select QWT
- select STARTUP
- select RC_ONCE
- help
- Enable this entry to get a simple Qt4 demo running at startup on
- your target. It can act as a simple example how to integrate your
- own Qt4 based application into this PTXdist project.
- Part of this entry is the installation of a start script that runs
- this Qt4 application when the system starts.
-
diff --git a/rules/qt4-demo.make b/rules/qt4-demo.make
index c70eed4..ee100b7 100644
--- a/rules/qt4-demo.make
+++ b/rules/qt4-demo.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_QT4_DEMO) += qt4-demo
#
# Paths and names
#
-QT4_DEMO_VERSION := 2011.11.0
+QT4_DEMO_VERSION := master
QT4_DEMO := qt4-demo-$(QT4_DEMO_VERSION)
QT4_DEMO_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(QT4_DEMO)
QT4_DEMO_DIR := $(BUILDDIR)/$(QT4_DEMO)
@@ -61,6 +61,20 @@ $(STATEDIR)/qt4-demo.targetinstall:
@$(call install_alternative, qt4-demo, 0, 0, 0755, \
/etc/rc.once.d/tscalibrate)
+ifdef PTXCONF_MINI6410_DEMO_SYSTEMD_UNIT
+ @$(call install_copy, qt4-demo, 0, 0, 0644, \
+ $(QT4_DEMO_DIR)/init/systemd/qt4demo.service, \
+ /lib/systemd/system/qt4demo.service)
+ @$(call install_link, qt4-demo, ../qt4demo.service, \
+ /lib/systemd/system/multi-user.target.wants/qt4demo.service)
+endif
+ifdef PTXCONF_MINI6410_DEMO_STARTUP_SCRIPT
+ @$(call install_copy, qt4-demo, 0, 0, 0755, \
+ $(QT4_DEMO_DIR)/init/sysv/startup, \
+ /etc/init.d/startup, n)
+ @$(call install_link, qt4-demo, ../init.d/startup, /etc/rc.d/S99startup)
+endif
+
@$(call install_finish, qt4-demo)
@$(call touch)
diff --git a/rules/startup.in b/rules/startup.in
deleted file mode 100644
index 7e91ab1..0000000
--- a/rules/startup.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=initmethod
-config STARTUP
- tristate
- prompt "startup script"
- help
- Install a customized init based startup script. It is expected in
- your project's "projectroot/etc/init.d/startup".
-
diff --git a/rules/startup.make b/rules/startup.make
deleted file mode 100644
index b4a7563..0000000
--- a/rules/startup.make
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*-makefile-*-
-# $Id: template-make 9053 2008-11-03 10:58:48Z wsa $
-#
-# Copyright (C) 2009 by Luotao Fu <l.fu@pengutronix.de
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_STARTUP) += startup
-
-#
-# Paths and names
-#
-STARTUP := startup
-STARTUP_VERSION := 0.1
-STARTUP_SUFFIX :=
-STARTUP_URL :=
-STARTUP_SOURCE :=
-STARTUP_DIR := $(BUILDDIR)/$(STARTUP)
-
-# ----------------------------------------------------------------------------
-# Get (nothing to do here)
-# ----------------------------------------------------------------------------
-
-$(STARTUP_SOURCE):
- @$(call targetinfo)
-
-# ----------------------------------------------------------------------------
-# Extract (nothing to do here)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/startup.extract:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Prepare (nothing to do here)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/startup.prepare:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile (nothing to do here)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/startup.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install (nothing to do here)
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/startup.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/startup.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, startup)
- @$(call install_fixup, startup,PACKAGE,startup)
- @$(call install_fixup, startup,PRIORITY,optional)
- @$(call install_fixup, startup,VERSION,$(STARTUP_VERSION))
- @$(call install_fixup, startup,SECTION,base)
- @$(call install_fixup, startup,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>")
- @$(call install_fixup, startup,DEPENDS,)
- @$(call install_fixup, startup,DESCRIPTION,"Simple start script")
-
- @$(call install_copy, startup, 0, 0, 0755, \
- $(PTXDIST_WORKSPACE)/projectroot/etc/init.d/startup, \
- /etc/init.d/startup, n)
- @$(call install_link, startup, ../init.d/startup, /etc/rc.d/S99startup)
-
- @$(call install_finish, startup)
-
- @$(call touch)
-
-# vim: syntax=make