From 00e6d38ca544388dc04b92a8e560bac70dfc9df4 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 2 Aug 2013 14:44:46 +0200
Subject: [PATCH] kernel-module-redpine: update for yocto dylan

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 ...edpine_git.bb => kernel-module-redpine.bb} | 26 ++++++++-----------
 .../{files => kernel-module-redpine}/Makefile |  0
 .../{files => kernel-module-redpine}/redpine  |  0
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename meta-digi-arm/recipes-kernel/kernel-module-redpine/{kernel-module-redpine_git.bb => kernel-module-redpine.bb} (82%)
 rename meta-digi-arm/recipes-kernel/kernel-module-redpine/{files => kernel-module-redpine}/Makefile (100%)
 rename meta-digi-arm/recipes-kernel/kernel-module-redpine/{files => kernel-module-redpine}/redpine (100%)

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
similarity index 82%
rename from meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
rename to meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
index 50e61dab2..0ccaef7da 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
@@ -9,6 +9,7 @@ inherit module
 PR = "${DISTRO}.r0"
 
 SRCREV = "b43b8f5e2d51b24bcc0bc167380cfd07baac81f0"
+SRCREV_SHORT = "${@'${SRCREV}'[:7]}"
 
 # Checksums for 'redpine-${MACHINE}-${SRCREV_SHORT}.tar.gz' tarballs
 TARBALL_MD5_ccimx51js    = "1a5d7d7b0a41c5dc4e8b9ea44e731264"
@@ -16,19 +17,13 @@ TARBALL_SHA256_ccimx51js = "3f855614573da0bc250cfc021f69a1aaba1d7c7c3a6347488604
 TARBALL_MD5_ccimx53js    = "4a84d4da7479a20db5ee76f81c33f7b1"
 TARBALL_SHA256_ccimx53js = "6e8d35f735172621b5b6c40aafd754aecd8371c6cc1589f9502c8f3098b3a90a"
 
-SRC_URI_git = " \
-	${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git \
-	"
-SRCREV_SHORT = "${@'${SRCREV}'[:7]}"
-SRC_URI_obj = " \
-	${DIGI_MIRROR}/redpine-${MACHINE}-${SRCREV_SHORT}.tar.gz;md5sum=${TARBALL_MD5};sha256sum=${TARBALL_SHA256} \
-	"
-
+SRC_URI_git = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git"
+SRC_URI_obj = "${DIGI_MIRROR}/redpine-${MACHINE}-${SRCREV_SHORT}.tar.gz;md5sum=${TARBALL_MD5};sha256sum=${TARBALL_SHA256}"
 SRC_URI  = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_git}', '${SRC_URI_obj}', d)}"
 SRC_URI += " \
-	file://Makefile \
-	file://redpine \
-	"
+    file://Makefile \
+    file://redpine \
+"
 
 S = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${WORKDIR}/git', '${WORKDIR}/${MACHINE}', d)}"
 
@@ -43,10 +38,6 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/redpine ${D}${sysconfdir}/network/if-pre-up.d/
 }
 
-FILES_${PN} += "/lib/firmware/redpine/tadm \
-		/lib/firmware/redpine/taim \
-		/lib/firmware/redpine/instructionSet"
-
 # Deploy objects tarball if building from sources
 do_deploy() {
 	if [ "${DIGI_INTERNAL_GIT}" = "1" ]; then
@@ -63,5 +54,10 @@ do_deploy() {
 
 addtask deploy before do_build after do_install
 
+FILES_${PN} += " \
+    ${base_libdir}/firmware/ \
+    ${sysconfdir}/network/ \
+"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ccimx51js|ccimx53js)"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/Makefile b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/Makefile
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-redpine/files/Makefile
rename to meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/Makefile
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/redpine b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/redpine
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-redpine/files/redpine
rename to meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/redpine