[meta-freescale] [meta-fsl-arm][PATCH 2/5] libmcc: Update version to 2.0

Anthony Felice tony.felice at timesys.com
Fri Oct 9 14:38:56 PDT 2015


This commit updates libmcc to version 2.0, to bring compatibility with MCC
v2.x.

The following has changed in libmcc 2.0:

-Change internal libmcc functions to be compatible with MCC v2.x kernel layer.
-Add a new function that can be called from userspace, mcc_send_nocopy(). This
 function is the same as mcc_send(), but does not copy data to a user-supplied
 buffer. Instead, the data is only stored in shared memory.

Signed-off-by: Anthony Felice <tony.felice at timesys.com>
---
 .../libmcc/build-Fix-symlink-generation.patch      | 32 ----------------------
 .../libmcc/build-with-versioned-soname.patch       | 18 ------------
 .../libmcc_1.05.bb => libmcc2/libmcc2_2.0.bb}      | 18 ++++--------
 3 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch
 delete mode 100644 recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch
 rename recipes-bsp/{libmcc/libmcc_1.05.bb => libmcc2/libmcc2_2.0.bb} (32%)

diff --git a/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch b/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch
deleted file mode 100644
index 0aebe00..0000000
--- a/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From adef7a71a3bd40650685183c8a023000423ec880 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio at ossystems.com.br>
-Date: Tue, 6 Jan 2015 12:03:27 -0200
-Subject: [PATCH] build: Fix symlink generation
-Organization: O.S. Systems Software LTDA.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
----
- Makefile | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ac46f5c..248b2eb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,9 +14,8 @@ install:
- 	mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib
- 	cp -f build/libmcc.so.* build/libmcc.a $(DESTDIR)/usr/lib
- 	cp -f include/*.h $(DESTDIR)/usr/include
--	cd $(DESTDIR)/usr/lib/
--	ln -sf libmcc.so.1.0 libmcc.so.1
--	ln -sf libmcc.so.1 libmcc.so
-+	ln -sf libmcc.so.1.0 $(DESTDIR)/usr/lib/libmcc.so.1
-+	ln -sf libmcc.so.1 $(DESTDIR)/usr/lib/libmcc.so
- 
- clean:
- 	rm -rf build
--- 
-2.1.4
-
diff --git a/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch b/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch
deleted file mode 100644
index d004b78..0000000
--- a/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-libmcc: build with versioned soname
-
-This adds a versioned soname to the shared library during linking.
-Otherwise an application linked with '-lmcc' needs libmcc.so for execution,
-having libmcc.so.1 would not be enough.
-
-Signed-off-by: Max Krummenacher <max.oss.09 at gmail.com>
---- a/Makefile	2015-01-07 17:09:13.657675270 +0100
-+++ b/Makefile	2015-01-07 17:21:19.457545709 +0100
-@@ -8,7 +8,7 @@
- 	$(AR) rcs $@ $<
- 
- build/libmcc.so.1.0: build/libmcc.o
--	$(CC) -shared -o $@  $<
-+	$(CC) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc
- 
- install:
- 	mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib
diff --git a/recipes-bsp/libmcc/libmcc_1.05.bb b/recipes-bsp/libmcc2/libmcc2_2.0.bb
similarity index 32%
rename from recipes-bsp/libmcc/libmcc_1.05.bb
rename to recipes-bsp/libmcc2/libmcc2_2.0.bb
index 1140ed1..8cccce5 100644
--- a/recipes-bsp/libmcc/libmcc_1.05.bb
+++ b/recipes-bsp/libmcc2/libmcc2_2.0.bb
@@ -3,25 +3,17 @@ SUMMARY = "Multicore communication Library"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d"
 
-DEPENDS = "virtual/kernel-module-mcc"
+SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc2/libmcc2-${PV}/libmcc2-${PV}.tar.bz2"
 
-SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2 \
-           file://build-Fix-symlink-generation.patch \
-           file://build-with-versioned-soname.patch"
+SRC_URI[md5sum] = "07f73a98eb1db48e494b49c00f857608"
+SRC_URI[sha256sum] = "3c3d9c7bb355e3bf144e00e672457fa04ff8616d0c9d9f0ef31394a76d5300e9"
 
-SRC_URI[md5sum] = "cc3965f162dd20b8e6b9babf5dd963ee"
-SRC_URI[sha256sum] = "b98c1f857bf851e41c35c4fcdb823e83e0e058c746dffb50038c8759c8c1e104"
+S = "${WORKDIR}/libmcc2-${PV}"
 
-S = "${WORKDIR}/libmcc-${PV}"
-
-CFLAGS += "-I${STAGING_KERNEL_DIR}/include"
-
-RDEPENDS_${PN} = "virtual/kernel-module-mcc"
+CFLAGS += "-I${STAGING_KERNEL_DIR}/include/uapi"
 
 COMPATIBLE_MACHINE = "(vf60)"
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
 }
-
-RDEPENDS_${PN}-dev += "virtual/kernel-module-mcc-dev"
-- 
1.9.1



More information about the meta-freescale mailing list