4 files changed, 36 insertions, 51 deletions
diff --git a/packages/ezx/ezx-gen-blob/gen-blob b/packages/ezx/ezx-gen-blob/gen-blob
deleted file mode 100644
index 1131a211ca..0000000000
--- a/packages/ezx/ezx-gen-blob/gen-blob
+++ /dev/null
diff --git a/packages/ezx/ezx-gen-blob_20080707.bb b/packages/ezx/ezx-gen-blob_20080707.bb
deleted file mode 100644
index 50fcd8b105..0000000000
--- a/packages/ezx/ezx-gen-blob_20080707.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-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}"
-
diff --git a/packages/ezx/ezx-gen-blob_svn.bb b/packages/ezx/ezx-gen-blob_svn.bb
index fb0def2c20..add64e16ed 100644
--- a/packages/ezx/ezx-gen-blob_svn.bb
+++ b/packages/ezx/ezx-gen-blob_svn.bb
@@ -1,37 +1,39 @@
 DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform"
 SECTION = "bootloaders"
-AUTHOR = "Daniel Riberio"
+AUTHOR = "OpenEZX Team"
 HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob"
-PRIORITY = "optional"
 LICENSE = "GPL"
 PROVIDES = "virtual/bootloader"
-PV = "0.1.0+${SRCREV}"
+DEPENDS = "openezx-kernel"
+PV = "1.0.0+${SRCREV}"
 PR = "r0"
 
-DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+  svn://svn.openezx.org/trunk/src/blob/;module=gen-blob;proto=http \
+  file://remove-bogus-sed.patch;patch=1 \
+"
+S = "${WORKDIR}/gen-blob"
 
 inherit autotools
 
-SRC_URI = "svn://svn.openezx.org/trunk/src/blob/;module=gen-blob;proto=http"
-S = "${WORKDIR}/gen-blob"
-
-do_deploy() {
-	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+EXTRA_OECONF = "\
+  --with-board=lubbock \
+  --with-cpu=pxa262 \
+  --with-linux-prefix=${STAGING_KERNEL_DIR} \
+  --enable-usb \
+"
 
-	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_configure() {
+	gnu-configize
+	oe_runconf
 }
 
-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}
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 src/blob/blob-a780  ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 src/blob/blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE}
 }
 
 addtask deploy before do_build after do_compile
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${datadir}"
diff --git a/packages/ezx/files/remove-bogus-sed.patch b/packages/ezx/files/remove-bogus-sed.patch
new file mode 100644
index 0000000000..8597ed945d
--- /dev/null
+++ b/packages/ezx/files/remove-bogus-sed.patch
@@ -0,0 +1,15 @@
+Index: gen-blob/configure
+===================================================================
+--- gen-blob.orig/configure
++++ gen-blob/configure
+@@ -1970,8 +1970,8 @@
+ fi  
+ 
+ 
+-CFLAGS=`echo $CFLAGS | sed 's/\ *-g\ */\ /'`
+-LDFLAGS=`echo $LDFLAGS | sed 's/\ *-g\ */\ /'`
++CFLAGS=`echo $CFLAGS`
++LDFLAGS=`echo $LDFLAGS`
+ CCAS=`echo $CC`
+ CCASFLAGS=`echo $CFLAGS -D__ASSEMBLY__ `
+