From patchwork Thu Apr 26 17:19:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Love X-Patchwork-Id: 10366551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5D41601D3 for ; Thu, 26 Apr 2018 17:27:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7FF528A0C for ; Thu, 26 Apr 2018 17:27:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CF7628ABC; Thu, 26 Apr 2018 17:27:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E18628A0C for ; Thu, 26 Apr 2018 17:27:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756879AbeDZR1q (ORCPT ); Thu, 26 Apr 2018 13:27:46 -0400 Received: from sub5.mail.dreamhost.com ([208.113.200.129]:34903 "EHLO homiemail-a80.g.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756865AbeDZR1m (ORCPT ); Thu, 26 Apr 2018 13:27:42 -0400 Received: from homiemail-a80.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a80.g.dreamhost.com (Postfix) with ESMTP id 1345CE00083F; Thu, 26 Apr 2018 10:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=nextdimension.cc; h=from :to:cc:subject:date:message-id:in-reply-to:references; s= nextdimension.cc; bh=UuMgiqxFnR0St7bzQ0yG5GjCNDY=; b=hMGHIgQMLWN LFgOpJCrtiuwXUsEaah3MNuYY5gublBMPwTHXuEo7xUNUkpDwjed5Noh9X0wkWiZ wCnv6VezbCY5vd0te4+OemdId0h0+X0SO5VfosJ4e6LKafxeCcqJzDOgcSKtJUtg r4WMyrHhcRjnOFQjr1KQq3Kj95fQzE8Y= Received: from localhost.localdomain (66-90-189-166.dyn.grandenetworks.net [66.90.189.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: brad@nextdimension.ws) by homiemail-a80.g.dreamhost.com (Postfix) with ESMTPSA id CB027E00083C; Thu, 26 Apr 2018 10:27:37 -0700 (PDT) From: Brad Love To: linux-media@vger.kernel.org Cc: Brad Love Subject: [PATCH 6/7] Fix frame vector wildcard file check Date: Thu, 26 Apr 2018 12:19:21 -0500 Message-Id: <1524763162-4865-7-git-send-email-brad@nextdimension.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524763162-4865-1-git-send-email-brad@nextdimension.cc> References: <1524763162-4865-1-git-send-email-brad@nextdimension.cc> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This check was consistently failing on all systems tested. The path to object directory is used here to explicitly override CWD. The thought is, if frame_vector.c exists in the build directory then the build system has determined it is required, and the source therefore should be compiled. The module will not be built unless the build system has enabled it's config option anyways, so this change should be safe in all circumstances. Signed-off-by: Brad Love --- v4l/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v4l/Makefile b/v4l/Makefile index b512600..270a624 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -88,7 +88,7 @@ ifneq ($(filter $(no-makefile-media-targets), $(MAKECMDGOALS)),) endif makefile-mm := 1 -ifeq ($(wildcard ../linux/mm/frame_vector.c),) +ifeq ("$(wildcard $(obj)/frame_vector.c)","") makefile-mm := 0 endif