From patchwork Thu Jan 9 16:21:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 182762 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp3139862ile; Sun, 12 Jan 2020 08:25:17 -0800 (PST) X-Google-Smtp-Source: APXvYqxoifdZYJ37G8PDtsaAmoSJVm6UY+hFmDA4o7lMMTfhfGLDZ202XthoqAzPRP0uk7Ryx6Xa X-Received: by 2002:a17:902:9a08:: with SMTP id v8mr10190247plp.134.1578845856942; Sun, 12 Jan 2020 08:17:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578845856; cv=none; d=google.com; s=arc-20160816; b=KgmAk5XzRCVCO0nBjQO5maqPs5i/ytobw1sUvGaBBSCGc66zJs1tWt6A2UQc1AzqpG ul6r8vEx7zC1/oASkGCDfSbeO/c1oykpUj7yvqHNWLrzKTFpKgI/wdXIXdG1kYIWqKQt 08Ske0KuQHN9ju8tLR5+7ZS7iBV4WMqR5VVFQpFiWbcJwqX9fanQCgBpKkUp3qenZPXd u3WWpNkCz6dqmZh8M49HSMd6XI+59YGkI8OLOSfdgszCnEPD8gOFN5Z3cNXkdAtPggj2 p/4S6ij3KfgjAzRh67oDLTLnt77fcybOOQbBGJei1WmTHZ5NHewcph8ode53S2kLPhOp HAog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=3WVGgZbjjeclL+ZtX2IdNv3xgQlFEPmdhTytokkCXm4=; b=WNoc0L5usZV0hrkCE/I1e6mejkxpVpfV05KK+LGWVN4PhK6humVRbR7ku2yv11EY8e NXfRsfPTujs8LTyQYFh75npF69C9pOWd/DxAAZglfCwZnDPnHs3HEj1+fxEYLxLhyZuJ Yh+w0JxGjQq+gae1cXu6J+7oowW4M5wJqi+8NRcMiqEI5LIxnXlUjb7RpxUGDXRNULl8 jOFIDYvGEgd0flHAm1uYap+Z9Ie9NVnBtZIRINV9UB2eYWh62XCCVIybXiYYhOBqmtD6 JgdoX/J0xlmrtRMGNpd11MJ1oEu0dSWt6RfC+M30QMSyhmLuictjrkTQTgIZ/u3cbTze B8KQ== 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=1cZ1R0lJ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 a12si9220183pju.81.2020.01.12.08.17.36 for ; Sun, 12 Jan 2020 08:17:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=1cZ1R0lJ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1A1107FF18; Thu, 9 Jan 2020 16:22:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mail.openembedded.org (Postfix) with ESMTP id BB9667FE07 for ; Thu, 9 Jan 2020 16:21:50 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id z3so8055613wru.3 for ; Thu, 09 Jan 2020 08:21:52 -0800 (PST) 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:in-reply-to:references:mime-version :content-transfer-encoding; bh=F2U/ijBONX50ajLu2z07GmLerwICgnvB/LdOOfeL/c4=; b=1cZ1R0lJk53E9E31gvWnYY6RgDx6QK+Ays4tcfCILcTAaEbiuwYxVOzMHG5mzl1ANc BE1Gc4ngsLqmP5g1nRfZmyAG2Sh31Zu7/ID9lVyf4UYfYHOh0c2T3GL9iO56Rl6R32J/ aWd1g+Zt2RInQ/ph7yoJOhgMTthfSTo7N1QlJQEShw2iUQ/MGNEEjKKvgx5R/pj9CYz5 v4Vtfb6tJXRKmT54bdZuVfqbKMqeIGtBZ3z4naWfsnEeZ1HjCT0h+4tF+HIISwunL+Wz HjxksM4/JZhrrEkVPyyI+O85hTBw/2p+hBW9YCXlqydhgyJfZohPghQ+X1vfYbh5oPjD 6kOg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=F2U/ijBONX50ajLu2z07GmLerwICgnvB/LdOOfeL/c4=; b=Xu82y/DtP6hvwmgIqicIoX79xGOK4wd9Mjfrv/p5yqyWXqymsf+JAIiRqbYLqvxziZ 3gk3JBGYvTnt0WYD7VEkfzcJGiDwh08l9i8ZYVt4s4HkJlsdaccGDlQPKwAxx2D5njxP ZSxrWfK4HUeoqZ3ForXOVyeeZodz2EkDsCRjHKwSpQzRk6fwhxRtG65AQ227IyTicvzN ZEbi3Qxc8pGgGjzFdT2SstsOoLxLIY/UIV3Y1+CxJnuvxyVE2UaFmX/oW2wCRVwTqNfn e1/nx+LtCIKtfvG1ukjaHpyaoOjTTBgbQ1qa4BG50EazjjgjovjAX15pb8+hGWqWFIf+ sKcw== X-Gm-Message-State: APjAAAXzGJZAzirXOuyZzLX42uiCNkZ3bR+dFfILbUOYF2nSX2SvRwvL /x2FmFL5sEiej/XXUJBfqJIpk/hPaEA= X-Received: by 2002:adf:f3cc:: with SMTP id g12mr11862121wrp.236.1578586911198; Thu, 09 Jan 2020 08:21:51 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id d14sm8655010wru.9.2020.01.09.08.21.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 08:21:50 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Thu, 9 Jan 2020 16:21:41 +0000 Message-Id: <20200109162141.20579-4-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109162141.20579-1-ross.burton@intel.com> References: <20200109162141.20579-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [oe] [PATCH 4/4] opencv: abort configure if we need to download X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org OpenCV's habit of downloading files during do_configure is bad form (as it becomes impossible to do offline builds), so add an option to error out if a download would be needed. Signed-off-by: Ross Burton --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 03e4f58dca..f679ccb05f 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ + file://download.patch \ " PV = "4.1.0" @@ -87,6 +88,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \