From d2653e7cec32f24bfef089690f1bc38d2c5f8d17 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 21 Oct 2015 15:13:45 +0200 Subject: qt4-x11-free-systemd: change filenames for systemd service qtdemo-init exists in another recipe for qte. When both recipes are built we get an error during sysroot deployment. --- recipes-qt/qt4/qt4-x11-free-systemd.bb | 10 ++-- .../qt4/qt4-x11-free-systemd/qt4-x11-demo-init | 60 ++++++++++++++++++++++ .../qt4/qt4-x11-free-systemd/qt4-x11-demo.service | 10 ++++ recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init | 60 ---------------------- recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service | 10 ---- 5 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init create mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service delete mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init delete mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service (limited to 'recipes-qt') diff --git a/recipes-qt/qt4/qt4-x11-free-systemd.bb b/recipes-qt/qt4/qt4-x11-free-systemd.bb index 45ea962..426f632 100644 --- a/recipes-qt/qt4/qt4-x11-free-systemd.bb +++ b/recipes-qt/qt4/qt4-x11-free-systemd.bb @@ -10,17 +10,17 @@ PR = "r1" inherit allarch systemd -SRC_URI = "file://qtdemo.service \ - file://qtdemo-init " +SRC_URI = "file://qt4-x11-demo.service \ + file://qt4-x11-demo-init " do_install () { install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/qtdemo-init ${D}/${bindir} + install -m 0755 ${WORKDIR}/qt4-x11-demo-init ${D}/${bindir} install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/qtdemo.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/qt4-x11-demo.service ${D}${systemd_unitdir}/system } NATIVE_SYSTEMD_SUPPORT = "1" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "qtdemo.service" +SYSTEMD_SERVICE_${PN} = "qt4-x11-demo.service" diff --git a/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init new file mode 100644 index 0000000..e9ed869 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init @@ -0,0 +1,60 @@ +#!/bin/sh + +set -e + +if [ -f /usr/bin/qtdemo ]; then + QTVARIANT="X11" + QTDEMO="qtdemo > /var/log/Xsession.log 2>&1" +else + QTVARIANT="" + QTDEMO="qtdemoE -qws" +fi + +case "$1" in + start) + echo "Starting qtdemo" + if [ -f /etc/profile.d/tslib.sh ]; then + source /etc/profile.d/tslib.sh + fi + if [ -e "$TSLIB_TSDEVICE" ]; then + if [ ! -f /etc/pointercal ]; then + /usr/bin/ts_calibrate + fi + if [ "$QTVARIANT" == X11 ]; then + Xorg & + export DISPLAY=:0 + eval $QTDEMO & + else + QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & + fi + else + if [ -e "/usr/bin/xinput_calibrator_once.sh" ]; then + xinput_calibrator_once.sh + fi + if [ "$QTVARIANT" == X11 ]; then + Xorg & + export DISPLAY=:0 + fi + eval $QTDEMO & + fi + ;; + stop) + echo "Stopping qtdemo" + if [ "$QTVARIANT" == X11 ]; then + killall Xorg + killall qtdemo + else + killall qtdemoE + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 { start | stop | restart }" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service new file mode 100644 index 0000000..7783020 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service @@ -0,0 +1,10 @@ +[Unit] +Description=start X and qtdemo + +[Service] +Type=forking +ExecStart=/usr/bin/qt4-x11-demo-init start +ExecStop=/usr/bin/qt4-x11-demo-init stop + +[Install] +WantedBy=graphical.target diff --git a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init b/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init deleted file mode 100644 index e9ed869..0000000 --- a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -set -e - -if [ -f /usr/bin/qtdemo ]; then - QTVARIANT="X11" - QTDEMO="qtdemo > /var/log/Xsession.log 2>&1" -else - QTVARIANT="" - QTDEMO="qtdemoE -qws" -fi - -case "$1" in - start) - echo "Starting qtdemo" - if [ -f /etc/profile.d/tslib.sh ]; then - source /etc/profile.d/tslib.sh - fi - if [ -e "$TSLIB_TSDEVICE" ]; then - if [ ! -f /etc/pointercal ]; then - /usr/bin/ts_calibrate - fi - if [ "$QTVARIANT" == X11 ]; then - Xorg & - export DISPLAY=:0 - eval $QTDEMO & - else - QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & - fi - else - if [ -e "/usr/bin/xinput_calibrator_once.sh" ]; then - xinput_calibrator_once.sh - fi - if [ "$QTVARIANT" == X11 ]; then - Xorg & - export DISPLAY=:0 - fi - eval $QTDEMO & - fi - ;; - stop) - echo "Stopping qtdemo" - if [ "$QTVARIANT" == X11 ]; then - killall Xorg - killall qtdemo - else - killall qtdemoE - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 { start | stop | restart }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service b/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service deleted file mode 100644 index 9a5610c..0000000 --- a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=start X and qtdemo - -[Service] -Type=forking -ExecStart=/usr/bin/qtdemo-init start -ExecStop=/usr/bin/qtdemo-init stop - -[Install] -WantedBy=graphical.target -- cgit v1.2.3