diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2015-05-11 13:46:52 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2015-05-12 13:12:10 -0700 |
| commit | f9738ec19d3b2864c0bd71b9bb3418d16e922a12 (patch) | |
| tree | ec8faa3d1c663308aae8523c9e9517ae7699626f | |
| parent | afbba3222cb66c92d43e458330055f06380e29f0 (diff) | |
| download | meta-intel-f9738ec19d3b2864c0bd71b9bb3418d16e922a12.tar.gz meta-intel-f9738ec19d3b2864c0bd71b9bb3418d16e922a12.tar.bz2 meta-intel-f9738ec19d3b2864c0bd71b9bb3418d16e922a12.zip | |
lttng-modules: add bbappend to address 3.19.5 update3.0-fido-1.8
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>
| -rw-r--r-- | common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 71 | ||||
| -rw-r--r-- | common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend | 9 |
2 files changed, 80 insertions, 0 deletions
diff --git a/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch new file mode 100644 index 00000000..ccc6c54f --- /dev/null +++ b/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch @@ -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 diff --git a/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend b/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend new file mode 100644 index 00000000..6d88e305 --- /dev/null +++ b/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend @@ -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 \ +# " + + |