linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brad Love <brad@nextdimension.cc>
To: linux-media@vger.kernel.org
Cc: Brad Love <brad@nextdimension.cc>
Subject: [PATCH 7/7] Add config-compat.h override config-mycompat.h
Date: Thu, 26 Apr 2018 12:19:22 -0500	[thread overview]
Message-ID: <1524763162-4865-8-git-send-email-brad@nextdimension.cc> (raw)
In-Reply-To: <1524763162-4865-1-git-send-email-brad@nextdimension.cc>

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 <brad@nextdimension.cc>
---
 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 <linux/version.h>
 
 #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
-- 
2.7.4

  parent reply	other threads:[~2018-04-26 17:27 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26 17:19 [PATCH 0/7] media_build: various kernel version fixes Brad Love
2018-04-26 17:19 ` [PATCH 1/7] Disable VIDEO_ADV748X for kernels older than 4.8 Brad Love
2018-04-26 17:19 ` [PATCH 2/7] Disable additional drivers requiring gpio/consumer.h Brad Love
2018-05-12  9:31   ` Jasmin J.
2018-05-12 13:20     ` Brad Love
2018-05-12 15:36       ` Brad Love
2018-05-12 19:31         ` Jasmin J.
2018-04-26 17:19 ` [PATCH 3/7] Disable DVBC8SECTPFE for kernels older than 3.5 Brad Love
2018-04-26 17:19 ` [PATCH 4/7] Disable SOC_CAMERA " Brad Love
2018-04-26 17:19 ` [PATCH 5/7] Header location fix for 3.5.0 to 3.11.x Brad Love
2018-05-12 19:42   ` Jasmin J.
2018-05-12 22:46     ` Brad Love
2018-05-13  7:49       ` Jasmin J.
2018-04-26 17:19 ` [PATCH 6/7] Fix frame vector wildcard file check Brad Love
2018-05-11 14:35   ` Hans Verkuil
2018-04-26 17:19 ` Brad Love [this message]
2018-05-11 14:41   ` [PATCH 7/7] Add config-compat.h override config-mycompat.h Hans Verkuil
2018-05-11 15:08     ` Brad Love
2018-05-11 15:11       ` Hans Verkuil
2018-05-11 15:23         ` Brad Love
2018-05-11 20:02       ` Jasmin J.
2018-05-11 20:38         ` Brad Love
2018-05-11 21:43           ` Jasmin J.
2018-05-11 21:48             ` Brad Love

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524763162-4865-8-git-send-email-brad@nextdimension.cc \
    --to=brad@nextdimension.cc \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).