diff options
72 files changed, 1 insertions, 3698 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 # - nfs-client - NFS client # - ssh-server-dropbear - SSH server (dropbear) # - ssh-server-openssh - SSH server (openssh) -# - qt4-pkgs - Qt4/X11 and demo applications # - hwcodecs - Install hardware acceleration codecs # - package-management - installs package management tools and preserves the package manager database # - 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" FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" -FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps" FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" 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 @@ -# -# QMake variables for Qt4 -# -inherit qmake_base - -DEPENDS_prepend = "qt4-tools-native " - -export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri" -export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" -export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" -export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" -export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" -export OE_QMAKE_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4" -export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4" -export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" -export OE_QMAKE_LINK = "${CXX}" -export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" -export OE_QMAKE_LIBS_QT = "qt" -export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" -export OE_QMAKE_LIBS_X11SM = "-lSM -lICE" -export OE_QMAKE_LCONVERT = "${STAGING_BINDIR_NATIVE}/lconvert4" -export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4" -export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4" -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 @@ -QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/qmake" - -OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" -QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" - -# We override this completely to eliminate the -e normally passed in -EXTRA_OEMAKE = "" - -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," - -# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 - -oe_qmake_mkspecs () { - mkdir -p mkspecs/${OE_QMAKE_PLATFORM} - for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do - if [ -L $f ]; then - lnk=`readlink $f` - if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then - ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f` - else - cp $f mkspecs/${OE_QMAKE_PLATFORM}/ - fi - else - cp $f mkspecs/${OE_QMAKE_PLATFORM}/ - fi - done -} - -do_generate_qt_config_file() { - export QT_CONF_PATH=${WORKDIR}/qt.conf - cat > ${WORKDIR}/qt.conf <<EOF -[Paths] -Prefix = -Binaries = ${STAGING_BINDIR_NATIVE} -Headers = ${STAGING_INCDIR}/${QT_DIR_NAME} -Plugins = ${STAGING_LIBDIR}/${QT_DIR_NAME}/plugins/ -Mkspecs = ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/ -EOF -} - -addtask generate_qt_config_file after do_patch before do_configure - -qmake_base_do_configure() { - case ${QMAKESPEC} in - *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++) - ;; - *-oe-g++) - die Unsupported target ${TARGET_OS} for oe-g++ qmake spec - ;; - *) - bbnote Searching for qmake spec file - paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" - paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" - - if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then - paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths" - fi - for i in $paths; do - if test -e $i; then - export QMAKESPEC=$i - break - fi - done - ;; - esac - - bbnote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" - - if [ -z "${QMAKE_PROFILES}" ]; then - PROFILES="`ls *.pro`" - else - PROFILES="${QMAKE_PROFILES}" - fi - - if [ -z "$PROFILES" ]; then - die "QMAKE_PROFILES not set and no profiles found in $PWD" - fi - - if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then - AFTER="-after" - QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" - bbnote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" - fi - - if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then - QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" - bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" - fi - - # Hack .pro files to use OE utilities - LCONVERT_NAME=$(basename ${OE_QMAKE_LCONVERT}) - LRELEASE_NAME=$(basename ${OE_QMAKE_LRELEASE}) - LUPDATE_NAME=$(basename ${OE_QMAKE_LUPDATE}) - XMLPATTERNS_NAME=$(basename ${OE_QMAKE_XMLPATTERNS}) - find -name '*.pro' \ - -exec sed -i -e "s|\(=\s*.*\)/$LCONVERT_NAME|\1/lconvert|g" \ - -e "s|\(=\s*.*\)/$LRELEASE_NAME|\1/lrelease|g" \ - -e "s|\(=\s*.*\)/$LUPDATE_NAME|\1/lupdate|g" \ - -e "s|\(=\s*.*\)/$XMLPATTERNS_NAME|\1/xmlpatterns|g" \ - -e "s|\(=\s*.*\)/lconvert|\1/$LCONVERT_NAME|g" \ - -e "s|\(=\s*.*\)/lrelease|\1/$LRELEASE_NAME|g" \ - -e "s|\(=\s*.*\)/lupdate|\1/$LUPDATE_NAME|g" \ - -e "s|\(=\s*.*\)/xmlpatterns|\1/$XMLPATTERNS_NAME|g" \ - '{}' ';' - -#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" - unset QMAKESPEC || true - ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" -} - -EXPORT_FUNCTIONS do_configure - -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 @@ -QT4EDEPENDS ?= "qt4-embedded " -DEPENDS_prepend = "${QT4EDEPENDS}" - -inherit qmake2 - -QT_BASE_NAME = "qt4-embedded" -QT_DIR_NAME = "qtopia" -QT_LIBINFIX = "E" -# override variables set by qmake-base to compile Qt/Embedded apps -# -export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri" -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" -export OE_QMAKE_LIBS_QT = "qt" -export OE_QMAKE_LIBS_X11 = "" -export OE_QMAKE_EXTRA_MODULES = "network" -EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " - -# Qt4 uses atomic instructions not supported in thumb mode -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 @@ -QT4DEPENDS ?= "qt4-x11 " -DEPENDS_prepend = "${QT4DEPENDS}" - -# depends on qt4-x11 -REQUIRED_DISTRO_FEATURES += "x11" - -inherit qmake2 distro_features_check - -QT_BASE_NAME = "qt4" -QT_DIR_NAME = "qt4" -QT_LIBINFIX = "" - -# Qt4 uses atomic instructions not supported in thumb mode -ARM_INSTRUCTION_SET = "arm" diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 8866f0d2f8..0c6d018365 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -31,8 +31,6 @@ COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" COMMERCIAL_VIDEO_PLUGINS ?= "" # COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" -COMMERCIAL_QT ?= "" -# COMMERCIAL_QT ?= "qmmp" # Set of common licenses used for license.bbclass COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index dfce7605d1..530917760a 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -52,7 +52,6 @@ DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" -DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" @@ -102,7 +101,6 @@ DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto" DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" -DISTRO_PN_ALIAS_pn-fotowall = "Fedora=fotowall Ubuntu=fotowall" DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" @@ -261,8 +259,6 @@ DISTRO_PN_ALIAS_pn-meta-environment-qemux86 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-environment-qemux86-64 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core" DISTRO_PN_ALIAS_pn-meta-toolchain = "OE-Core" -DISTRO_PN_ALIAS_pn-meta-toolchain-qt = "OE-Core" -DISTRO_PN_ALIAS_pn-meta-toolchain-qte = "OE-Core" DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT" DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" @@ -301,8 +297,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-core-qt = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-core-qt4e = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core" @@ -319,11 +313,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-x11-xserver = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86 = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86-64 = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qt4e = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-target = "Intel" -DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-host = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-target = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core" DISTRO_PN_ALIAS_pn-package-index = "OE-Core" @@ -365,15 +354,6 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" -DISTRO_PN_ALIAS_pn-qmmp = "Fedora=qmmp Debian=qmmp" -DISTRO_PN_ALIAS_pn-qt4 = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" -DISTRO_PN_ALIAS_pn-qt4e-demo-image = "OE-Core" -DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT" -DISTRO_PN_ALIAS_pn-qt4-graphics-system = "OE-Core" -DISTRO_PN_ALIAS_pn-qt4-tools = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" -DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free" -DISTRO_PN_ALIAS_pn-qt-demo-init = "OE-Core" -DISTRO_PN_ALIAS_pn-quicky = "OSPDT" DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 845559a5e7..e09f7d8829 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -23,7 +23,6 @@ do_devshell[doc] = "Starts a shell with the environment set up for development/d do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" do_fetch[doc] = "Fetches the source code" do_fetchall[doc] = "Fetches all remote sources required to build a target" -do_generate_qt_config_file[doc] = "Writes a qt.conf file for building a Qt-based application" do_install[doc] = "Copies files from the compilation directory to a holding area" do_install_ptest_base[doc] = "Copies the runtime test suite files from the compilation directory to a holding area" do_kernel_checkout[doc] = "Checks out source/meta branches for a linux-yocto style kernel" diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb deleted file mode 100644 index 4451848656..0000000000 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." -LICENSE = "MIT" -PR = "r3" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -IMAGE_INSTALL += "\ - ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-core-qt4e \ -" - -inherit core-image - diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.bb b/meta/recipes-qt/meta/meta-toolchain-qt.bb deleted file mode 100644 index a10103a39f..0000000000 --- a/meta/recipes-qt/meta/meta-toolchain-qt.bb +++ /dev/null @@ -1,5 +0,0 @@ -# Qt toolchain -QTNAME = "qt" -QT_DIR_NAME = "qt4" - -require meta-toolchain-qt.inc diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc deleted file mode 100644 index 7e75d93b14..0000000000 --- a/meta/recipes-qt/meta/meta-toolchain-qt.inc +++ /dev/null @@ -1,35 +0,0 @@ -TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-${QTNAME}-toolchain-host packagegroup-cross-canadian-${MACHINE}" -TOOLCHAIN_TARGET_TASK = "packagegroup-${QTNAME}-toolchain-target" -TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${QTNAME}-${DISTRO_VERSION}" - -require recipes-core/meta/meta-toolchain.bb - -QT_TOOLS_PREFIX = "$OECORE_NATIVE_SYSROOT${bindir_nativesdk}" - -create_sdk_files_append() { - mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/ - script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/${QT_DIR_NAME}.sh - - echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' > $script - echo 'export OE_QMAKE_CXXFLAGS="$CXXFL |