On 10/3/14, 2:00 AM, "Chang, Rebecca Swee Fun" <rebecca.swee.fun.ch...@intel.com> wrote:
>lttng-modules breaks when building with kernel 3.10.43. >This updates lttng-modules for 2.4.2 and it will also >fixes the build failure with kernel 3.10.43. > >Fixes for [YOCTO #6788] > >Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.ch...@intel.com> >--- > meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb | 38 >---------------------- > meta/recipes-kernel/lttng/lttng-modules_2.4.2.bb | 38 >++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 38 deletions(-) > delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb > create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.4.2.bb > >diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb >b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb >deleted file mode 100644 >index aa01a8d..0000000 >--- a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb >+++ /dev/null >@@ -1,38 +0,0 @@ >-SECTION = "devel" >-SUMMARY = "Linux Trace Toolkit KERNEL MODULE" >-DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer >modules" >-LICENSE = "LGPLv2.1 & GPLv2" >-LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ >- >file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ >- >file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" >- >-DEPENDS = "virtual/kernel" >- >-inherit module >- >-SRCREV = "fb2c37799306d16fb590aebee6fad8be431264b7" >-PV = "2.4.0" >- >-# lttng currently blacklists arm with gcc-4.8 >-COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' >- >-SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.4 \ >- file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ >- file://bio-bvec-iter.patch" If the patch is removed from SRC_URI, then it can also go from the repository. Nitin >- >-export INSTALL_MOD_DIR="kernel/lttng-modules" >-export KERNEL_SRC="${STAGING_KERNEL_DIR}" >- >- >-S = "${WORKDIR}/git" >- >-do_install_append() { >- # Delete empty directories to avoid QA failures if no modules were built >- find ${D}/lib -depth -type d -empty -exec rmdir {} \; >-} >- >-python do_package_prepend() { >- if not os.path.exists(os.path.join(d.getVar('D', True), >'lib/modules')): >- bb.warn("%s: no modules were created; this may be due to >CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN', >True)) >-} >- >diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.2.bb >b/meta/recipes-kernel/lttng/lttng-modules_2.4.2.bb >new file mode 100644 >index 0000000..1967631 >--- /dev/null >+++ b/meta/recipes-kernel/lttng/lttng-modules_2.4.2.bb >@@ -0,0 +1,38 @@ >+SECTION = "devel" >+SUMMARY = "Linux Trace Toolkit KERNEL MODULE" >+DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer >modules" >+LICENSE = "LGPLv2.1 & GPLv2" >+LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ >+ >file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ >+ >file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" >+ >+DEPENDS = "virtual/kernel" >+ >+inherit module >+ >+SRCREV = "85016adfb21268836df48dfb5cda106391e72fd1" >+PV = "2.4.2" >+ >+# lttng currently blacklists arm with gcc-4.8 >+COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' >+ >+SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.4 \ >+ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ >+ " >+ >+export INSTALL_MOD_DIR="kernel/lttng-modules" >+export KERNEL_SRC="${STAGING_KERNEL_DIR}" >+ >+ >+S = "${WORKDIR}/git" >+ >+do_install_append() { >+ # Delete empty directories to avoid QA failures if no modules were built >+ find ${D}/lib -depth -type d -empty -exec rmdir {} \; >+} >+ >+python do_package_prepend() { >+ if not os.path.exists(os.path.join(d.getVar('D', True), >'lib/modules')): >+ bb.warn("%s: no modules were created; this may be due to >CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN', >True)) >+} >+ >-- >1.7.9.5 > -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core