Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: prefix header search paths with $(srctree)/

Currently, the Kbuild core manipulates header search paths in a crazy
way [1].

To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
the search paths in the srctree. Some Makefiles are already written in
that way, but not all. The goal of this work is to make the notation
consistent, and finally get rid of the gross hacks.

Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
("kbuild: do not drop -I without parameter").

[1]: https://patchwork.kernel.org/patch/9632347/

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Masahiro Yamada and committed by
Greg Kroah-Hartman
2fa49589 ee593133

+15 -18
+1 -1
drivers/staging/erofs/Makefile
··· 6 6 7 7 obj-$(CONFIG_EROFS_FS) += erofs.o 8 8 # staging requirement: to be self-contained in its own directory 9 - ccflags-y += -I$(src)/include 9 + ccflags-y += -I $(srctree)/$(src)/include 10 10 erofs-objs := super.o inode.o data.o namei.o dir.o utils.o 11 11 erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o 12 12 erofs-$(CONFIG_EROFS_FS_ZIP) += unzip_vle.o unzip_vle_lz4.o
+1 -1
drivers/staging/media/davinci_vpfe/Makefile
··· 6 6 7 7 # Allow building it with COMPILE_TEST on other archs 8 8 ifndef CONFIG_ARCH_DAVINCI 9 - ccflags-y += -Iarch/arm/mach-davinci/include/ 9 + ccflags-y += -I $(srctree)/arch/arm/mach-davinci/include/ 10 10 endif
+1 -1
drivers/staging/most/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 obj-$(CONFIG_MOST) += most_core.o 3 3 most_core-y := core.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/ 5 5 6 6 obj-$(CONFIG_MOST_CDEV) += cdev/ 7 7 obj-$(CONFIG_MOST_NET) += net/
+1 -1
drivers/staging/most/cdev/Makefile
··· 1 1 obj-$(CONFIG_MOST_CDEV) += most_cdev.o 2 2 3 3 most_cdev-objs := cdev.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/most/dim2/Makefile
··· 1 1 obj-$(CONFIG_MOST_DIM2) += most_dim2.o 2 2 3 3 most_dim2-objs := dim2.o hal.o sysfs.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/most/i2c/Makefile
··· 1 1 obj-$(CONFIG_MOST_I2C) += most_i2c.o 2 2 3 3 most_i2c-objs := i2c.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/most/net/Makefile
··· 1 1 obj-$(CONFIG_MOST_NET) += most_net.o 2 2 3 3 most_net-objs := net.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/most/sound/Makefile
··· 1 1 obj-$(CONFIG_MOST_SOUND) += most_sound.o 2 2 3 3 most_sound-objs := sound.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/most/usb/Makefile
··· 1 1 obj-$(CONFIG_MOST_USB) += most_usb.o 2 2 3 3 most_usb-objs := usb.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/most/video/Makefile
··· 1 1 obj-$(CONFIG_MOST_VIDEO) += most_video.o 2 2 3 3 most_video-objs := video.o 4 - ccflags-y += -Idrivers/staging/ 4 + ccflags-y += -I $(srctree)/drivers/staging/
+1 -1
drivers/staging/rtl8192u/Makefile
··· 7 7 ccflags-y += -DCONFIG_FORCE_HARD_FLOAT=y 8 8 ccflags-y += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX 9 9 ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO 10 - ccflags-y += -Idrivers/staging/rtl8192u/ieee80211 10 + ccflags-y += -I $(srctree)/$(src)/ieee80211 11 11 12 12 r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \ 13 13 r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o \
+1 -2
drivers/staging/unisys/visorhba/Makefile
··· 6 6 7 7 visorhba-y := visorhba_main.o 8 8 9 - ccflags-y += -Idrivers/staging/unisys/include 10 - 9 + ccflags-y += -I $(srctree)/$(src)/../include
+1 -2
drivers/staging/unisys/visornic/Makefile
··· 6 6 7 7 visornic-y := visornic_main.o 8 8 9 - ccflags-y += -Idrivers/staging/unisys/include 10 - 9 + ccflags-y += -I $(srctree)/$(src)/../include
+1 -2
drivers/staging/vc04_services/bcm2835-audio/Makefile
··· 1 1 obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o 2 2 snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o 3 3 4 - ccflags-y += -Idrivers/staging/vc04_services -D__VCCOREVER__=0x04000000 5 - 4 + ccflags-y += -I $(srctree)/$(src)/.. -D__VCCOREVER__=0x04000000
+1 -1
drivers/staging/vc04_services/bcm2835-camera/Makefile
··· 7 7 obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o 8 8 9 9 ccflags-y += \ 10 - -Idrivers/staging/vc04_services \ 10 + -I $(srctree)/$(src)/.. \ 11 11 -D__VCCOREVER__=0x04000000