diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-27 15:48:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:14 +0000 |
commit | 8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch) | |
tree | 9b93d0fcd8fd973943ca61f126cae47066113922 /meta/classes | |
parent | 0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff) | |
download | poky-8b11ed8a75a15328bbd22d100a976cc669b84b58.tar.gz |
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy.
Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with
meta-qt3 and meta-qt5.
(From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/core-image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/qmake2.bbclass | 27 | ||||
-rw-r--r-- | meta/classes/qmake_base.bbclass | 119 | ||||
-rw-r--r-- | meta/classes/qt4e.bbclass | 21 | ||||
-rw-r--r-- | meta/classes/qt4x11.bbclass | 14 |
5 files changed, 0 insertions, 183 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 8e340d9f5c..705cad8d91 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
@@ -24,7 +24,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d | |||
24 | # - nfs-client - NFS client | 24 | # - nfs-client - NFS client |
25 | # - ssh-server-dropbear - SSH server (dropbear) | 25 | # - ssh-server-dropbear - SSH server (dropbear) |
26 | # - ssh-server-openssh - SSH server (openssh) | 26 | # - ssh-server-openssh - SSH server (openssh) |
27 | # - qt4-pkgs - Qt4/X11 and demo applications | ||
28 | # - hwcodecs - Install hardware acceleration codecs | 27 | # - hwcodecs - Install hardware acceleration codecs |
29 | # - package-management - installs package management tools and preserves the package manager database | 28 | # - package-management - installs package management tools and preserves the package manager database |
30 | # - debug-tweaks - makes an image suitable for development, e.g. allowing passwordless root logins | 29 | # - debug-tweaks - makes an image suitable for development, e.g. allowing passwordless root logins |
@@ -46,7 +45,6 @@ FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" | |||
46 | FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" | 45 | FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" |
47 | FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" | 46 | FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" |
48 | FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" | 47 | FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" |
49 | FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps" | ||
50 | FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" | 48 | FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" |
51 | 49 | ||
52 | 50 | ||
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass deleted file mode 100644 index 6e73ad2d1e..0000000000 --- a/meta/classes/qmake2.bbclass +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | # | ||
2 | # QMake variables for Qt4 | ||
3 | # | ||
4 | inherit qmake_base | ||
5 | |||
6 | DEPENDS_prepend = "qt4-tools-native " | ||
7 | |||
8 | export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" | ||
9 | export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri" | ||
10 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" | ||
11 | export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" | ||
12 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" | ||
13 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" | ||
14 | export OE_QMAKE_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4" | ||
15 | export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4" | ||
16 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" | ||
17 | export OE_QMAKE_LINK = "${CXX}" | ||
18 | export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" | ||
19 | export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" | ||
20 | export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" | ||
21 | export OE_QMAKE_LIBS_QT = "qt" | ||
22 | export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" | ||
23 | export OE_QMAKE_LIBS_X11SM = "-lSM -lICE" | ||
24 | export OE_QMAKE_LCONVERT = "${STAGING_BINDIR_NATIVE}/lconvert4" | ||
25 | export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4" | ||
26 | export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4" | ||
27 | export OE_QMAKE_XMLPATTERNS = "${STAGING_BINDIR_NATIVE}/xmlpatterns4" | ||
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass deleted file mode 100644 index dc98713fd2..0000000000 --- a/meta/classes/qmake_base.bbclass +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/qmake" | ||
2 | |||
3 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" | ||
4 | QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
5 | |||
6 | # We override this completely to eliminate the -e normally passed in | ||
7 | EXTRA_OEMAKE = "" | ||
8 | |||
9 | export OE_QMAKE_CC="${CC}" | ||
10 | export OE_QMAKE_CFLAGS="${CFLAGS}" | ||
11 | export OE_QMAKE_CXX="${CXX}" | ||
12 | export OE_QMAKE_LDFLAGS="${LDFLAGS}" | ||
13 | export OE_QMAKE_AR="${AR}" | ||
14 | export OE_QMAKE_STRIP="echo" | ||
15 | export OE_QMAKE_RPATH="-Wl,-rpath-link," | ||
16 | |||
17 | # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 | ||
18 | |||
19 | oe_qmake_mkspecs () { | ||
20 | mkdir -p mkspecs/${OE_QMAKE_PLATFORM} | ||
21 | for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do | ||
22 | if [ -L $f ]; then | ||
23 | lnk=`readlink $f` | ||
24 | if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then | ||
25 | ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f` | ||
26 | else | ||
27 | cp $f mkspecs/${OE_QMAKE_PLATFORM}/ | ||
28 | fi | ||
29 | else | ||
30 | cp $f mkspecs/${OE_QMAKE_PLATFORM}/ | ||
31 | fi | ||
32 | done | ||
33 | } | ||
34 | |||
35 | do_generate_qt_config_file() { | ||
36 | export QT_CONF_PATH=${WORKDIR}/qt.conf | ||
37 | cat > ${WORKDIR}/qt.conf <<EOF | ||
38 | [Paths] | ||
39 | Prefix = | ||
40 | Binaries = ${STAGING_BINDIR_NATIVE} | ||
41 | Headers = ${STAGING_INCDIR}/${QT_DIR_NAME} | ||
42 | Plugins = ${STAGING_LIBDIR}/${QT_DIR_NAME}/plugins/ | ||
43 | Mkspecs = ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/ | ||
44 | EOF | ||
45 | } | ||
46 | |||
47 | addtask generate_qt_config_file after do_patch before do_configure | ||
48 | |||
49 | qmake_base_do_configure() { | ||
50 | case ${QMAKESPEC} in | ||
51 | *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++|*linux-gnuspe-oe-g++|*linux-uclibcspe-oe-g++|*linux-gnun32-oe-g++) | ||
52 | ;; | ||
53 | *-oe-g++) | ||
54 | die Unsupported target ${TARGET_OS} for oe-g++ qmake spec | ||
55 | ;; | ||
56 | *) | ||
57 | bbnote Searching for qmake spec file | ||
58 | paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" | ||
59 | paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" | ||
60 | |||
61 | if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then | ||
62 | paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths" | ||
63 | fi | ||
64 | for i in $paths; do | ||
65 | if test -e $i; then | ||
66 | export QMAKESPEC=$i | ||
67 | break | ||
68 | fi | ||
69 | done | ||
70 | ;; | ||
71 | esac | ||
72 | |||
73 | bbnote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" | ||
74 | |||
75 | if [ -z "${QMAKE_PROFILES}" ]; then | ||
76 | PROFILES="`ls *.pro`" | ||
77 | else | ||
78 | PROFILES="${QMAKE_PROFILES}" | ||
79 | fi | ||
80 | |||
81 | if [ -z "$PROFILES" ]; then | ||
82 | die "QMAKE_PROFILES not set and no profiles found in $PWD" | ||
83 | fi | ||
84 | |||
85 | if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then | ||
86 | AFTER="-after" | ||
87 | QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" | ||
88 | bbnote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" | ||
89 | fi | ||
90 | |||
91 | if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then | ||
92 | QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" | ||
93 | bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" | ||
94 | fi | ||
95 | |||
96 | # Hack .pro files to use OE utilities | ||
97 | LCONVERT_NAME=$(basename ${OE_QMAKE_LCONVERT}) | ||
98 | LRELEASE_NAME=$(basename ${OE_QMAKE_LRELEASE}) | ||
99 | LUPDATE_NAME=$(basename ${OE_QMAKE_LUPDATE}) | ||
100 | XMLPATTERNS_NAME=$(basename ${OE_QMAKE_XMLPATTERNS}) | ||
101 | find -name '*.pro' \ | ||
102 | -exec sed -i -e "s|\(=\s*.*\)/$LCONVERT_NAME|\1/lconvert|g" \ | ||
103 | -e "s|\(=\s*.*\)/$LRELEASE_NAME|\1/lrelease|g" \ | ||
104 | -e "s|\(=\s*.*\)/$LUPDATE_NAME|\1/lupdate|g" \ | ||
105 | -e "s|\(=\s*.*\)/$XMLPATTERNS_NAME|\1/xmlpatterns|g" \ | ||
106 | -e "s|\(=\s*.*\)/lconvert|\1/$LCONVERT_NAME|g" \ | ||
107 | -e "s|\(=\s*.*\)/lrelease|\1/$LRELEASE_NAME|g" \ | ||
108 | -e "s|\(=\s*.*\)/lupdate|\1/$LUPDATE_NAME|g" \ | ||
109 | -e "s|\(=\s*.*\)/xmlpatterns|\1/$XMLPATTERNS_NAME|g" \ | ||
110 | '{}' ';' | ||
111 | |||
112 | #bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" | ||
113 | unset QMAKESPEC || true | ||
114 | ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" | ||
115 | } | ||
116 | |||
117 | EXPORT_FUNCTIONS do_configure | ||
118 | |||
119 | addtask configure after do_unpack do_patch before do_compile | ||
diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass deleted file mode 100644 index 13b1050aac..0000000000 --- a/meta/classes/qt4e.bbclass +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | QT4EDEPENDS ?= "qt4-embedded " | ||
2 | DEPENDS_prepend = "${QT4EDEPENDS}" | ||
3 | |||
4 | inherit qmake2 | ||
5 | |||
6 | QT_BASE_NAME = "qt4-embedded" | ||
7 | QT_DIR_NAME = "qtopia" | ||
8 | QT_LIBINFIX = "E" | ||
9 | # override variables set by qmake-base to compile Qt/Embedded apps | ||
10 | # | ||
11 | export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" | ||
12 | export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri" | ||
13 | export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" | ||
14 | export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" | ||
15 | export OE_QMAKE_LIBS_QT = "qt" | ||
16 | export OE_QMAKE_LIBS_X11 = "" | ||
17 | export OE_QMAKE_EXTRA_MODULES = "network" | ||
18 | EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " | ||
19 | |||
20 | # Qt4 uses atomic instructions not supported in thumb mode | ||
21 | ARM_INSTRUCTION_SET = "arm" | ||
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass deleted file mode 100644 index 6f06d34755..0000000000 --- a/meta/classes/qt4x11.bbclass +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | QT4DEPENDS ?= "qt4-x11 " | ||
2 | DEPENDS_prepend = "${QT4DEPENDS}" | ||
3 | |||
4 | # depends on qt4-x11 | ||
5 | REQUIRED_DISTRO_FEATURES += "x11" | ||
6 | |||
7 | inherit qmake2 distro_features_check | ||
8 | |||
9 | QT_BASE_NAME = "qt4" | ||
10 | QT_DIR_NAME = "qt4" | ||
11 | QT_LIBINFIX = "" | ||
12 | |||
13 | # Qt4 uses atomic instructions not supported in thumb mode | ||
14 | ARM_INSTRUCTION_SET = "arm" | ||