diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2015-10-21 15:13:45 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.oss.09@gmail.com> | 2015-10-28 09:36:02 +0100 |
| commit | 9195c842d31f53ac73f5e2ab507638a26676a7a5 (patch) | |
| tree | c07bcc0efcee2b5ff4816380be0cdb326d0f73ac /recipes-qt/qt4 | |
| parent | 8a6d1bb3afe9e76156d7999e720527a4f1b3a871 (diff) | |
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.
Diffstat (limited to 'recipes-qt/qt4')
| -rw-r--r-- | recipes-qt/qt4/qt4-x11-free-systemd.bb | 10 | ||||
| -rw-r--r-- | recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init (renamed from recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init) | 0 | ||||
| -rw-r--r-- | recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service (renamed from recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service) | 4 |
3 files changed, 7 insertions, 7 deletions
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/qtdemo-init b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init index e9ed869..e9ed869 100644 --- a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init +++ b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init diff --git a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service index 9a5610c..7783020 100644 --- a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service +++ b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service @@ -3,8 +3,8 @@ Description=start X and qtdemo [Service] Type=forking -ExecStart=/usr/bin/qtdemo-init start -ExecStop=/usr/bin/qtdemo-init stop +ExecStart=/usr/bin/qt4-x11-demo-init start +ExecStop=/usr/bin/qt4-x11-demo-init stop [Install] WantedBy=graphical.target |