From patchwork Tue May 9 14:34:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 98912 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1853793qge; Tue, 9 May 2017 07:35:01 -0700 (PDT) X-Received: by 10.84.247.9 with SMTP id n9mr570303pll.119.1494340501358; Tue, 09 May 2017 07:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494340501; cv=none; d=google.com; s=arc-20160816; b=tm+bbMSREHkQYicfg/E8fgCi/2DWDwgx3bwBRDgpnwg8hNyg1TNlluYl72krnn1GJU GuUM5m5giKLt9tWi+qVpXOypXD1l7KKVPufrqTmSVrYP2Z1xbvD+pQuEB4PSI5djvhL8 jo18BcsYfPDKOWJSO0f6lhmu0O4HgX/AJvNkflMZKjKrES0Qg4MVHhoS73vHCvceL3vY pPLwYdcfZJhH9oPDwwklp/tApcpXXKUkhvly80K/0MjMCvpLqzPh8gebU+F0kdSD+Bsv uBbg0R+uRl4MmOps1zWoI2Cs/d+wNZ++BoPUbD0p85yvMfKg+C3ik0MZLNzlRU94Lxb4 MaXw== 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=T3CII5zu8gxnSDn3iAVu5+UIQS3ZlLhDfftmKLEVX4g=; b=PhlYNo+LC1WHhuVftr0Elh0miRJoPhy6yoTEp5w++ryrH4/6DJlAsxzUgRpfbhXzc7 3W128nyEBE3x5l2uV+RwYndCFCqaSQY0G4XOjglOR48oOySZfMibicoznDMe/7aAenyW lBarCKxPHiNjprZt1zYV19CKZnNeoBayYmNOas6RDbMH8gS3ZkZOwyLOiNfy+baKkyrB m2zUuJ+MNIBRIxZU5P31Xqrfa/yOE8cJa7BL6WxpRe9EnvNByI01daIi9hUOmshqEKyt Jyyf22BTMMNja1bJUk69MdcfAOE2YynKDIX5vDi8J3K92azQtqeYCaMPyV/DqKF2v3dS knvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; 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 1si104099plj.29.2017.05.09.07.35.00; Tue, 09 May 2017 07:35:01 -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; 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 4190E71996; Tue, 9 May 2017 14:34:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by mail.openembedded.org (Postfix) with ESMTP id D792B719B8 for ; Tue, 9 May 2017 14:34:51 +0000 (UTC) Received: by mail-wr0-f176.google.com with SMTP id l9so1711146wre.1 for ; Tue, 09 May 2017 07:34:52 -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=2W8gMQs5PsmMMZ0gfEJds2CIjNdKzswVCWV8oIUKHy0=; b=wx3drG4FBDnKmTCMv7hGQQpYb2oKb+NQ62xfuL5bSMfbJiLrst8QfrvbufkyzGjLU/ WEf5OX1p1gr7RCWaw5JWCOSKzG4onustY/0c3UYwYyqbbJ9V3Gc8YH0PTXkXvEvfL4HY gLG2M8R/t7N9vOa/nx53ZN0Tg2BAci8CBV5NBfwm+iomuT78+EGNL3cp65nz+zz/s6bX ERE23lJIWolvWTBfWir4949nrGnGmqDe6DOHGypycPwAwhvXyIfeISRPNU9FYWquLm2N UFoMs/7cuSTN0PrP7f+kVRsJvC/6xvwUMnp5swcPfVSGqivz+D3R3ezl1huRVG7MZy5z GHLw== 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=2W8gMQs5PsmMMZ0gfEJds2CIjNdKzswVCWV8oIUKHy0=; b=HJZF6QoQ/2CdfAV4jkjLu615/jt0151t29TR53RUHWu376ZuOCPgHquvCXR7+Jukw2 7aYS3wVPmxHLVK7f+SRg7bI18cpJwng5NPlf8U01MFe/Wh8pWqjfAMVHVNlTfF5uXybM tN59gRv9lFA5ynq0phsROByawD3YB0w/IUXmcz0kG97src795+t53eusuW7Hz/6exzIj FY0ra1FGiF6niB6tT9aXyP2tWMt1llxBH44nmhB4gZVQRgjgr4Z2xRKdv2u9CU4nCq80 jGPgJA8E3Tg8/itQ4TCFm5f4gKuBBQgzlqBl6IZ3qCWYGqgzXtuCF7hQUH1EDVLwFBg2 mXBA== X-Gm-Message-State: AODbwcDhfixdgFFrpAXWM/M5091N5nh4M9HtOyS8XlXibPzAe7WCC4PZ ORUh0ylqVupExdi+NnI= X-Received: by 10.28.113.73 with SMTP id m70mr385178wmc.12.1494340491828; Tue, 09 May 2017 07:34:51 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 8sm50592wrb.55.2017.05.09.07.34.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 May 2017 07:34:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 9 May 2017 15:34:48 +0100 Message-Id: <1494340488-19285-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Subject: [OE-core] [PATCH] kconfig-frontends: fix build race 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 In parallel builds utils/kconfig-tweak may be written to before utils/ exists, so add a mkdir. Also mark the pkgconfig patch as Submitted as I sent that upstream at the same time. Signed-off-by: Ross Burton --- .../files/0001-Fix-installation-of-.pc-files.patch | 3 +- .../kconfig-frontends/files/missing-mkdir.patch | 33 ++++++++++++++++++++++ .../kconfig-frontends_4.10.0.1.bb | 3 +- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch b/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch index e9195a0..57ea42e 100644 --- a/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch +++ b/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix installation of .pc files They go to prefix/pkgconfig/, not prefix/pkg-config. -Upstream-Status: Pending +Upstream-Status: Submitted Signed-off-by: Alexander Kanavin --- Makefile.am | 2 +- @@ -26,4 +26,3 @@ index 058690a..f9e9b7b 100644 EXTRA_DIST += libs/parser/kconfig-parser.pc.in -- 2.11.0 - diff --git a/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch b/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch new file mode 100644 index 0000000..a06a547 --- /dev/null +++ b/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch @@ -0,0 +1,33 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From ca05ee2fb6db5b3b1edc16dba6150a2c6078a6cf Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 9 May 2017 15:30:00 +0100 +Subject: [PATCH] Makefile: ensure utils/ exists before writing to it + +Since utils/ was changed to not build recursively it's possible that in +out-of-tree builds the utils/ directory hasn't been created when Make runs the +utils/kconfig-tweak target which tries to write to file inside utils/. + +To ensure this can work, mkdir the directory. + +Signed-off-by: Ross Burton +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index c8e96ef..1baa110 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -348,6 +348,7 @@ EXTRA_DIST += \ + utils/kconfig-tweak.in.patch + + utils/kconfig-tweak: utils/kconfig-tweak.in ++ $(MKDIR_P) $(@D) + $(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \ + $< >$@ + @chmod +x $@ +-- +2.8.1 diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb index be90d6b..d427e98 100644 --- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb +++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb @@ -15,7 +15,8 @@ DEPENDS += "ncurses flex bison gperf-native" RDEPENDS_${PN} += "python3 bash" SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.10.x \ file://0001-Fix-installation-of-.pc-files.patch \ - file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch" + file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch \ + file://missing-mkdir.patch" SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e"