[oe-commits] org.oe.dev merge of '608b2b53305bf9caac347482f81437fb57e6205b'

[mickeyl commit]

merge of '608b2b53305bf9caac347482f81437fb57e6205b'
     and '762688ff3c4f669a807e2559bb786cc82118b7bb'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6c2994d284da06ed60c607d89622f27c35c68b0e
ViewMTN: http://monotone.openembedded.org/revision/info/6c2994d284da06ed60c607d89622f27c35c68b0e
Files:
1
packages/ezx/ezx-gen-blob
packages/ezx/ezx-gen-blob/gen-blob
packages/ezx/ezx-gen-blob_20080707.bb
mtn:manual_merge
true
packages/dsplink/codec-engine_2.10.bb
Diffs:

#
# mt diff -r608b2b53305bf9caac347482f81437fb57e6205b -r6c2994d284da06ed60c607d89622f27c35c68b0e
#
#
#
# add_dir "packages/ezx/ezx-gen-blob"
# 
# add_file "packages/ezx/ezx-gen-blob/gen-blob"
#  content [6f13ad8f7b89a9d338775e7470575426a505e674]
# 
# add_file "packages/ezx/ezx-gen-blob_20080707.bb"
#  content [9743098583597f6587d90ff68db65f40e48d0edc]
# 
#   set "packages/ezx/ezx-gen-blob/gen-blob"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/ezx/ezx-gen-blob/gen-blob is binary
============================================================
--- packages/ezx/ezx-gen-blob_20080707.bb	9743098583597f6587d90ff68db65f40e48d0edc
+++ packages/ezx/ezx-gen-blob_20080707.bb	9743098583597f6587d90ff68db65f40e48d0edc
@@ -0,0 +1,32 @@
+DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform"
+SECTION = "bootloaders"
+AUTHOR = "Daniel Riberio"
+HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "virtual/bootloader"
+
+SRC_URI = "file://gen-blob"
+S = "${WORKDIR}"
+
+do_deploy() {
+	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 gen-blob ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 gen-blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE}
+}
+
+do_install() {
+	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+
+	install -d ${D}/${datadir}/openezx
+	install -m 0644 gen-blob ${D}${datadir}/openezx/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 gen-blob-a1200 ${D}${datadir}/openezx/gen-blob-for-2ndgen.${SRCDATE}
+}
+
+addtask deploy before do_build after do_compile
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${datadir}"
+


#
# mt diff -r762688ff3c4f669a807e2559bb786cc82118b7bb -r6c2994d284da06ed60c607d89622f27c35c68b0e
#
#
#
# patch "packages/dsplink/codec-engine_2.10.bb"
#  from [811c730621069ed158a4cbe9dfb3d042da4161d2]
#    to [27ec35eee8d5be23f7a29ece8b87c24f3e403d08]
#
============================================================
--- packages/dsplink/codec-engine_2.10.bb	811c730621069ed158a4cbe9dfb3d042da4161d2
+++ packages/dsplink/codec-engine_2.10.bb	27ec35eee8d5be23f7a29ece8b87c24f3e403d08
@@ -17,6 +17,7 @@ S = "${WORKDIR}/codec_engine_2_10_01"
 
 S = "${WORKDIR}/codec_engine_2_10_01"
 
+PARALLEL_MAKE = ""
 do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS	
 	cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem