From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: bpf <bpf@vger.kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Sam Ravnborg <sam@ravnborg.org>,
linux-kernel@vger.kernel.org,
Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v2 07/15] samples: uhid: build sample program for target architecture
Date: Wed, 29 Apr 2020 12:45:19 +0900 [thread overview]
Message-ID: <20200429034527.590520-8-masahiroy@kernel.org> (raw)
In-Reply-To: <20200429034527.590520-1-masahiroy@kernel.org>
This userspace program includes UAPI headers exported to usr/include/.
'make headers' always works for the target architecture (i.e. the same
architecture as the kernel), so the sample program should be built for
the target as well. Kbuild now supports 'userprogs' for that.
Add the entry to samples/Makefile to put this into the build bot
coverage.
I also added the CONFIG option guarded by 'depends on CC_CAN_LINK'
because $(CC) may not provide libc.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
---
Changes in v2: None
samples/Kconfig | 6 ++++++
samples/Makefile | 1 +
samples/uhid/.gitignore | 2 ++
samples/uhid/Makefile | 9 +++------
4 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 samples/uhid/.gitignore
diff --git a/samples/Kconfig b/samples/Kconfig
index 8949e9646125..2560e87c9cae 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -131,6 +131,12 @@ config SAMPLE_SECCOMP
Build samples of seccomp filters using various methods of
BPF filter construction.
+config SAMPLE_UHID
+ bool "UHID sample"
+ depends on CC_CAN_LINK && HEADERS_INSTALL
+ help
+ Build UHID sample program.
+
config SAMPLE_VFIO_MDEV_MTTY
tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
depends on VFIO_MDEV_DEVICE && m
diff --git a/samples/Makefile b/samples/Makefile
index 5ce50ef0f2b2..bdc168405452 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/
obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/
obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace/
obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace/
+subdir-$(CONFIG_SAMPLE_UHID) += uhid
obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/
obj-y += vfio-mdev/
subdir-$(CONFIG_SAMPLE_VFS) += vfs
diff --git a/samples/uhid/.gitignore b/samples/uhid/.gitignore
new file mode 100644
index 000000000000..0e0a5a929f5d
--- /dev/null
+++ b/samples/uhid/.gitignore
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+/uhid-example
diff --git a/samples/uhid/Makefile b/samples/uhid/Makefile
index 5f44ea40d6d5..9e652fc34103 100644
--- a/samples/uhid/Makefile
+++ b/samples/uhid/Makefile
@@ -1,8 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-# List of programs to build
-hostprogs := uhid-example
+userprogs := uhid-example
+always-y := $(userprogs)
-# Tell kbuild to always build the programs
-always-y := $(hostprogs)
-
-HOSTCFLAGS_uhid-example.o += -I$(objtree)/usr/include
+userccflags += -I usr/include
--
2.25.1
next prev parent reply other threads:[~2020-04-29 3:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 3:45 [PATCH v2 00/15] kbuild: support 'userprogs' syntax Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 01/15] bpfilter: match bit size of bpfilter_umh to that of the kernel Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 02/15] kbuild: add infrastructure to build userspace programs Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 03/15] bpfilter: use 'userprogs' syntax to build bpfilter_umh Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 04/15] samples: seccomp: build sample programs for target architecture Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 05/15] kbuild: doc: document the new syntax 'userprogs' Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 06/15] samples: uhid: fix warnings in uhid-example Masahiro Yamada
2020-04-29 3:45 ` Masahiro Yamada [this message]
2020-04-29 3:45 ` [PATCH v2 08/15] samples: hidraw: build sample program for target architecture Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 09/15] samples: connector: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 10/15] samples: vfs: build sample programs " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 11/15] samples: pidfd: build sample program " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 12/15] samples: mei: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 13/15] samples: auxdisplay: use 'userprogs' syntax Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 14/15] samples: timers: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 15/15] samples: watchdog: " Masahiro Yamada
2020-05-12 4:34 ` [PATCH v2 00/15] kbuild: support " Masahiro Yamada
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=20200429034527.590520-8-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.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).