[meta-freescale] [meta-fsl-demos][PATCH v2 01/13] Remove qte-in-use-image and qt-in-use-image contents
Otavio Salvador
otavio at ossystems.com.br
Wed Aug 5 14:40:56 PDT 2015
The use of Qt4 is very limited nowadays and those images and
respective recipes are not being tested for a while. It makes no sense
to keep unused metadata available, so we remove this.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angolini at freescale.com>
---
recipes-qt/images/qt-in-use-common.inc | 32 -------------------
recipes-qt/images/qt-in-use-image.bb | 17 ----------
recipes-qt/images/qte-in-use-image.bb | 16 ----------
recipes-qt/qt-in-use/files/fullscreen.patch | 13 --------
recipes-qt/qt-in-use/files/smarthome | 37 ----------------------
.../qt-in-use/qt-in-industrial-embedded-common.inc | 37 ----------------------
.../qt-in-industrial-embedded-smarthome-e_git.bb | 14 --------
.../qt-in-industrial-embedded-smarthome_git.bb | 13 --------
recipes-qt/qt-in-use/qt-in-use-common.inc | 25 ---------------
9 files changed, 204 deletions(-)
delete mode 100644 recipes-qt/images/qt-in-use-common.inc
delete mode 100644 recipes-qt/images/qt-in-use-image.bb
delete mode 100644 recipes-qt/images/qte-in-use-image.bb
delete mode 100644 recipes-qt/qt-in-use/files/fullscreen.patch
delete mode 100644 recipes-qt/qt-in-use/files/smarthome
delete mode 100644 recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
delete mode 100644 recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome-e_git.bb
delete mode 100644 recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome_git.bb
delete mode 100644 recipes-qt/qt-in-use/qt-in-use-common.inc
diff --git a/recipes-qt/images/qt-in-use-common.inc b/recipes-qt/images/qt-in-use-common.inc
deleted file mode 100644
index 01c6edc..0000000
--- a/recipes-qt/images/qt-in-use-common.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SYSTEMD_INSTALL = " \
- systemd \
- systemd-compat-units \
- systemd-speed-hacks \
- udev-systemd \
- rsyslog-systemd \
-"
-
-SYSV_INSTALL = " \
- udev \
- sysvinit \
- initscripts \
-"
-
-COMMON_INSTALL = " \
- base-files \
- base-passwd \
- busybox \
- ${@base_contains("MACHINE_FEATURES", "systemd", "${SYSTEMD_INSTALL}", "${SYSV_INSTALL}", d)} \
- packagegroup-base \
-"
-
-QT_DEMOS = " \
- ${QT_NAME}-demos \
- ${QT_NAME}-examples \
-"
-
-IMAGE_FEATURES += "splash"
-
-do_rootfs[depends] += "virtual/kernel:do_populate_sysroot"
-
-inherit core-image
diff --git a/recipes-qt/images/qt-in-use-image.bb b/recipes-qt/images/qt-in-use-image.bb
deleted file mode 100644
index 64cbd21..0000000
--- a/recipes-qt/images/qt-in-use-image.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require qt-in-use-common.inc
-
-QT_NAME = "qt4"
-
-IMAGE_INSTALL = " \
- ${COMMON_INSTALL} \
- \
- ${XSERVER} \
- ${QT_DEMOS} \
- packagegroup-core-x11 \
- xorg-minimal-fonts \
- liberation-fonts \
- qt4-graphics-system \
- qt-in-industrial-embedded-smarthome \
-"
-ROOTFS_POSTPROCESS_COMMAND += "(cd ${IMAGE_ROOTFS}/usr/bin ; \
- ln -s smarthome x-window-manager );"
diff --git a/recipes-qt/images/qte-in-use-image.bb b/recipes-qt/images/qte-in-use-image.bb
deleted file mode 100644
index 1862277..0000000
--- a/recipes-qt/images/qte-in-use-image.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require qt-in-use-common.inc
-
-QT_NAME = "qt4-embedded"
-
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests qt4-embedded-plugin-mousedriver-tslib", "",d)}'
-
-IMAGE_INSTALL = " \
- ${COMMON_INSTALL} \
- \
- ${QT_DEMOS} \
- qt-in-industrial-embedded-smarthome-e \
- pciutils \
- usbutils \
- alsa-utils \
- ${TOUCH} \
-"
diff --git a/recipes-qt/qt-in-use/files/fullscreen.patch b/recipes-qt/qt-in-use/files/fullscreen.patch
deleted file mode 100644
index e1c67db..0000000
--- a/recipes-qt/qt-in-use/files/fullscreen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/smarthome/main.cpp b/smarthome/main.cpp
-index 89c60f3..bed47e8 100644
---- a/smarthome/main.cpp
-+++ b/smarthome/main.cpp
-@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
- QmlApplicationViewer viewer;
- viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
- viewer.setMainQmlFile(QLatin1String("qml/smarthome/smarthome.qml"));
-- viewer.show();
-+ viewer.showFullScreen();
-
- return app.exec();
- }
diff --git a/recipes-qt/qt-in-use/files/smarthome b/recipes-qt/qt-in-use/files/smarthome
deleted file mode 100644
index c0aa575..0000000
--- a/recipes-qt/qt-in-use/files/smarthome
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SMARTHOME="smarthome"
-SMARTHOME_ARGS="`[ -x '__BINDIR__/X' ] && echo '' || echo '-qws'`"
-
-case "$1" in
- start)
- echo "Starting $SMARTHOME"
- if [ -f __SYSCONFDIR__/profile.d/tslib.sh ]; then
- . __SYSCONFDIR__/profile.d/tslib.sh
- fi
- if [ -e "$TSLIB_TSDEVICE" ]; then
- if [ ! -f __SYSCONFDIR__/pointercal ]; then
- __BINDIR__/ts_calibrate
- fi
- QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $SMARTHOME $SMARTHOME_ARGS &
- else
- $SMARTHOME $SMARTHOME_ARGS &
- fi
- ;;
- stop)
- echo "Stopping $SMARTHOME"
- killall $SMARTHOME
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 { start | stop | restart }" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc b/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
deleted file mode 100644
index 12d265f..0000000
--- a/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Demos from the industrial embedded segment"
-
-inherit autotools-brokensep update-rc.d
-
-PV = "0.0+gitr${SRCPV}"
-SRCREV = "4b10cbfd32391c83251bbc61520eeab03461db0a"
-SRC_URI = "git://gitorious.org/qt-in-use/qt-in-industrial-embedded.git \
- file://fullscreen.patch;striplevel=2 \
- file://smarthome \
- "
-
-PR = "r3"
-
-S = "${WORKDIR}/git/${DEMO}"
-
-do_configure_prepend() {
- # fix qmake ugly deployment support
- find ${S} -type f -exec sed -i 's,/usr/local,/usr,g' '{}' ';'
-}
-
-do_install_append () {
- # Set the correct smarthome binary path
- sed -i -e 's:Exec=.*:Exec=${bindir}/smarthome:g' ${D}${datadir}/applications/smarthome.desktop
-
- install -d ${D}${sysconfdir}/init.d
- install -m 755 ${WORKDIR}/smarthome ${D}${sysconfdir}/init.d/
- sed -i -e 's:__BINDIR__:${bindir}:g; s:__SYSCONFDIR__:${sysconfdir}:g' ${D}${sysconfdir}/init.d/smarthome
-}
-
-FILES_${PN} += "${datadir}/${DEMO} ${datadir}/icons"
-RDEPENDS_${PN} += " \
- ${QT_BASE_NAME}-qml-plugins \
- ${QT_BASE_NAME}-plugin-imageformat-svg \
-"
-
-INITSCRIPT_NAME = "smarthome"
-INITSCRIPT_PARAMS = "defaults"
diff --git a/recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome-e_git.bb b/recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome-e_git.bb
deleted file mode 100644
index 99fbd6e..0000000
--- a/recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome-e_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require qt-in-industrial-embedded-common.inc
-
-LICENSE = "LGPLv2.1+ & GFDL-1.2"
-LIC_FILES_CHKSUM = "file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
- file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-DEMO = "smarthome"
-
-RDEPENDS_${PN} += "${QT_BASE_NAME}-fonts"
-RCONFLICTS_${PN} = "qt-in-industrial-embedded-smarthome"
-
-inherit qt4e
-
-EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
diff --git a/recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome_git.bb b/recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome_git.bb
deleted file mode 100644
index e2191e7..0000000
--- a/recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt-in-industrial-embedded-common.inc
-
-LICENSE = "LGPLv2.1+ & GFDL-1.2"
-LIC_FILES_CHKSUM = "file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
- file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-DEMO = "smarthome"
-
-RCONFLICTS_${PN} = "qt-in-industrial-embedded-smarthome-e"
-
-inherit qt4x11
-
-EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
diff --git a/recipes-qt/qt-in-use/qt-in-use-common.inc b/recipes-qt/qt-in-use/qt-in-use-common.inc
deleted file mode 100644
index abe0291..0000000
--- a/recipes-qt/qt-in-use/qt-in-use-common.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SYSTEMD_INSTALL = " \
- systemd \
- systemd-compat-units \
- systemd-speed-hacks \
- udev-systemd \
- rsyslog-systemd \
-"
-
-SYSV_INSTALL = " \
- udev \
- sysvinit \
- initscripts \
- tinylogin \
-"
-
-COMMON_INSTALL = " \
- base-files \
- base-passwd \
- busybox \
- ${@base_contains("MACHINE_FEATURES", "systemd", "${SYSTEMD_INSTALL}", "${SYSV_INSTALL}", d)} \
-"
-
-do_rootfs[depends] += "virtual/kernel:do_populate_sysroot"
-
-inherit core-image
--
2.5.0
More information about the meta-freescale
mailing list