From patchwork Thu Apr 26 17:19:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Love X-Patchwork-Id: 10366549 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 BFEEE601D3 for ; Thu, 26 Apr 2018 17:27:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B25AB28A38 for ; Thu, 26 Apr 2018 17:27:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A709B28B67; Thu, 26 Apr 2018 17:27:51 +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 2DFDD28A38 for ; Thu, 26 Apr 2018 17:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754574AbeDZR1t (ORCPT ); Thu, 26 Apr 2018 13:27:49 -0400 Received: from sub5.mail.dreamhost.com ([208.113.200.129]:34904 "EHLO homiemail-a80.g.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756870AbeDZR1m (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 6FA2CE00083C; 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=spk2mPrilONNGbGf6XkVhrXj56M=; b=D98UA+437yx WUnMWY/XGCI6+I/XifNcCe643aRh5LeGrz7F8wH4wUsN2POC65CUKjQ0Tin8FVqc jPHIgKYenoHtbw3lp9lv7sLZSWHLefQP7Or1oe06U0PT51vFMpi248QPVZeer/+x 8zBiXdY6pwCuetTTQRVIE/KjlrAI7NQs= 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 2CE90E0673C3; Thu, 26 Apr 2018 10:27:38 -0700 (PDT) From: Brad Love To: linux-media@vger.kernel.org Cc: Brad Love Subject: [PATCH 7/7] Add config-compat.h override config-mycompat.h Date: Thu, 26 Apr 2018 12:19:22 -0500 Message-Id: <1524763162-4865-8-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 config-mycompat.h is for overriding macros which are incorrectly enabled on certain kernels by the build system. The file should be left empty, unless build errors are encountered for a kernel. The file is removed by distclean, therefore should be externally sourced, before the build process starts, when required. In standard operation the file is empty, but if a particular kernel has incorrectly enabled options defined this allows them to be undefined. Signed-off-by: Brad Love --- v4l/Makefile | 3 ++- v4l/compat.h | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/v4l/Makefile b/v4l/Makefile index 270a624..ee18d11 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -273,6 +273,7 @@ links:: @find ../linux/drivers/misc -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=. config-compat.h:: $(obj)/.version .myconfig scripts/make_config_compat.pl + -touch $(obj)/config-mycompat.h perl scripts/make_config_compat.pl $(SRCDIR) $(obj)/.myconfig $(obj)/config-compat.h kernel-links makelinks:: @@ -298,7 +299,7 @@ clean:: distclean:: clean -rm -f .version .*.o.flags .*.o.d *.mod.gcno Makefile.media \ Kconfig Kconfig.kern .config .config.cmd .myconfig \ - .kconfig.dep + .kconfig.dep config-mycompat.h -rm -rf .tmp_versions .tmp*.ver .tmp*.o .*.gcno .cache.mk -rm -f scripts/lxdialog scripts/kconfig @find .. -name '*.orig' -exec rm '{}' \; diff --git a/v4l/compat.h b/v4l/compat.h index 87ce401..db48fdf 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -8,6 +8,13 @@ #include #include "config-compat.h" +/* config-mycompat.h is for overriding #defines which + * are incorrectly enabled on certain kernels. The file + * should be left empty, unless build errors are encountered + * for a kernel. The file is removed by distclean, therefore + * should be externally sourced, before compilation, when required. + */ +#include "config-mycompat.h" #ifndef SZ_512 #define SZ_512 0x00000200