aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-04 06:13:59 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-15 06:57:01 -0400
commite949f4c2d6a3df2b7fd00e56c0f081b15284906f (patch)
treec5b592d884e6eef3680177e384dfd567cc6e03e5 /arch/parisc
parentc6509a24d6ba0f8560a81c032c30d169ba467b0a (diff)
kbuild: add CONFIG_HEADERS_INSTALL and loosen the dependency of samples
Commit 5318321d367c ("samples: disable CONFIG_SAMPLES for UML") used a big hammer to fix the build errors under the samples/ directory. Only some samples actually include uapi headers from usr/include. Introduce CONFIG_HEADERS_INSTALL since 'depends on HEADERS_INSTALL' is clearer than 'depends on !UML'. If this option is enabled, uapi headers are installed before starting directory descending. I added 'depends on HEADERS_INSTALL' to per-sample CONFIG options. This allows UML to compile some samples. $ make ARCH=um allmodconfig samples/ [ snip ] CC [M] samples/configfs/configfs_sample.o CC [M] samples/kfifo/bytestream-example.o CC [M] samples/kfifo/dma-example.o CC [M] samples/kfifo/inttype-example.o CC [M] samples/kfifo/record-example.o CC [M] samples/kobject/kobject-example.o CC [M] samples/kobject/kset-example.o CC [M] samples/trace_events/trace-events-sample.o CC [M] samples/trace_printk/trace-printk.o AR samples/vfio-mdev/built-in.a AR samples/built-in.a Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/configs/a500_defconfig1
-rw-r--r--arch/parisc/configs/b180_defconfig1
-rw-r--r--arch/parisc/configs/c3000_defconfig1
-rw-r--r--arch/parisc/configs/default_defconfig1
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig
index a8859496b0b9..3335734bfadd 100644
--- a/arch/parisc/configs/a500_defconfig
+++ b/arch/parisc/configs/a500_defconfig
@@ -166,6 +166,7 @@ CONFIG_NLS_ISO8859_1=m
166CONFIG_NLS_ISO8859_15=m 166CONFIG_NLS_ISO8859_15=m
167CONFIG_NLS_UTF8=m 167CONFIG_NLS_UTF8=m
168CONFIG_DEBUG_FS=y 168CONFIG_DEBUG_FS=y
169CONFIG_HEADERS_INSTALL=y
169CONFIG_HEADERS_CHECK=y 170CONFIG_HEADERS_CHECK=y
170CONFIG_MAGIC_SYSRQ=y 171CONFIG_MAGIC_SYSRQ=y
171# CONFIG_DEBUG_BUGVERBOSE is not set 172# CONFIG_DEBUG_BUGVERBOSE is not set
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig
index 0cae9664bf67..07fde5bd6974 100644
--- a/arch/parisc/configs/b180_defconfig
+++ b/arch/parisc/configs/b180_defconfig
@@ -90,6 +90,7 @@ CONFIG_NLS_ASCII=m
90CONFIG_NLS_ISO8859_1=m 90CONFIG_NLS_ISO8859_1=m
91CONFIG_NLS_ISO8859_15=m 91CONFIG_NLS_ISO8859_15=m
92CONFIG_NLS_UTF8=m 92CONFIG_NLS_UTF8=m
93CONFIG_HEADERS_INSTALL=y
93CONFIG_HEADERS_CHECK=y 94CONFIG_HEADERS_CHECK=y
94CONFIG_MAGIC_SYSRQ=y 95CONFIG_MAGIC_SYSRQ=y
95CONFIG_DEBUG_KERNEL=y 96CONFIG_DEBUG_KERNEL=y
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
index 6c29b841735c..64d45a8b6ca0 100644
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
@@ -139,6 +139,7 @@ CONFIG_NLS_ISO8859_1=m
139CONFIG_NLS_ISO8859_15=m 139CONFIG_NLS_ISO8859_15=m
140CONFIG_NLS_UTF8=m 140CONFIG_NLS_UTF8=m
141CONFIG_DEBUG_FS=y 141CONFIG_DEBUG_FS=y
142CONFIG_HEADERS_INSTALL=y
142CONFIG_HEADERS_CHECK=y 143CONFIG_HEADERS_CHECK=y
143CONFIG_MAGIC_SYSRQ=y 144CONFIG_MAGIC_SYSRQ=y
144CONFIG_DEBUG_MUTEXES=y 145CONFIG_DEBUG_MUTEXES=y
diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig
index 6a91cc2623e8..5b877ca34ebf 100644
--- a/arch/parisc/configs/default_defconfig
+++ b/arch/parisc/configs/default_defconfig
@@ -183,6 +183,7 @@ CONFIG_NLS_KOI8_R=m
183CONFIG_NLS_KOI8_U=m 183CONFIG_NLS_KOI8_U=m
184CONFIG_NLS_UTF8=y 184CONFIG_NLS_UTF8=y
185CONFIG_DEBUG_FS=y 185CONFIG_DEBUG_FS=y
186CONFIG_HEADERS_INSTALL=y
186CONFIG_HEADERS_CHECK=y 187CONFIG_HEADERS_CHECK=y
187CONFIG_MAGIC_SYSRQ=y 188CONFIG_MAGIC_SYSRQ=y
188CONFIG_DEBUG_KERNEL=y 189CONFIG_DEBUG_KERNEL=y