mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 06:02:05 +00:00
b1992c3772
Kbuild conventionally uses $(obj)/ for generated files, and $(src)/ for
checked-in source files. It is merely a convention without any functional
difference. In fact, $(obj) and $(src) are exactly the same, as defined
in scripts/Makefile.build:
src := $(obj)
When the kernel is built in a separate output directory, $(src) does
not accurately reflect the source directory location. While Kbuild
resolves this discrepancy by specifying VPATH=$(srctree) to search for
source files, it does not cover all cases. For example, when adding a
header search path for local headers, -I$(srctree)/$(src) is typically
passed to the compiler.
This introduces inconsistency between upstream and downstream Makefiles
because $(src) is used instead of $(srctree)/$(src) for the latter.
To address this inconsistency, this commit changes the semantics of
$(src) so that it always points to the directory in the source tree.
Going forward, the variables used in Makefiles will have the following
meanings:
$(obj) - directory in the object tree
$(src) - directory in the source tree (changed by this commit)
$(objtree) - the top of the kernel object tree
$(srctree) - the top of the kernel source tree
Consequently, $(srctree)/$(src) in upstream Makefiles need to be replaced
with $(src).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
62 lines
2.1 KiB
Makefile
62 lines
2.1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
obj-$(CONFIG_CFG80211) += cfg80211.o
|
|
obj-$(CONFIG_LIB80211) += lib80211.o
|
|
obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
|
|
obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
|
|
obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
|
|
obj-y += tests/
|
|
|
|
obj-$(CONFIG_WEXT_CORE) += wext-core.o
|
|
obj-$(CONFIG_WEXT_PROC) += wext-proc.o
|
|
obj-$(CONFIG_WEXT_SPY) += wext-spy.o
|
|
obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
|
|
|
|
cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
|
|
cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o
|
|
cfg80211-y += pmsr.o
|
|
cfg80211-$(CONFIG_OF) += of.o
|
|
cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
|
|
cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o
|
|
|
|
CFLAGS_trace.o := -I$(src)
|
|
|
|
cfg80211-$(CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS) += shipped-certs.o
|
|
ifneq ($(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR),)
|
|
cfg80211-y += extra-certs.o
|
|
endif
|
|
|
|
$(obj)/shipped-certs.c: $(sort $(wildcard $(src)/certs/*.hex))
|
|
@$(kecho) " GEN $@"
|
|
$(Q)(echo '#include "reg.h"'; \
|
|
echo 'const u8 shipped_regdb_certs[] = {'; \
|
|
echo | cat - $^ ; \
|
|
echo '};'; \
|
|
echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);'; \
|
|
) > $@
|
|
|
|
$(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR) \
|
|
$(sort $(wildcard $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR)/*.x509))
|
|
@$(kecho) " GEN $@"
|
|
$(Q)(set -e; \
|
|
allf=""; \
|
|
for f in $^ ; do \
|
|
test -f $$f || continue;\
|
|
# similar to hexdump -v -e '1/1 "0x%.2x," "\n"' \
|
|
thisf=$$(od -An -v -tx1 < $$f | \
|
|
sed -e 's/ /\n/g' | \
|
|
sed -e 's/^[0-9a-f]\+$$/\0/;t;d' | \
|
|
sed -e 's/^/0x/;s/$$/,/'); \
|
|
# file should not be empty - maybe command substitution failed? \
|
|
test ! -z "$$thisf";\
|
|
allf=$$allf$$thisf;\
|
|
done; \
|
|
( \
|
|
echo '#include "reg.h"'; \
|
|
echo 'const u8 extra_regdb_certs[] = {'; \
|
|
echo "$$allf"; \
|
|
echo '};'; \
|
|
echo 'unsigned int extra_regdb_certs_len = sizeof(extra_regdb_certs);'; \
|
|
) > $@)
|
|
|
|
clean-files += shipped-certs.c extra-certs.c
|