MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lttng-modules: add bbappend to address 3.19.5 update

Browse Source 
The 3.19.5 kernel update included an incompatible change that caused lttng-modules
to fail to build, the patch needed to be rebased due to changes in the associated
Makefile.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2015-05-11 13:46:52 -07:00
parent afbba3222c
commit f9738ec19d
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch Normal file
View File

@ -0,0 +1,71 @@
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

9
common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend Normal file
View File

@ -0,0 +1,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d"
#SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \
# file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
# "