Patchwork [meta-fsl-arm,v2,2/3] kernel-module-mcc: bump to version 1.04, drop unused patch

login
register
mail settings
Submitter Andy Voltz
Date Feb. 24, 2014, 6:24 p.m.
Message ID <1393266280-28621-3-git-send-email-andy.voltz@timesys.com>
Download mbox | patch
Permalink /patch/67293/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Andy Voltz - Feb. 24, 2014, 6:24 p.m.
* Fixes a cache collision with MQX
* Update MQX compatibility to 4.0.2
* Integrate makefile patch

Signed-off-by: Andy Voltz <andy.voltz@timesys.com>
Signed-off-by: Anthony Felice <tony.felice@timesys.com>
---
 .../mcc-kmod-oe-module-makefile.patch              | 37 ----------------------
 .../kernel-module-mcc/kernel-module-mcc_1.03.bb    | 16 ----------
 .../kernel-module-mcc/kernel-module-mcc_1.04.bb    | 15 +++++++++
 3 files changed, 15 insertions(+), 53 deletions(-)
 delete mode 100644 recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch
 delete mode 100644 recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb
 create mode 100644 recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb

Patch

diff --git a/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch b/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc-kmod-oe-module-makefile.patch
deleted file mode 100644
index dc4b947..0000000
--- a/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/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb b/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb
deleted file mode 100644
index 4ff7fbd..0000000
--- a/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.03.bb
+++ /dev/null
@@ -1,16 +0,0 @@ 
-# Copyright (C) 2013 Timesys Corporation
-SUMMARY = "Multicore communication kernel module"
-LICENSE = "GPL-2.0"
-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[md5sum] = "046b0a86d70b9e3424efc86f442bc335"
-SRC_URI[sha256sum] = "44ed7f812625ef764d62ff0871784ceb155ef86df8932e91830f9222adbf3a9e"
-
-S = "${WORKDIR}/mcc-kmod-${PV}"
-
-COMPATIBLE_MACHINE = "(vf60)"
diff --git a/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb b/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb
new file mode 100644
index 0000000..3accf90
--- /dev/null
+++ b/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.04.bb
@@ -0,0 +1,15 @@ 
+# Copyright (C) 2013 Timesys Corporation
+SUMMARY = "Multicore communication kernel module"
+LICENSE = "GPL-2.0"
+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"
+
+SRC_URI[md5sum] = "d72e8f6575605906be94ac2d26e6bc26"
+SRC_URI[sha256sum] = "f86a860e68cefdce70796572d97ddd4cc5e08d9f13117b431599add55bf1a651"
+
+S = "${WORKDIR}/mcc-kmod-${PV}"
+
+COMPATIBLE_MACHINE = "(vf60)"