From 8b11ed8a75a15328bbd22d100a976cc669b84b58 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 27 Nov 2015 15:48:20 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-distrovars.inc | 2 -- meta/conf/distro/include/distro_alias.inc | 20 -------------------- 2 files changed, 22 deletions(-) (limited to 'meta/conf/distro/include') 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" -- cgit v1.2.3-54-g00ecf