Merge bk://openembedded@openembedded.bkbits.net/packages

into olddog.(none):/home/ggilbert/oe/packages

2004/04/01 09:54:30-08:00 (none)!ggilbert
mtd-native.oe:
  mtd-native: Patch from PB
  * Adds proper FILESDIR declaration
  * Fixes paths to binaries for do_stage
mtd.oe:
  mtd: Patch from PB
  * Fixes path to binaries in do_install
  * Fixes ${S} to point at the correct directory
  * Patches MTD to include headers that it requires
stdint.patch:
  Change mode to -rw-r--r--
  new file

BKrev: 406c580dMhUlBO9eWftdY7YVeC0ZiA

diff --git a/mtd/mtd-native.oe b/mtd/mtd-native.oe
index 629fa0d..39cd187 100644 (file)
--- a/mtd/mtd-native.oe
+++ b/mtd/mtd-native.oe
@@ -1,11 +1,12 @@
 include mtd.oe
 inherit native
 DEPENDS = "patcher-native"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/mtd"
 
 do_stage () {
        for binary in ftl_format erase eraseall nanddump doc_loadbios \
                mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
                fcp nandwrite jffs2dump; do
-               install -m 0755 $binary ${STAGING_BINDIR}/
+               install -m 0755 util/$binary ${STAGING_BINDIR}/
        done
 }

diff --git a/mtd/mtd.oe b/mtd/mtd.oe
index facecd0..5fc2034 100644 (file)
--- a/mtd/mtd.oe
+++ b/mtd/mtd.oe
@@ -3,18 +3,23 @@ RDEPENDS = "libc6 zlib1g"
 DESCRIPTION = "Tools for managing memory technology devices."
 PV = "${CVSDATE}"
 
-S = "${WORKDIR}/mtd/util"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd"
+S = "${WORKDIR}/mtd/"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
+           file://${FILESDIR}/stdint.patch;patch=1;pnum=0"
 
 CFLAGS_prepend = "-I${S}/../include "
 CPPFLAGS_prepend = "-I${S}/../include "
 CXXFLAGS_prepend = "-I${S}/../include "
 
+do_compile () {
+       oe_runmake -C util
+}
+
 do_install () {
        install -d ${D}${bindir}
        for binary in ftl_format erase eraseall nanddump doc_loadbios \
                mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
                fcp nandwrite jffs2dump; do
-               install -m 0755 $binary ${D}${bindir}
+               install -m 0755 util/$binary ${D}${bindir}
        done
 }

diff --git a/mtd/mtd/stdint.patch b/mtd/mtd/stdint.patch
new file mode 100644 (file)
index 0000000..e69de29