kbuild: rename hostprogs-y/always to hostprogs/always-y
In old days, the "host-progs" syntax was used for specifying host
programs. It was renamed to the current "hostprogs-y" in 2004.
It is typically useful in scripts/Makefile because it allows Kbuild to
selectively compile host programs based on the kernel configuration.
This commit renames like follows:
always -> always-y
hostprogs-y -> hostprogs
So, scripts/Makefile will look like this:
always-$(CONFIG_BUILD_BIN2C) += ...
always-$(CONFIG_KALLSYMS) += ...
...
hostprogs := $(always-y) $(always-m)
I think this makes more sense because a host program is always a host
program, irrespective of the kernel configuration. We want to specify
which ones to compile by CONFIG options, so always-y will be handier.
The "always", "hostprogs-y", "hostprogs-m" will be kept for backward
compatibility for a while.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
+59
-59
@@ -111,65 +111,65 @@ ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS)
|
||||
hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS)
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(tprogs-y)
|
||||
always += sockex1_kern.o
|
||||
always += sockex2_kern.o
|
||||
always += sockex3_kern.o
|
||||
always += tracex1_kern.o
|
||||
always += tracex2_kern.o
|
||||
always += tracex3_kern.o
|
||||
always += tracex4_kern.o
|
||||
always += tracex5_kern.o
|
||||
always += tracex6_kern.o
|
||||
always += tracex7_kern.o
|
||||
always += sock_flags_kern.o
|
||||
always += test_probe_write_user_kern.o
|
||||
always += trace_output_kern.o
|
||||
always += tcbpf1_kern.o
|
||||
always += tc_l2_redirect_kern.o
|
||||
always += lathist_kern.o
|
||||
always += offwaketime_kern.o
|
||||
always += spintest_kern.o
|
||||
always += map_perf_test_kern.o
|
||||
always += test_overhead_tp_kern.o
|
||||
always += test_overhead_raw_tp_kern.o
|
||||
always += test_overhead_kprobe_kern.o
|
||||
always += parse_varlen.o parse_simple.o parse_ldabs.o
|
||||
always += test_cgrp2_tc_kern.o
|
||||
always += xdp1_kern.o
|
||||
always += xdp2_kern.o
|
||||
always += xdp_router_ipv4_kern.o
|
||||
always += test_current_task_under_cgroup_kern.o
|
||||
always += trace_event_kern.o
|
||||
always += sampleip_kern.o
|
||||
always += lwt_len_hist_kern.o
|
||||
always += xdp_tx_iptunnel_kern.o
|
||||
always += test_map_in_map_kern.o
|
||||
always += tcp_synrto_kern.o
|
||||
always += tcp_rwnd_kern.o
|
||||
always += tcp_bufs_kern.o
|
||||
always += tcp_cong_kern.o
|
||||
always += tcp_iw_kern.o
|
||||
always += tcp_clamp_kern.o
|
||||
always += tcp_basertt_kern.o
|
||||
always += tcp_tos_reflect_kern.o
|
||||
always += tcp_dumpstats_kern.o
|
||||
always += xdp_redirect_kern.o
|
||||
always += xdp_redirect_map_kern.o
|
||||
always += xdp_redirect_cpu_kern.o
|
||||
always += xdp_monitor_kern.o
|
||||
always += xdp_rxq_info_kern.o
|
||||
always += xdp2skb_meta_kern.o
|
||||
always += syscall_tp_kern.o
|
||||
always += cpustat_kern.o
|
||||
always += xdp_adjust_tail_kern.o
|
||||
always += xdp_fwd_kern.o
|
||||
always += task_fd_query_kern.o
|
||||
always += xdp_sample_pkts_kern.o
|
||||
always += ibumad_kern.o
|
||||
always += hbm_out_kern.o
|
||||
always += hbm_edt_kern.o
|
||||
always += xdpsock_kern.o
|
||||
always-y := $(tprogs-y)
|
||||
always-y += sockex1_kern.o
|
||||
always-y += sockex2_kern.o
|
||||
always-y += sockex3_kern.o
|
||||
always-y += tracex1_kern.o
|
||||
always-y += tracex2_kern.o
|
||||
always-y += tracex3_kern.o
|
||||
always-y += tracex4_kern.o
|
||||
always-y += tracex5_kern.o
|
||||
always-y += tracex6_kern.o
|
||||
always-y += tracex7_kern.o
|
||||
always-y += sock_flags_kern.o
|
||||
always-y += test_probe_write_user_kern.o
|
||||
always-y += trace_output_kern.o
|
||||
always-y += tcbpf1_kern.o
|
||||
always-y += tc_l2_redirect_kern.o
|
||||
always-y += lathist_kern.o
|
||||
always-y += offwaketime_kern.o
|
||||
always-y += spintest_kern.o
|
||||
always-y += map_perf_test_kern.o
|
||||
always-y += test_overhead_tp_kern.o
|
||||
always-y += test_overhead_raw_tp_kern.o
|
||||
always-y += test_overhead_kprobe_kern.o
|
||||
always-y += parse_varlen.o parse_simple.o parse_ldabs.o
|
||||
always-y += test_cgrp2_tc_kern.o
|
||||
always-y += xdp1_kern.o
|
||||
always-y += xdp2_kern.o
|
||||
always-y += xdp_router_ipv4_kern.o
|
||||
always-y += test_current_task_under_cgroup_kern.o
|
||||
always-y += trace_event_kern.o
|
||||
always-y += sampleip_kern.o
|
||||
always-y += lwt_len_hist_kern.o
|
||||
always-y += xdp_tx_iptunnel_kern.o
|
||||
always-y += test_map_in_map_kern.o
|
||||
always-y += tcp_synrto_kern.o
|
||||
always-y += tcp_rwnd_kern.o
|
||||
always-y += tcp_bufs_kern.o
|
||||
always-y += tcp_cong_kern.o
|
||||
always-y += tcp_iw_kern.o
|
||||
always-y += tcp_clamp_kern.o
|
||||
always-y += tcp_basertt_kern.o
|
||||
always-y += tcp_tos_reflect_kern.o
|
||||
always-y += tcp_dumpstats_kern.o
|
||||
always-y += xdp_redirect_kern.o
|
||||
always-y += xdp_redirect_map_kern.o
|
||||
always-y += xdp_redirect_cpu_kern.o
|
||||
always-y += xdp_monitor_kern.o
|
||||
always-y += xdp_rxq_info_kern.o
|
||||
always-y += xdp2skb_meta_kern.o
|
||||
always-y += syscall_tp_kern.o
|
||||
always-y += cpustat_kern.o
|
||||
always-y += xdp_adjust_tail_kern.o
|
||||
always-y += xdp_fwd_kern.o
|
||||
always-y += task_fd_query_kern.o
|
||||
always-y += xdp_sample_pkts_kern.o
|
||||
always-y += ibumad_kern.o
|
||||
always-y += hbm_out_kern.o
|
||||
always-y += hbm_edt_kern.o
|
||||
always-y += xdpsock_kern.o
|
||||
|
||||
ifeq ($(ARCH), arm)
|
||||
# Strip all except -D__LINUX_ARM_ARCH__ option needed to handle linux
|
||||
|
||||
@@ -2,12 +2,8 @@
|
||||
obj-$(CONFIG_SAMPLE_CONNECTOR) += cn_test.o
|
||||
|
||||
# List of programs to build
|
||||
ifdef CONFIG_SAMPLE_CONNECTOR
|
||||
hostprogs-y := ucon
|
||||
endif
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(hostprogs-y)
|
||||
hostprogs := ucon
|
||||
always-y := $(hostprogs)
|
||||
|
||||
HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# List of programs to build
|
||||
hostprogs-y := hid-example
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(hostprogs-y)
|
||||
hostprogs := hid-example
|
||||
always-y := $(hostprogs)
|
||||
|
||||
HOSTCFLAGS_hid-example.o += -I$(objtree)/usr/include
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (c) 2012-2019, Intel Corporation. All rights reserved.
|
||||
|
||||
hostprogs-y := mei-amt-version
|
||||
hostprogs := mei-amt-version
|
||||
|
||||
HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include
|
||||
|
||||
always := $(hostprogs-y)
|
||||
always-y := $(hostprogs)
|
||||
|
||||
all: mei-amt-version
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
hostprogs-y := pidfd-metadata
|
||||
always := $(hostprogs-y)
|
||||
hostprogs := pidfd-metadata
|
||||
always-y := $(hostprogs)
|
||||
HOSTCFLAGS_pidfd-metadata.o += -I$(objtree)/usr/include
|
||||
all: pidfd-metadata
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ifndef CROSS_COMPILE
|
||||
hostprogs-y := bpf-fancy dropper bpf-direct user-trap
|
||||
hostprogs := bpf-fancy dropper bpf-direct user-trap
|
||||
|
||||
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
|
||||
HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include
|
||||
@@ -40,5 +40,5 @@ HOSTLDLIBS_bpf-fancy += $(MFLAG)
|
||||
HOSTLDLIBS_dropper += $(MFLAG)
|
||||
HOSTLDLIBS_user-trap += $(MFLAG)
|
||||
endif
|
||||
always := $(hostprogs-y)
|
||||
always-y := $(hostprogs)
|
||||
endif
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# List of programs to build
|
||||
hostprogs-y := uhid-example
|
||||
hostprogs := uhid-example
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(hostprogs-y)
|
||||
always-y := $(hostprogs)
|
||||
|
||||
HOSTCFLAGS_uhid-example.o += -I$(objtree)/usr/include
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# List of programs to build
|
||||
hostprogs-y := \
|
||||
hostprogs := \
|
||||
test-fsmount \
|
||||
test-statx
|
||||
|
||||
# Tell kbuild to always build the programs
|
||||
always := $(hostprogs-y)
|
||||
always-y := $(hostprogs)
|
||||
|
||||
HOSTCFLAGS_test-fsmount.o += -I$(objtree)/usr/include
|
||||
HOSTCFLAGS_test-statx.o += -I$(objtree)/usr/include
|
||||
|
||||
Reference in New Issue
Block a user