Commit c70bee54 authored by Fino Meng's avatar Fino Meng Committed by Jan Kiszka

scripts/prepare-kernel.sh: add $(srctree) to the include path of ccflags

Out of tree build will fail after porting xenomai to Linux kernel 5.4.y,
update Makefiles and scripts to fix it.
Signed-off-by: default avatarFino Meng <fino.meng@linux.intel.com>
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent 9832fde2
Pipeline #4726 passed with stage
in 29 minutes and 11 seconds
......@@ -2,4 +2,4 @@ obj-$(CONFIG_XENOMAI) += xenomai.o
xenomai-y := machine.o thread.o switch.o syscall.o
ccflags-y := -Iarch/arm/xenomai/include -Iinclude/xenomai
ccflags-y := -I$(srctree)/arch/arm/xenomai/include -I$(srctree)/include/xenomai
......@@ -2,4 +2,4 @@ obj-$(CONFIG_XENOMAI) += xenomai.o
xenomai-y := machine.o thread.o syscall.o
ccflags-y := -Iarch/arm64/xenomai/include -Iinclude/xenomai
ccflags-y := -I$(srctree)/arch/arm64/xenomai/include -I$(srctree)/include/xenomai
......@@ -5,4 +5,4 @@ xenomai-y := machine.o thread.o
xenomai-$(CONFIG_XENO_ARCH_FPU) += fpu.o
ccflags-y := -Iarch/powerpc/xenomai/include -Iinclude/xenomai
ccflags-y := -I$(srctree)/arch/powerpc/xenomai/include -I$(srctree)/include/xenomai
......@@ -2,4 +2,4 @@
obj-$(CONFIG_XENOMAI) += xenomai.o
xenomai-y := machine.o thread.o smi.o c1e.o
ccflags-y := -Iarch/x86/xenomai/include -Iinclude/xenomai
ccflags-y := -I$(srctree)/arch/x86/xenomai/include -I$(srctree)/include/xenomai
ccflags-y += -Ikernel
ccflags-y += -I$(srctree)/kernel
obj-$(CONFIG_XENOMAI) += xenomai.o
......
......@@ -7,4 +7,4 @@ xenomai-y := core.o \
fd.o \
wrappers.o
ccflags-y += -I$(src)/.. -Ikernel
ccflags-y += -I$(srctree)/$(src)/.. -I$(srctree)/kernel
ccflags-y += -Idrivers/xenomai/analogy
ccflags-y += -I$(srctree)/drivers/xenomai/analogy
obj-$(CONFIG_XENO_DRIVERS_ANALOGY) += xeno_analogy.o testing/ intel/ national_instruments/ sensoray/
......
ccflags-y += -Idrivers/xenomai/analogy
ccflags-y += -I$(srctree)/drivers/xenomai/analogy
obj-$(CONFIG_XENO_DRIVERS_ANALOGY_8255) += analogy_8255.o
......
ccflags-y += -Idrivers/xenomai/analogy
ccflags-y += -I$(srctree)/drivers/xenomai/analogy
obj-$(CONFIG_XENO_DRIVERS_ANALOGY_NI_MITE) += analogy_ni_mite.o
obj-$(CONFIG_XENO_DRIVERS_ANALOGY_NI_TIO) += analogy_ni_tio.o
......
ccflags-y += -Idrivers/xenomai/analogy
ccflags-y += -I$(srctree)/drivers/xenomai/analogy
obj-$(CONFIG_XENO_DRIVERS_ANALOGY_S526) += analogy_s526.o
......
ccflags-y += -Idrivers/xenomai/analogy
ccflags-y += -I$(srctree)/drivers/xenomai/analogy
obj-$(CONFIG_XENO_DRIVERS_ANALOGY_FAKE) += analogy_fake.o
......
ccflags-y += -Idrivers/xenomai/can
ccflags-y += -I$(srctree)/drivers/xenomai/can
obj-$(CONFIG_XENO_DRIVERS_CAN) += xeno_can.o mscan/ sja1000/
obj-$(CONFIG_XENO_DRIVERS_CAN_FLEXCAN) += xeno_can_flexcan.o
......
ccflags-y += -Idrivers/xenomai/can -Idrivers/xenomai/can/mscan
ccflags-y += -I$(srctree)/drivers/xenomai/can -I$(srctree)/drivers/xenomai/can/mscan
obj-$(CONFIG_XENO_DRIVERS_CAN_MSCAN) += xeno_can_mscan.o
......
ccflags-y += -Idrivers/xenomai/can -Idrivers/xenomai/can/sja1000
ccflags-y += -I$(srctree)/drivers/xenomai/can -I$(srctree)/drivers/xenomai/can/sja1000
obj-$(CONFIG_XENO_DRIVERS_CAN_SJA1000) += xeno_can_sja1000.o
obj-$(CONFIG_XENO_DRIVERS_CAN_SJA1000_PEAK_PCI) += xeno_can_peak_pci.o
......
ccflags-y += -Ikernel -Iinclude/xenomai/
ccflags-y += -I$(srctree)/kernel -I$(srctree)/include/xenomai/
obj-$(CONFIG_XENO_DRIVERS_GPIOPWM) += xeno_gpiopwm.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_ADDON_RTCAP) += rtcap.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_EXP_DRIVERS) += experimental/
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_E1000) += rt_e1000.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_E1000E) += rt_e1000e.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_RT2500) += rt2500/
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_E1000_NEW) += rt_e1000_new.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_RT2500) += rt_rt2x00core.o rt_rt2500pci.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_IGB) += rt_igb.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_MPC52XX_FEC) += rt_mpc52xx_fec.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_DRV_TULIP) += rt_tulip.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include -Ikernel/
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include -I$(srctree)/kernel/
obj-$(CONFIG_XENO_DRIVERS_NET_RTIPV4) += ipv4/
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_RTIPV4) += rtipv4.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_RTIPV4_TCP) += rttcp.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_RTIPV4_UDP) += rtudp.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_RTPACKET) += rtpacket.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_RTCFG) += rtcfg.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_NOMAC) += nomac/
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_NOMAC) += nomac.o
......
ccflags-y += -Idrivers/xenomai/net/stack/include
ccflags-y += -I$(srctree)/drivers/xenomai/net/stack/include
obj-$(CONFIG_XENO_DRIVERS_NET_TDMA) += tdma.o
......
ccflags-y += -Ikernel
ccflags-y += -I$(srctree)/kernel
obj-$(CONFIG_XENO_DRIVERS_UDD) += xeno_udd.o
......
......@@ -387,7 +387,7 @@ case $linux_VERSION.$linux_PATCHLEVEL in
test "x$CONFIG_XENO_REVISION_LEVEL" = "x" && CONFIG_XENO_REVISION_LEVEL=0
if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_arch/Makefile; then
p="KBUILD_CFLAGS += -Iarch/\$(SRCARCH)/xenomai/include -Iinclude/xenomai"
p="KBUILD_CFLAGS += -I\$(srctree)/arch/\$(SRCARCH)/xenomai/include -I\$(srctree)/include/xenomai"
(echo; echo $p) | patch_append arch/$linux_arch/Makefile
p="core-\$(CONFIG_XENOMAI) += arch/$linux_arch/xenomai/"
echo $p | patch_append arch/$linux_arch/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment