From 88b2089eda805dfd3bb8982f3ab28e6ea2d68b2f Mon Sep 17 00:00:00 2001 From: Andy Voltz Date: Mon, 24 Feb 2014 13:24:39 -0500 Subject: [PATCH] kernel-module-mcc: bump to version 1.04 * Fixes a cache collision with MQX * Update MQX compatibility to 4.0.2 * Integrate makefile patch Change-Id: If7dd5bcb3c3e882fc13709ab15cb45fcfed77b68 Signed-off-by: Andy Voltz Signed-off-by: Anthony Felice Signed-off-by: Otavio Salvador --- .../mcc-kmod-oe-module-makefile.patch | 37 ------------------- ...-mcc_1.03.bb => kernel-module-mcc_1.04.bb} | 7 ++-- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch rename meta-fsl-arm/recipes-kernel/kernel-module-mcc/{kernel-module-mcc_1.03.bb => kernel-module-mcc_1.04.bb} (58%) diff --git a/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch b/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch deleted file mode 100644 index dc4b947e..00000000 --- a/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch +++ /dev/null @@ -1,37 +0,0 @@ -OE-Core uses "make modules && make modules install" for kernel modules -It also uses KERNEL_SRC to specify the kernel source tree location - -This patch adds support for modules and modules_install targets, and -adds logic to pickup INSTALL_MOD_PATH and use KERNEL_SRC - -Upstream-status: Pending - -diff -Nuarp mcc-kmod-1.03-orig/Makefile mcc-kmod-1.03/Makefile ---- mcc-kmod-1.03-orig/Makefile 2013-08-12 14:11:56.439711957 -0400 -+++ mcc-kmod-1.03/Makefile 2013-08-12 14:16:03.472603053 -0400 -@@ -3,17 +3,19 @@ mcc-y = mcc_linux.o mcc_shm_linux.o mcc_ - - PWD := $(shell pwd) - --EXTRA_CFLAGS += -I$(KERNELDIR)/include -Wno-format -+EXTRA_CFLAGS += -I$(KERNEL_SRC)/include -Wno-format - --all: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -+DESTDIR ?= $(INSTALL_MOD_PATH) - --install: all -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install INSTALL_MOD_PATH=$(DESTDIR) -+modules all: -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules -+ -+modules_install install: all -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install INSTALL_MOD_PATH=$(DESTDIR) - @echo Copying mcc headers to toolchain - mkdir -p $(DESTDIR)/usr/include/linux - cp -f {mcc_linux.h,mcc_common.h,mcc_config.h} $(DESTDIR)/usr/include/linux/ - - - clean: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean diff --git a/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb b/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb similarity index 58% rename from meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb rename to meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb index 4ff7fbd5..3accf901 100644 --- a/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb +++ b/meta-fsl-arm/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb @@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c8959abcbbe4d6676c58eab9354019e6" inherit module -SRC_URI = "http://repository.timesys.com/buildsources/m/mcc-kmod/mcc-kmod-${PV}/mcc-kmod-${PV}.tar.bz2 \ - file://mcc-kmod-oe-module-makefile.patch" +SRC_URI = "http://repository.timesys.com/buildsources/m/mcc-kmod/mcc-kmod-${PV}/mcc-kmod-${PV}.tar.bz2" -SRC_URI[md5sum] = "046b0a86d70b9e3424efc86f442bc335" -SRC_URI[sha256sum] = "44ed7f812625ef764d62ff0871784ceb155ef86df8932e91830f9222adbf3a9e" +SRC_URI[md5sum] = "d72e8f6575605906be94ac2d26e6bc26" +SRC_URI[sha256sum] = "f86a860e68cefdce70796572d97ddd4cc5e08d9f13117b431599add55bf1a651" S = "${WORKDIR}/mcc-kmod-${PV}" -- 2.40.1