mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 12:49:34 +02:00
cefb6645d7
This fixes a build issue with the 3.19.5 kernel where the regmap prototypes have changed. The patch is rebased do to changes in the new version of the Makefile. [YOCTO #7737] (From OE-Core rev: 787fde133c6b50c5df6ce8f90b2906b7955b41e4) (From OE-Core rev: 2a355d2efb44a70571586bc5f6e500fa5d73db33) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
lttng-modules: replace KERNELDIR with KERNEL_SRC
|
|
|
|
Since lttng-modules uses the default way of module.bbclass to
|
|
build and install lttng-modules, we do this replacement for
|
|
it as-is.
|
|
|
|
Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
|
|
[sgw - rebased for 2.6.1]
|
|
Signed-off-by: Saul wold <sgw@linux.intel.com>
|
|
|
|
Index: git/Makefile
|
|
===================================================================
|
|
--- git.orig/Makefile
|
|
+++ git/Makefile
|
|
@@ -68,19 +68,19 @@ obj-m += lib/
|
|
endif # CONFIG_TRACEPOINTS
|
|
|
|
else # KERNELRELEASE
|
|
- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
|
|
- PWD := $(shell pwd)
|
|
- CFLAGS = $(EXTCFLAGS)
|
|
-
|
|
+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
|
|
+ PWD := $(shell pwd)
|
|
+ CFLAGS = $(EXTCFLAGS)
|
|
+
|
|
default:
|
|
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
|
|
+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
|
|
|
|
modules_install:
|
|
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
|
|
+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
|
|
|
|
clean:
|
|
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
|
|
+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
|
|
|
|
%.i: %.c
|
|
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
|
|
+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
|
|
endif # KERNELRELEASE
|
|
Index: git/probes/Makefile
|
|
===================================================================
|
|
--- git.orig/probes/Makefile
|
|
+++ git/probes/Makefile
|
|
@@ -267,18 +267,18 @@ endif
|
|
endif
|
|
|
|
else
|
|
- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
|
|
+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
|
|
PWD := $(shell pwd)
|
|
CFLAGS = $(EXTCFLAGS)
|
|
|
|
default:
|
|
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
|
|
+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
|
|
|
|
modules_install:
|
|
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
|
|
+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
|
|
/sbin/depmod -a
|
|
|
|
clean:
|
|
- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
|
|
+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
|
|
|
|
endif
|