From patchwork Tue Jun 5 12:49:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 137730 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp918014lji; Tue, 5 Jun 2018 05:49:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL6ETWESmwXS6RtYWySGxdml+76V4mGDj30q58SVQxaAsYVvkZW56XCrj48PSwXQSkUVv5u X-Received: by 2002:a17:902:aa8f:: with SMTP id d15-v6mr5526213plr.359.1528202993455; Tue, 05 Jun 2018 05:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528202993; cv=none; d=google.com; s=arc-20160816; b=SgM+noNlyJkTLzSQWGQ6xYRvbL7pcYkHNu5gaZ/b2YzmOgvr71I1W848tMWNtYQg6C dQOUFquosmaZ6vU9oQBRtZjomy4EXuKvEbEWj6KO0N5+u3nDW90h5g4QaHXbgFkOHl5+ s0vtgAIgeDjDc0jeXtwb84c0HFg5fOfNbsxi84km/XuSo8mUuD8PAu78FHolXc2dU14v s2iD2P1mLVFYc2ccOE5iyV+xGnZoYlvEYoZvBw/BexM+0ZaVbP19+n4safqE1uTmg6zA ioNj3595BdiUf4Yhsg9XOLY7VE+VgCIhqjqdBIBNWSCsoqrt+Xv5Uyg8xmMWG3aOGdIe 6rgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=4QEVfM3uyF2y0moUPYiZQGnWZfvBiQJzpjw7+2S/xaE=; b=AC4y5ii38VWErZ9WLlMam6IIs60SMnUq2xMrVlT29JWWYhOdJWXJ9okaW+xULP/rhm BslgFZQs4LzPsyrzVss+giBcNMmiavxBjNUSkBlNKtETVS8eIdrbhfp9kiO5TfXKQdUN ITv8A61FozInCYQe7eCCdrhUGZuh+80EerXwNFxJyAMPe/1oc85pYCFAkbSFK0OLRu0y WpuKxmjeED4wTvxEdtTCfcTKCh6B/uN6AJyQQR3kV4bTjlbbfG/9K1iBBVTnZDHc/80o 3OI9jP3D+c1qsHxARNlqCGl5vzGZxvM7CpKCYT1WwmSnqfa+J+DGKlgV7/d/5atK9aYV M6gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=K/RdVUDj; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q10-v6si19361621pfh.17.2018.06.05.05.49.53; Tue, 05 Jun 2018 05:49:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=K/RdVUDj; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CE6E477183; Tue, 5 Jun 2018 12:49:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id DD6CA754FE for ; Tue, 5 Jun 2018 12:49:48 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id p11-v6so4856483wmc.4 for ; Tue, 05 Jun 2018 05:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=I5HxXpHrH/xkhCPSvLNtJv/sNTpw+YWGX9ZTvkT2PJE=; b=K/RdVUDjJfrGpsaYy9SJdaFvRE/3nvVeBqutXn+egONR4wZPaVm04TAMwBi0wSYWKj ITOefplFimXsMz9JROsPvyvL/zE5XG/mK95xdbfQXBsOovNYN7fJuJd0QQLK+kuTCKfC 4OAjikUvJ+qdRFpSeAibEac1BcAg66U4JU1IrAZfxmprigFRlLuT6LftxI8nJnv88IM1 98kahEc6s7qjZ6RDVqnmXOIRJyyCRNHlBU71+4oOnfUs19dpzWmoUyFKg1Sj5957rJGH GlXv7bE3/5/SdqWu54ndpls/TBuH9FXYHipXxthcs6eNuS5Bt41d//1PiQdtwjZPpQkp 4eFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=I5HxXpHrH/xkhCPSvLNtJv/sNTpw+YWGX9ZTvkT2PJE=; b=qLNtPCbXl+1H+/mVnw7PH8Z1Ug+jI2vGIA1D/Fcns5DqxKY/na9CbTH73/ltV9Hjtf 8sWx+5SCCi2EuIhH5NlXZd/JlRaFAJ5xM44+Ko7KXhEVtOq0W0yBl72v44cxMQIGx5kQ ZPjVbxZVGKkZTFA2qVVjwywHFLZFA7FUluZyIGwo7SnAnr01Gll5TEFKPiDngsNSNKRz J4dDrMz9DnO8X6su1Odk2pn6OsQfNMNLOUNeoQj2D4B4hhewbo/zKkctBnDESA0HRSrQ m6L+yW5DAwnLqvX8Qx3oZS6+Q+BN8k1+OaId4d9/waRG7Quuyl2AFOZ2Om2RTU+wJh8u sQFg== X-Gm-Message-State: APt69E2BUyH5905wQQ7arjaqTjUZOo9dP8Ise/Si0nsGLibCvDJP8f+d nYqE/b5agjAbQCYO+CCcY3J04jKH X-Received: by 2002:a1c:da4e:: with SMTP id r75-v6mr4647428wmg.64.1528202989331; Tue, 05 Jun 2018 05:49:49 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id l5-v6sm31056419wrn.92.2018.06.05.05.49.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jun 2018 05:49:48 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 5 Jun 2018 13:49:43 +0100 Message-Id: <20180605124945.15313-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/3] qemu: only build SDL UI if X11 is enabled X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The SDL UI now assumes that it is using X11 because it includes X headers, so only enable it if X11 is enabled. Signed-off-by: Ross Burton --- meta/recipes-devtools/qemu/qemu.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index faaea781cd7..2f73b21c30e 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -74,11 +74,12 @@ do_install_append() { # END of qemu-mips workaround PACKAGECONFIG ??= " \ - fdt sdl kvm \ + fdt kvm \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sdl', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " PACKAGECONFIG_class-native ??= "fdt alsa kvm" -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" +PACKAGECONFIG_class-nativesdk ??= "fdt kvm ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sdl', '', d)}" # Handle distros such as CentOS 5 32-bit that do not have kvm support PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"