From 4ee1ccc66731df0230a076e709c8197b26ae43b4 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 27 Nov 2012 16:08:22 +0100
Subject: [PATCH] meta-digi-arm: Use an append file for fsl-mm-codeclib.

Instead of having the whole recipe in meta-digi-arm, use the original
recipe in meta-fsl-arm and just add a bbappend file with some overrides.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../fsl-mm-core/fsl-mm-codeclib.inc           | 34 -------------------
 ....0.3.bb => fsl-mm-codeclib_2.0.3.bbappend} |  6 +---
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib.inc
 rename meta-digi-arm/recipes-multimedia/fsl-mm-core/{fsl-mm-codeclib_2.0.3.bb => fsl-mm-codeclib_2.0.3.bbappend} (64%)

diff --git a/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib.inc b/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib.inc
deleted file mode 100644
index 0176d02d3..000000000
--- a/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2011 Freescale Semiconductor
-# Copyright (C) 2012 Digi International.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "Freescale mm codec libs"
-SECTION = "multimedia"
-LICENSE = "Proprietary"
-DEPENDS = "pkgconfig"
-
-LIC_FILES_CHKSUM := "file://${FSL_MMK_EULA_FILE};md5=da9b44d371e7f1f2d2fa1cad0db90ef7"
-
-INC_PR = "r1"
-
-INSANE_SKIP_${PN} = "ldflags"
-INSANE_SKIP_${PN}-dev = "ldflags"
-
-SRC_URI = "${DIGI_LOG_MIRROR}/${PN}-${PV}.tar.gz"
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${libdir}/pkgconfig
-    install -d ${D}${includedir}/mm_ghdr
-
-    cp -r ${S}/release/lib/* ${D}${libdir}
-    cp -r ${S}/ghdr/* ${D}${includedir}/mm_ghdr
-    install -m 0644 ${S}/pkgconfig/fsl-mm-core.pc ${D}${libdir}/pkgconfig
-
-	# Fix file permissions
-	find ${D} -type f -exec chmod a-x '{}' ';'
-}
-
-FILES_${PN} += "${libdir}/*.so*"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib_2.0.3.bb b/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib_2.0.3.bbappend
similarity index 64%
rename from meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib_2.0.3.bb
rename to meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib_2.0.3.bbappend
index 113e0db69..0256178b7 100644
--- a/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib_2.0.3.bb
+++ b/meta-digi-arm/recipes-multimedia/fsl-mm-core/fsl-mm-codeclib_2.0.3.bbappend
@@ -1,8 +1,4 @@
-include fsl-mm-codeclib.inc
-
-PR = "${INC_PR}.0"
+PR_append = "digi.0"
 
 SRC_URI[md5sum] = "c33df24405ef54cc55029d1f4a6c6230"
 SRC_URI[sha256sum] = "2bb006d8eccb2938da868acc62f2d7620dffb40b070bf7b24479450da494a2a0"
-
-COMPATIBLE_MACHINE = "(mx5)"