From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: bpf@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>,
Masahiro Yamada <masahiroy@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 14/16] samples: auxdisplay: use 'userprogs' syntax
Date: Thu, 23 Apr 2020 16:39:27 +0900 [thread overview]
Message-ID: <20200423073929.127521-15-masahiroy@kernel.org> (raw)
In-Reply-To: <20200423073929.127521-1-masahiroy@kernel.org>
Kbuild now supports the 'userprogs' syntax to describe the build rules
of userspace programs for the target architecture (i.e. the same
architecture as the kernel).
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 necessarily provide libc.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
samples/Kconfig | 4 ++++
samples/Makefile | 1 +
samples/auxdisplay/Makefile | 11 ++---------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/samples/Kconfig b/samples/Kconfig
index b9dafee5d3af..cdb0091e4734 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -6,6 +6,10 @@ menuconfig SAMPLES
if SAMPLES
+config SAMPLE_AUXDISPLAY
+ bool "auxdisplay sample"
+ depends on CC_CAN_LINK
+
config SAMPLE_TRACE_EVENTS
tristate "Build trace_events examples -- loadable modules only"
depends on EVENT_TRACING && m
diff --git a/samples/Makefile b/samples/Makefile
index bdc168405452..0c43b5d34b15 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
# Makefile for Linux samples code
+subdir-$(CONFIG_SAMPLE_AUXDISPLAY) += auxdisplay
obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs/
obj-$(CONFIG_SAMPLE_CONFIGFS) += configfs/
obj-$(CONFIG_SAMPLE_CONNECTOR) += connector/
diff --git a/samples/auxdisplay/Makefile b/samples/auxdisplay/Makefile
index 0273bab27233..dbdf939af94a 100644
--- a/samples/auxdisplay/Makefile
+++ b/samples/auxdisplay/Makefile
@@ -1,10 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
-CC := $(CROSS_COMPILE)gcc
-CFLAGS := -I../../usr/include
-
-PROGS := cfag12864b-example
-
-all: $(PROGS)
-
-clean:
- rm -fr $(PROGS)
+userprogs := cfag12864b-example
+always-y := $(userprogs)
--
2.25.1
next prev parent reply other threads:[~2020-04-23 7:40 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 7:39 [PATCH 00/16] kbuild: support 'userprogs' syntax Masahiro Yamada
2020-04-23 7:39 ` [PATCH 01/16] Documentation: kbuild: fix the section title format Masahiro Yamada
2020-04-23 7:39 ` [PATCH 02/16] Revert "objtool: Skip samples subdirectory" Masahiro Yamada
2020-04-24 20:32 ` Josh Poimboeuf
2020-04-29 2:43 ` Masahiro Yamada
2020-04-23 7:39 ` [PATCH 03/16] kbuild: add infrastructure to build userspace programs Masahiro Yamada
2020-04-23 15:15 ` Masahiro Yamada
2020-04-23 7:39 ` [PATCH 04/16] net: bpfilter: use 'userprogs' syntax to build bpfilter_umh Masahiro Yamada
2020-04-28 1:46 ` kbuild test robot
2020-04-28 1:46 ` kbuild test robot
2020-04-28 1:46 ` kbuild test robot
2020-04-28 5:13 ` Masahiro Yamada
2020-04-28 5:13 ` Masahiro Yamada
2020-06-08 11:56 ` Michal Kubecek
2020-06-08 13:32 ` Masahiro Yamada
2020-06-30 6:30 ` Masahiro Yamada
2020-06-30 8:57 ` Michal Kubecek
2020-06-30 16:47 ` Alexei Starovoitov
2020-04-23 7:39 ` [PATCH 05/16] samples: seccomp: build sample programs for target architecture Masahiro Yamada
2020-04-23 7:39 ` [PATCH 06/16] kbuild: doc: document the new syntax 'userprogs' Masahiro Yamada
2020-04-23 7:39 ` [PATCH 07/16] samples: uhid: fix warnings in uhid-example Masahiro Yamada
2020-04-23 7:39 ` [PATCH 08/16] samples: uhid: build sample program for target architecture Masahiro Yamada
2020-04-23 7:39 ` [PATCH 09/16] samples: hidraw: " Masahiro Yamada
2020-04-23 7:39 ` [PATCH 10/16] samples: connector: " Masahiro Yamada
2020-04-23 7:39 ` [PATCH 11/16] samples: vfs: build sample programs " Masahiro Yamada
2020-04-23 7:39 ` [PATCH 12/16] samples: pidfd: build sample program " Masahiro Yamada
2020-04-23 7:39 ` [PATCH 13/16] samples: mei: " Masahiro Yamada
2020-04-23 7:39 ` Masahiro Yamada [this message]
2020-04-23 11:50 ` [PATCH 14/16] samples: auxdisplay: use 'userprogs' syntax Miguel Ojeda
2020-04-24 2:59 ` Masahiro Yamada
2020-04-23 7:39 ` [PATCH 15/16] samples: timers: " Masahiro Yamada
2020-04-23 7:39 ` [PATCH 16/16] samples: watchdog: " Masahiro Yamada
2020-04-25 11:53 ` [PATCH 00/16] kbuild: support " Sam Ravnborg
2020-04-29 2:38 ` 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=20200423073929.127521-15-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.