From d9c6c0c6c14d15494042192166553b9faae0f8ff Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 8 May 2019 14:34:49 +0200 Subject: images and helpers: drop qt4 Qt 4 was first released in 2005 and has been unsupported since 2015. Drop it from what we regularly install. Signed-off-by: Max Krummenacher --- recipes-qt/qt-demo/qt-demo-init/qtdemo.service | 10 ---- recipes-qt/qt-demo/qt-demo-init_0.2.bb | 26 ---------- recipes-qt/qt4/qt4-embedded_%.bbappend | 3 -- recipes-qt/qt4/qt4-x11-free-systemd.bb | 25 --------- .../qt4/qt4-x11-free-systemd/qt4-x11-demo-init | 60 ---------------------- .../qt4/qt4-x11-free-systemd/qt4-x11-demo.service | 10 ---- 6 files changed, 134 deletions(-) delete mode 100644 recipes-qt/qt-demo/qt-demo-init/qtdemo.service delete mode 100644 recipes-qt/qt-demo/qt-demo-init_0.2.bb delete mode 100644 recipes-qt/qt4/qt4-embedded_%.bbappend delete mode 100644 recipes-qt/qt4/qt4-x11-free-systemd.bb delete mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-init delete mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service (limited to 'recipes-qt') diff --git a/recipes-qt/qt-demo/qt-demo-init/qtdemo.service b/recipes-qt/qt-demo/qt-demo-init/qtdemo.service deleted file mode 100644 index 44e62a6..0000000 --- a/recipes-qt/qt-demo/qt-demo-init/qtdemo.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Start Qt4 Embedded demo application - -[Service] -Type=simple -ExecStart=/usr/bin/qtdemoE -qws -Environment="QWS_DISPLAY=LinuxFb:/dev/fb:genericcolors" "QWS_KEYBOARD=USB:/dev/input/event-keyboard" "QWS_MOUSE_PROTO=LinuxInput:/dev/input/event-mouse" - -[Install] -WantedBy=graphical.target diff --git a/recipes-qt/qt-demo/qt-demo-init_0.2.bb b/recipes-qt/qt-demo/qt-demo-init_0.2.bb deleted file mode 100644 index fa2ed23..0000000 --- a/recipes-qt/qt-demo/qt-demo-init_0.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Systemd start script for Qt Embedded demo" -LICENSE = "MIT" -PR = "r1" - -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit allarch systemd - -SRC_URI = " \ - file://qtdemo.service \ - file://mouse.rules \ - file://keyboard.rules \ -" - -do_install() { - install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/mouse.rules ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/keyboard.rules ${D}${sysconfdir}/udev/rules.d/ - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/qtdemo.service ${D}${systemd_unitdir}/system -} - -NATIVE_SYSTEMD_SUPPORT = "1" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "qtdemo.service" diff --git a/recipes-qt/qt4/qt4-embedded_%.bbappend b/recipes-qt/qt4/qt4-embedded_%.bbappend deleted file mode 100644 index 64d1d2f..0000000 --- a/recipes-qt/qt4/qt4-embedded_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" - -QT_CONFIG_FLAGS += " -depths all" diff --git a/recipes-qt/qt4/qt4-x11-free-systemd.bb b/recipes-qt/qt4/qt4-x11-free-systemd.bb deleted file mode 100644 index b08f159..0000000 --- a/recipes-qt/qt4/qt4-x11-free-systemd.bb +++ /dev/null @@ -1,25 +0,0 @@ -SECTION = "x11/libs" -SUMMARY = "systemd qtdemo autostart" -# The license is meant for this recipe and the files it installs. -# RNDIS is part of the kernel, udhcpd is part of busybox -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -PR = "r1" - -inherit allarch systemd - -SRC_URI = "file://qt4-x11-demo.service \ - file://qt4-x11-demo-init " - -do_install () { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/qt4-x11-demo-init ${D}/${bindir} - - install -d ${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} = "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 deleted file mode 100644 index e9ed869..0000000 --- a/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo-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/qt4-x11-demo.service b/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service deleted file mode 100644 index 7783020..0000000 --- a/recipes-qt/qt4/qt4-x11-free-systemd/qt4-x11-demo.service +++ /dev/null @@ -1,10 +0,0 @@ -[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 -- cgit v1.2.3