From patchwork Wed Jul 12 16:19:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 107524 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1014524qge; Wed, 12 Jul 2017 09:19:21 -0700 (PDT) X-Received: by 10.84.232.77 with SMTP id f13mr4920667pln.172.1499876361787; Wed, 12 Jul 2017 09:19:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499876361; cv=none; d=google.com; s=arc-20160816; b=qXOp2HVqvhPc8eT1wyH067Ky9wxgslNHwUkzAJtU/HKTG8e8F6ExH/U1k0lt5IEIWz j/XaEPNm0hHbDykaaRqKphGYs2mIA0Le6DWKFaxw5Gjg5p9CuXuD7sesDktYdcsdsC9W 2x+jKFORGJ0idk0EuSsUlUqJRSq8keetVeLNJhJZkQ/JE/VLU6LXxGM5b89+yFIUaLFK vK5AA7fjXCrbfOwmaWIA9bLJpF4lCL6EqZyuwA+an4BbbjDIQN+CAKxqxsyH3tCjsVYr gyAl/hQ6LjIf6YAKrCKeQYuV0TDcpW7cjQdHJcV9DgLY6Btx1D2LzIQ7SMUsJyVX8GAo dJow== 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=NFITqy+zcbA23exQPXDl/ogITw/7VoX6r6ifyqQceTc=; b=AaIKq5RRDnVZfj99D0+mXTnxSvgBnbuZwHHGPz8FL9Jm4kPQD53nW1JGa1Cd264d1Q WusHSqQh8v7mKGsnmE/q/dpPgcbH+YPIAqJTmBNzT3znxLY4D4J0Ccuj+KRM3U8z4eaj RZCe+G1yX6RtHlN98jtJmihAjNSXg9iPNgsx+AraK1WwiWguJHaDo9PmwMoSpznehlTA R9aamhYOWSXxStJ82KBV1UcYr59tIzmK2OO2wn3m0gSIry30Uk2iNEP0gBHA2zmLN5Qs cBJccQmqglQN7t9GH3XJ99bH20AGWaJF5wJeWxS/lgorypKP+W//MZGkRtKPRJOXCKeR 2jcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=ogosdhNB; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n68si2160039pfn.246.2017.07.12.09.19.21; Wed, 12 Jul 2017 09:19:21 -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.b=ogosdhNB; 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 Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0BA2C781CD; Wed, 12 Jul 2017 16:19:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by mail.openembedded.org (Postfix) with ESMTP id 6E2FC781CD for ; Wed, 12 Jul 2017 16:19:10 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id r103so40034310wrb.0 for ; Wed, 12 Jul 2017 09:19:12 -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=OTu3wkm9sn3o4AKaIY4nCYLoCEIYlphmUQ8Hszf4tkU=; b=ogosdhNB564ght+eo+ZmUZW65ZlvcFZTjXLEeQc043fvTptHmoffESmK8lXP7RbXxg bjXHOTNlBpuxqZ5zJjxl32Z9xjZfFxxj/FvoQ9np7mJkMS9eBMRKKYbnewkdpOsCT1uv iDCxDS3HiGYQMBePDcmksMr39/hrIT5SqTDtbZeJ58nSWciniHli5ANCuJBQmXmnNFE7 8R6gW2ur9/BBM1FgFJ0kM/n2BCuw+oCQmFtXjig9FdmL9GmFkzMiEuAejrfxWAI2R0nt 6liiTRSUYCSclWo33YBagw5fTFm30x6f54dD4Qh20MzG95WLZIw3CtdtFgZKbZmG5UHf 4TFQ== 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=OTu3wkm9sn3o4AKaIY4nCYLoCEIYlphmUQ8Hszf4tkU=; b=Mc6UnY+gN06HzQohdUb64DDUNKLZX2utQe8uV2JvzX3PtFwoUgKGkiKG42gLs98GNF b0k3gBSr7qw2XuFvTbWqxpFBEFkpp68KfJHu/Dw83Rwb6TQhYg9caXwCMhe9JGM1th7B nQ3zWVSNxIVrkW4ZrLdl3leDrc+m6NHKp0UPQnPhIBn6mr8J5kTDgUMx7OcX0KyuZ/vs IuNwfcpfKhLZfcO4HuUXg97WnrRG20/JWrrJKoGPi5bhRHrDhpJ7JMIYk0PH11DMTWT3 pj9sSP7vSkgl+E1ZxjXEsxZZosT+xRTr7pgXHdsiYNAMB8J4woeMabd/TGpYz2nCyhWh xc1Q== X-Gm-Message-State: AIVw113Ix/+3t0CAZ+3yuUkrLxlrIa/hfaO6vNjw5xYgM3Dg4Z5seKWa V3ZrZXFw9gRolSc6VOg= X-Received: by 10.28.7.211 with SMTP id 202mr3324440wmh.113.1499876351742; Wed, 12 Jul 2017 09:19:11 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id y76sm14733689wmh.2.2017.07.12.09.19.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jul 2017 09:19:10 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 12 Jul 2017 17:19:07 +0100 Message-Id: <20170712161907.13526-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] mesa: fix build race on src/intel/vulkan 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 It's possible that src/intel/vulkcan can be written into by sed before it has been created, so add the required mkdir calls. Signed-off-by: Ross Burton --- .../recipes-graphics/mesa/files/vulkan-mkdir.patch | 37 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa_17.1.4.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/vulkan-mkdir.patch -- 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-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch new file mode 100644 index 00000000000..15ee5eeb14c --- /dev/null +++ b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch @@ -0,0 +1,37 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 12 Jul 2017 17:10:07 +0100 +Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when + required + +In out-of-tree builds src/intel/vulkan won't exist, so always create it before +writing into it. + +Signed-off-by: Ross Burton +--- + src/intel/Makefile.vulkan.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am +index 3857a5dc62..26e9cd410c 100644 +--- a/src/intel/Makefile.vulkan.am ++++ b/src/intel/Makefile.vulkan.am +@@ -44,11 +44,13 @@ EXTRA_DIST += \ + vulkan/TODO + + vulkan/dev_icd.json : vulkan/dev_icd.json.in ++ $(MKDIR_GEN) + $(AM_V_GEN) $(SED) \ + -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ + < $(srcdir)/vulkan/dev_icd.json.in > $@ + + vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in ++ $(MKDIR_GEN) + $(AM_V_GEN) $(SED) \ + -e "s#@install_libdir@#${libdir}#" \ + < $(srcdir)/vulkan/intel_icd.json.in > $@ +-- +2.11.0 diff --git a/meta/recipes-graphics/mesa/mesa_17.1.4.bb b/meta/recipes-graphics/mesa/mesa_17.1.4.bb index 2257045c42c..f0b634a045b 100644 --- a/meta/recipes-graphics/mesa/mesa_17.1.4.bb +++ b/meta/recipes-graphics/mesa/mesa_17.1.4.bb @@ -7,6 +7,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-Use-wayland-scanner-in-the-path.patch \ file://0002-hardware-gloat.patch \ file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \ + file://vulkan-mkdir.patch \ " SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"