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 --- README | 4 - conf/layer.conf | 1 - recipes-images/images/qt-x11-image.bb | 239 --------------------- recipes-images/images/qt4e-demo-image.bb | 53 ----- 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 - 10 files changed, 431 deletions(-) delete mode 100644 recipes-images/images/qt-x11-image.bb delete mode 100644 recipes-images/images/qt4e-demo-image.bb 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 diff --git a/README b/README index 373a050..0c143a8 100644 --- a/README +++ b/README @@ -53,10 +53,6 @@ the specific layer versions we used when building our binary demo images) branch: thud revision: HEAD - URI: git://git.yoctoproject.org/meta-qt4 - branch: thud - revision: HEAD - URI: https://github.com/meta-qt5/meta-qt5 branch: thud revision: HEAD diff --git a/conf/layer.conf b/conf/layer.conf index 4b9d8f2..adcc051 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -24,7 +24,6 @@ LAYERDEPENDS_toradex-demos = " \ freescale-layer \ fsl-demos \ lxde-layer \ - qt4-layer \ qt5-layer \ " LAYERSERIES_COMPAT_toradex-demos = "sumo thud" diff --git a/recipes-images/images/qt-x11-image.bb b/recipes-images/images/qt-x11-image.bb deleted file mode 100644 index a3d0584..0000000 --- a/recipes-images/images/qt-x11-image.bb +++ /dev/null @@ -1,239 +0,0 @@ -SUMMARY = "Toradex Embedded Linux Qt4 Demo With X11" -SUMMARY_append_apalis-tk1-mainline = " (Mainline)" -DESCRIPTION = "Image with the Qt4 Framework and the X11 server" - -LICENSE = "MIT" - -#start of the resulting deployable tarball name -export IMAGE_BASENAME = "Qt4-X11-Image" -IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" - -SYSTEMD_DEFAULT_TARGET = "graphical.target" - -IMAGE_FEATURES += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ - '', d), d)} \ -" - -IMAGE_LINGUAS = "en-us" -#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" -#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' - -DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' - -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" - -# this would pull in a large amount of gst-plugins, we only add a selected few -# gstreamer1.0-plugins-base-meta -# gstreamer1.0-plugins-good-meta -# gstreamer1.0-plugins-bad-meta -# gst-ffmpeg -GSTREAMER = " \ - gstreamer1.0 \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-base-alsa \ - gstreamer1.0-plugins-base-audioconvert \ - gstreamer1.0-plugins-base-audioresample \ - gstreamer1.0-plugins-base-audiotestsrc \ - gstreamer1.0-plugins-base-typefindfunctions \ - gstreamer1.0-plugins-base-ogg \ - gstreamer1.0-plugins-base-theora \ - gstreamer1.0-plugins-base-videotestsrc \ - gstreamer1.0-plugins-base-vorbis \ - gstreamer1.0-plugins-good-audioparsers \ - gstreamer1.0-plugins-good-autodetect \ - gstreamer1.0-plugins-good-avi \ - gstreamer1.0-plugins-good-deinterlace \ - gstreamer1.0-plugins-good-id3demux \ - gstreamer1.0-plugins-good-isomp4 \ - gstreamer1.0-plugins-good-matroska \ - gstreamer1.0-plugins-good-multifile \ - gstreamer1.0-plugins-good-rtp \ - gstreamer1.0-plugins-good-rtpmanager \ - gstreamer1.0-plugins-good-udp \ - gstreamer1.0-plugins-good-video4linux2 \ - gstreamer1.0-plugins-good-wavenc \ - gstreamer1.0-plugins-good-wavparse \ -" -# No longer available -# gst-plugins-base-decodebin \ -# gst-plugins-base-decodebin2 \ -# gst-plugins-base-playbin \ -# gst-plugins-ugly-asf \ -#" - -GSTREAMER_MX6QDL = " \ - gstreamer1.0-plugins-base-ximagesink \ - gstreamer1.0-plugins-imx \ -" -GSTREAMER_append_mx6q = "${GSTREAMER_MX6QDL}" -GSTREAMER_append_mx6dl = "${GSTREAMER_MX6QDL}" - -GSTREAMER_append_mx7 = " \ - gstreamer1.0-plugins-base-ximagesink \ -" -# No longer available -# gst-plugins-gl \ -# gst-fsl-plugin \ -# - -GSTREAMER_append_tegra124 = " \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ - gstreamer1.0-plugins-bad-videoparsersbad \ - gstreamer \ - gst-plugins-base \ - gst-plugins-base-alsa \ - gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-audiotestsrc \ - gst-plugins-base-decodebin \ - gst-plugins-base-decodebin2 \ - gst-plugins-base-playbin \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-ogg \ - gst-plugins-base-theora \ - gst-plugins-base-videotestsrc \ - gst-plugins-base-vorbis \ - gst-plugins-base-ximagesink \ - gst-plugins-base-xvimagesink \ - gst-plugins-good \ - gst-plugins-good-audioparsers \ - gst-plugins-good-autodetect \ - gst-plugins-good-avi \ - gst-plugins-good-deinterlace \ - gst-plugins-good-id3demux \ - gst-plugins-good-isomp4 \ - gst-plugins-good-matroska \ - gst-plugins-good-rtp \ - gst-plugins-good-rtpmanager \ - gst-plugins-good-udp \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-wavenc \ - gst-plugins-good-wavparse \ - libgstcodecparsers-1.0 \ - libgstnvegl \ - libgstomx-0.10 \ - libgstomx-1.0 \ -" - -IMAGE_INSTALL_QT4 = " \ - qt4-x11-free \ - qt4-xmlpatterns \ - libqt3support4 \ - libqtclucene4 \ - libqtcore4 \ - libqtdbus4 \ - libqtgui4 \ - libqthelp4 \ - libqtmultimedia4 \ - libqtnetwork4 \ - libqtscript4 \ - libqtscripttools4 \ - libqtsql4 \ - libqtsvg4 \ - libqttest4 \ - libqtwebkit4 \ - libqtxml4 \ - qt4-plugin-iconengine-svgicon \ - qt4-plugin-imageformat-gif \ - qt4-plugin-imageformat-ico \ - qt4-plugin-imageformat-jpeg \ - qt4-plugin-imageformat-mng \ - qt4-plugin-imageformat-svg \ - qt4-plugin-imageformat-tga \ - qt4-plugin-imageformat-tiff \ - qt4-plugin-script-dbus \ - qt4-plugin-sqldriver-sqlite \ - qt4-demos \ - qt4-x11-free-systemd \ - qt4-examples \ - qt4-assistant \ - icu \ -" - -IMAGE_INSTALL_append_tegra124 = " \ - libglu \ - mesa-demos \ - freeglut \ - tiff \ - xvinfo \ -" -IMAGE_INSTALL_append_tegra124m = " \ - libglu \ - freeglut \ - tiff \ - xvinfo \ -" -IMAGE_INSTALL_MX6QDL = " \ - packagegroup-fsl-gpu-libs \ - libopencl-imx \ - eglinfo-x11 \ -" -IMAGE_INSTALL_append_mx6q = "${IMAGE_INSTALL_MX6QDL}" -IMAGE_INSTALL_append_mx6dl = "${IMAGE_INSTALL_MX6QDL}" - -# Packages which might no longer exist -RRECOMMENDS_${PN} += "xserver-xorg-multimedia-modules" - -IMAGE_INSTALL += " \ - ${IMAGE_INSTALL_QT4} \ - \ - xdg-utils \ - \ - libgsf \ - libxres \ - makedevs \ - mime-support \ - xcursor-transparent-theme \ - zeroconf \ - packagegroup-boot \ - packagegroup-basic \ - udev-extra-rules \ - ${CONMANPKGS} \ - ${ROOTFS_PKGMANAGE_PKGS} \ - timestamp-service \ - packagegroup-base-extended \ - xserver-common \ - xserver-xorg-extension-dbe \ - xserver-xorg-extension-extmod \ - xauth \ - xhost \ - xset \ - setxkbmap \ - \ - xrdb \ - xorg-minimal-fonts xserver-xorg-utils \ - scrot \ - unclutter \ - \ - libxdamage libxvmc libxinerama \ - libxcursor \ - \ - bash \ - \ - ${GSTREAMER} \ - v4l-utils \ - libpcre \ - libpcreposix \ - libxcomposite \ - alsa-states \ -" - -require recipes-images/images/tdx-extra.inc - -IMAGE_DEV_MANAGER = "udev" -IMAGE_INIT_MANAGER = "systemd" -IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "busybox shadow" - -inherit core-image diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb deleted file mode 100644 index af85b9e..0000000 --- a/recipes-images/images/qt4e-demo-image.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Toradex Embedded Linux Qt4 Demo With QWS" - -LICENSE = "MIT" - -#start of the resulting deployable tarball name -export IMAGE_BASENAME = "Qt4e-Image" -IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" - -#start graphical target by default (start new qt-demo-init systemd service) -SYSTEMD_DEFAULT_TARGET = "graphical.target" - -IMAGE_LINGUAS = "en-us" -#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" -#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' - -DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' - -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" - -IMAGE_INSTALL += " \ - packagegroup-core-qt4e \ - libicui18n \ - \ - polkit \ - makedevs \ - mime-support \ - zeroconf \ - fbset \ - packagegroup-boot \ - packagegroup-basic \ - udev-extra-rules \ - ${CONMANPKGS} \ - ${ROOTFS_PKGMANAGE_PKGS} \ - timestamp-service \ - packagegroup-base-extended \ - \ - bash \ - \ - alsa-states \ -" - -require recipes-images/images/tdx-extra.inc - -IMAGE_DEV_MANAGER = "udev" -IMAGE_INIT_MANAGER = "systemd" -IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "busybox shadow" - -inherit core-image 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