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 <[email protected]> --- .../libmcc/build-Fix-symlink-generation.patch | 32 ---------------------- .../libmcc/build-with-versioned-soname.patch | 18 ------------ .../libmcc_1.05.bb => libmcc2/libmcc2_2.0.bb} | 12 ++++---- 3 files changed, 5 insertions(+), 57 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} (49%) 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> ---- 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 49% rename from recipes-bsp/libmcc/libmcc_1.05.bb rename to recipes-bsp/libmcc2/libmcc2_2.0.bb index 1140ed1..b746159 100644 --- a/recipes-bsp/libmcc/libmcc_1.05.bb +++ b/recipes-bsp/libmcc2/libmcc2_2.0.bb @@ -5,16 +5,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d" DEPENDS = "virtual/kernel-module-mcc" -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 = "http://repository.timesys.com/buildsources/l/libmcc2/libmcc2-${PV}/libmcc2-${PV}.tar.bz2" -SRC_URI[md5sum] = "cc3965f162dd20b8e6b9babf5dd963ee" -SRC_URI[sha256sum] = "b98c1f857bf851e41c35c4fcdb823e83e0e058c746dffb50038c8759c8c1e104" +SRC_URI[md5sum] = "ad6048217445bfa3b66ba0e3903a0bb0" +SRC_URI[sha256sum] = "16b504e9d1dd6bdc7297a0e5c8cb911c0986584c42c6017eff8c9b353e937a29" -S = "${WORKDIR}/libmcc-${PV}" +S = "${WORKDIR}/libmcc2-${PV}" -CFLAGS += "-I${STAGING_KERNEL_DIR}/include" +CFLAGS += "-I${STAGING_KERNEL_DIR}/include/uapi" RDEPENDS_${PN} = "virtual/kernel-module-mcc" -- 1.9.1 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
