remove the patches, they have been merged upstream
Signed-off-by: Andy Voltz <[email protected]>
Signed-off-by: Anthony Felice <[email protected]>
---
recipes-bsp/libmcc/libmcc/libmcc-cflags.patch | 18 ---------------
recipes-bsp/libmcc/libmcc/libmcc-symlink.patch | 32 --------------------------
recipes-bsp/libmcc/libmcc_1.03.bb | 22 ------------------
recipes-bsp/libmcc/libmcc_1.04.bb | 20 ++++++++++++++++
4 files changed, 20 insertions(+), 72 deletions(-)
delete mode 100644 recipes-bsp/libmcc/libmcc/libmcc-cflags.patch
delete mode 100644 recipes-bsp/libmcc/libmcc/libmcc-symlink.patch
delete mode 100644 recipes-bsp/libmcc/libmcc_1.03.bb
create mode 100644 recipes-bsp/libmcc/libmcc_1.04.bb
diff --git a/recipes-bsp/libmcc/libmcc/libmcc-cflags.patch
b/recipes-bsp/libmcc/libmcc/libmcc-cflags.patch
deleted file mode 100644
index 01f4c41..0000000
--- a/recipes-bsp/libmcc/libmcc/libmcc-cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch is required with the Yocto toolchain.
-
-Upstream-status: Pending
-
-diff -Nuar libmcc-1.03-orig/Makefile libmcc-1.03/Makefile
---- libmcc-1.03-orig/Makefile 2013-08-12 14:43:50.063656300 -0400
-+++ libmcc-1.03/Makefile 2013-08-12 14:44:10.007427139 -0400
-@@ -1,9 +1,8 @@
--CFLAGS+=-Iinclude/
- all: build/libmcc.a build/libmcc.so
-
- build/libmcc.o: src/libmcc.c
- mkdir -p build/
-- $(CC) -c -fPIC $< -o $@ $(CFLAGS)
-+ $(CC) -c -fPIC $< -o $@ -Iinclude/ $(CFLAGS)
-
- build/libmcc.a: build/libmcc.o
- $(AR) rcs $@ $<
diff --git a/recipes-bsp/libmcc/libmcc/libmcc-symlink.patch
b/recipes-bsp/libmcc/libmcc/libmcc-symlink.patch
deleted file mode 100644
index f21a93e..0000000
--- a/recipes-bsp/libmcc/libmcc/libmcc-symlink.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch adds the proper version suffix to the libmcc shared libs.
-
-Upstream-status: Pending
-
-diff -Nuar libmcc-1.03-orig/Makefile libmcc-1.03/Makefile
---- libmcc-1.03-orig/Makefile 2013-08-13 10:05:46.187200835 -0400
-+++ libmcc-1.03/Makefile 2013-08-13 12:23:45.167119943 -0400
-@@ -1,4 +1,4 @@
--all: build/libmcc.a build/libmcc.so
-+all: build/libmcc.a build/libmcc.so.1.0
-
- build/libmcc.o: src/libmcc.c
- mkdir -p build/
-@@ -7,13 +7,16 @@
- build/libmcc.a: build/libmcc.o
- $(AR) rcs $@ $<
-
--build/libmcc.so: build/libmcc.o
-+build/libmcc.so.1.0: build/libmcc.o
- $(CC) -shared -o $@ $<
-
- install:
- mkdir -p $(DESTDIR)/usr/{lib,include}
-- cp -f build/libmcc.{so,a} $(DESTDIR)/usr/lib
-+ cp -f build/libmcc.{so.*,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
-
- clean:
- rm -rf build
diff --git a/recipes-bsp/libmcc/libmcc_1.03.bb
b/recipes-bsp/libmcc/libmcc_1.03.bb
deleted file mode 100644
index 950495c..0000000
--- a/recipes-bsp/libmcc/libmcc_1.03.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2013 Timesys Corporation
-SUMMARY = "MCC Userspace Library"
-DESCRIPTION = "Timesys Multicore communication Library"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d"
-
-DEPENDS = "kernel-module-mcc"
-RDEPENDS_${PN} = "kernel-module-mcc"
-
-inherit autotools
-
-SRC_URI =
"http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2
\
- file://libmcc-cflags.patch \
- file://libmcc-symlink.patch"
-
-SRC_URI[md5sum] = "adac15d52206be21a4589b2b923af4cc"
-SRC_URI[sha256sum] =
"8b4d88f260d4d3a67ee2c16e20112e0584403f350182087daa1cfafeceb16a7f"
-
-S = "${WORKDIR}/libmcc-${PV}"
-CFLAGS += " -I${STAGING_KERNEL_DIR}/include"
-
-COMPATIBLE_MACHINE = "(vf60)"
diff --git a/recipes-bsp/libmcc/libmcc_1.04.bb
b/recipes-bsp/libmcc/libmcc_1.04.bb
new file mode 100644
index 0000000..729a9b1
--- /dev/null
+++ b/recipes-bsp/libmcc/libmcc_1.04.bb
@@ -0,0 +1,20 @@
+# Copyright (C) 2013 Timesys Corporation
+SUMMARY = "MCC Userspace Library"
+DESCRIPTION = "Timesys Multicore communication Library"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d"
+
+DEPENDS = "kernel-module-mcc"
+RDEPENDS_${PN} = "kernel-module-mcc"
+
+inherit autotools
+
+SRC_URI =
"http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2";
+
+SRC_URI[md5sum] = "e93ce76b4419f0902a848e1769bf22ea"
+SRC_URI[sha256sum] =
"3de76c5b1a096021afebfc79ca4e85d05646beb3101edcecf73b82886e7a00c0"
+
+S = "${WORKDIR}/libmcc-${PV}"
+CFLAGS += " -I${STAGING_KERNEL_DIR}/include"
+
+COMPATIBLE_MACHINE = "(vf60)"
--
1.8.5.3
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
