[meta-intel] [PATCH] lttng-modules: remove obsolete bbappend
Ross Burton
ross.burton at intel.com
Fri Jul 17 08:12:40 PDT 2015
oe-core now has lttng-modules 2.6.1 so this bbappend isn't required, and is
actively harmful when lttng-modules moves past 2.6.1 as it forces the SRVREV
back to 2.6.1.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 71 ----------------------
.../lttng/lttng-modules_2.6.%.bbappend | 9 ---
2 files changed, 80 deletions(-)
delete mode 100644 common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
delete mode 100644 common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend
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
deleted file mode 100644
index ccc6c54..0000000
--- a/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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 at windriver.com>
-[sgw - rebased for 2.6.1]
-Signed-off-by: Saul wold <sgw at 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
deleted file mode 100644
index 6d88e30..0000000
--- a/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-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 \
-# "
-
-
--
2.1.4
More information about the meta-intel
mailing list