From patchwork Wed Jul 18 16:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 142291 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp704158ljj; Wed, 18 Jul 2018 09:00:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfXeEWoXoViuJ+mVeyou4M0VH8lDMpgOebzgayAjjcx8zsw3nTHPI/WfKnfOIhCFiiAkAeH X-Received: by 2002:a17:902:1703:: with SMTP id i3-v6mr6321984pli.263.1531929617724; Wed, 18 Jul 2018 09:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531929617; cv=none; d=google.com; s=arc-20160816; b=oiOd/Elc5sK8gb5ju05iyqfcvZuiEkspXWK+QbyDld54qlXz3c3SXmZ0liMh/JY2vg kIlTcp6yxKEZ+wXq9RNvPlxi9ymLdvo+K8T0YuvJ0b9Kmm/2ysKMlHiw7wWKE/exTZ7q QhlwiC/mwIgDJIery0WmixNLL6VItlTAS+BuIWGxHf6MShcVoa9+d+hGMr5KwfYRTkqj I+xFQIClH1trDsj29VhYWKMyJPokloHWrFA1tTTsZWNZ4usGgd/JSBq2/KsRZPspTYUz XzvtBW6jl2WVRb5mmzIy+pb6zW+HPn/v7XEpFKJmzBiNbP7FCrqMeOtCE0OvYqH5nF2S rGoQ== 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=UQmFqhlifE0GNHG1R8QTt9cTLXUDVStshmmUxbOLqUY=; b=QRqHHWc6SgW6xZryCNtyBbdINyXzx4KUw7orvPnoCGsryo0aCU/zdmPY+Rl7evzsBy 6ZXifXaBXSHtjfjyd+mBMOG8sJdo5rcQQsi3MZI1Vt2vyMQBnozPYfo+SwJsi1Bdt1E7 VRQ4Nk0Ji2aaPQuh81Gp3Xq1N0YLwQm4A6+B3QmUbhkKX+/gmhFUXvjs4kg1HNLSGdpx Mw6OfA99ZOOzY2mBD5oScw+cBbZVIxE9L50GngPrzo2KB0LcEySGS3A23FP1j4r4fK91 rYCfcFujbPEUiQJ8FIN1AQPKtDji4pZf5Fvs1tTjKv1Sp6rQbAK8rGhbHUoKa0s9/1qb ky4w== 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=YPLKhZIg; 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 n21-v6si3752956pgk.307.2018.07.18.09.00.17; Wed, 18 Jul 2018 09:00:17 -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=YPLKhZIg; 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 CFFD6789AE; Wed, 18 Jul 2018 16:00:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 5CCE978998 for ; Wed, 18 Jul 2018 16:00:10 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id v14-v6so5213952wro.5 for ; Wed, 18 Jul 2018 09:00:11 -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=K7fCKaQ8oisaKv1DCiOhf0NurHNvgN+a15+LVFSQ67M=; b=YPLKhZIgckinvEUx5im/Ba6W1M96N1q825KUKvjrQWWXpN6fdplPj/dn875YPAsDEx 7J/LwGZqMQV7MWATna57ClK62fuwsxXWphWgXnlVLsFAOR7DBKAyAHS+EizxRS7jRKWJ r5Eacdqgwj1Iq9afzn67aw/GICe0kuWFACljKrre/fr6lXVnmv+4V1+QRmz+0J/3YZ1q BwB1h/s986VouqxC7noLB4+effFXsM2vXxFrqMy5ADM996MY5P11/LXJfVfaXvdvFhWo 5GwTL4OmCLEnt/lZXpJUeuG4fxNBe/VLuVmWE2EjsZGgvACTX7qPJ1WLcR7tEa+U6qgV zr3g== 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=K7fCKaQ8oisaKv1DCiOhf0NurHNvgN+a15+LVFSQ67M=; b=kaQ1WqifptVeToqGH80QEC2+8DlERkI3gZ9To+9EItZIiQVvaOPLxHTZ7M/YBy61Lg Iew5boBBFrgCLhf5OzQFc/E+BPEPEmD/hR44D35ODCPngcma2QZBg2GtGYmSL4eRfdpa H7cuPEMlpb/bRJOWpDFrXlbYzfGoDhy+uNDjkhk6YEnvATsnZJxRZ+fkdmzg7AyHqzjv TNEjN0Olq4vGvIDzHdwXhM1b18a9yw/Tp07Rbtdg/6I9/ny0GpD/JqGh9kh9zik+a6bi Z9psWvIBV3ayhWNGuPQkUFLMZyLHP9jNM1vrNYc58rivsYAVdYd/6pShhyjnilWKx8tl G8UQ== X-Gm-Message-State: AOUpUlHh4dbACUZ0xVz7cpb0itDGTGl9SgV04g22bHk6nx+fCcXoPqvR 0AvSNoCmdoju/izktxMVT0xP7usN X-Received: by 2002:adf:ab14:: with SMTP id q20-v6mr4727238wrc.239.1531929610752; Wed, 18 Jul 2018 09:00:10 -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 d102-v6sm5220812wma.10.2018.07.18.09.00.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jul 2018 09:00:10 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 18 Jul 2018 17:00:08 +0100 Message-Id: <20180718160008.8457-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] cmake: put cmake.m4 and toolchain file in PN 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 Previously cmake-dev held some files which should be in cmake. - cmake.m4 should be in installed in cmake so it can be used out of the box - nativesdk-specific OEToolchainConfig.cmake file used to be in cmake, but the change of default packaging rules move it into cmake-dev. This recipe is the exception and it should be moved back. Add the extra paths to cmake, and clear FILES for cmake-dev to ensure nothing else slips in. Signed-off-by: Ross Burton --- meta/recipes-devtools/cmake/cmake_3.11.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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/cmake/cmake_3.11.4.bb b/meta/recipes-devtools/cmake/cmake_3.11.4.bb index eb055b97571..e0457677e86 100644 --- a/meta/recipes-devtools/cmake/cmake_3.11.4.bb +++ b/meta/recipes-devtools/cmake/cmake_3.11.4.bb @@ -46,7 +46,8 @@ do_install_append_class-nativesdk() { FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" -FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal" FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN}-dev = "" BBCLASSEXTEND = "nativesdk"