From 6a54171997fff21fcc9057befc85d337d445a71b Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 17 Nov 2009 12:12:48 +0000
Subject: [PATCH] dosfstools: Convert to use install step for staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/dosfstools/dosfstools-native_2.10.bb           | 5 -----
 .../dosfstools/{files => dosfstools}/2.6.20-syscall.patch    | 0
 .../dosfstools/{files => dosfstools}/alignment_hack.patch    | 0
 .../{files => dosfstools}/dosfstools-2.10-kernel-2.6.patch   | 0
 .../{files => dosfstools}/dosfstools-msdos_fs-types.patch    | 0
 .../{files => dosfstools}/include-linux-types.patch          | 0
 .../dosfstools/{files => dosfstools}/mkdosfs-bootcode.patch  | 0
 .../dosfstools/{files => dosfstools}/mkdosfs-dir.patch       | 0
 .../{files => dosfstools}/msdos_fat12_undefined.patch        | 0
 meta/packages/dosfstools/dosfstools_2.10.bb                  | 1 +
 meta/packages/dosfstools/dosfstools_2.11.bb                  | 1 +
 11 files changed, 2 insertions(+), 5 deletions(-)
 rename meta/packages/dosfstools/{files => dosfstools}/2.6.20-syscall.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/alignment_hack.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/dosfstools-2.10-kernel-2.6.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/dosfstools-msdos_fs-types.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/include-linux-types.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/mkdosfs-bootcode.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/mkdosfs-dir.patch (100%)
 rename meta/packages/dosfstools/{files => dosfstools}/msdos_fat12_undefined.patch (100%)

diff --git a/meta/packages/dosfstools/dosfstools-native_2.10.bb b/meta/packages/dosfstools/dosfstools-native_2.10.bb
index 494e5135c9..4853c154ad 100644
--- a/meta/packages/dosfstools/dosfstools-native_2.10.bb
+++ b/meta/packages/dosfstools/dosfstools-native_2.10.bb
@@ -17,8 +17,3 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
 	file://2.6.20-syscall.patch;patch=1"
 
 inherit native
-
-do_stage() {
-	install -m 755 ${S}/mkdosfs/mkdosfs ${STAGING_BINDIR}/mkdosfs
-	install -m 755 ${S}/dosfsck/dosfsck ${STAGING_BINDIR}/dosfsck
-}
diff --git a/meta/packages/dosfstools/files/2.6.20-syscall.patch b/meta/packages/dosfstools/dosfstools/2.6.20-syscall.patch
similarity index 100%
rename from meta/packages/dosfstools/files/2.6.20-syscall.patch
rename to meta/packages/dosfstools/dosfstools/2.6.20-syscall.patch
diff --git a/meta/packages/dosfstools/files/alignment_hack.patch b/meta/packages/dosfstools/dosfstools/alignment_hack.patch
similarity index 100%
rename from meta/packages/dosfstools/files/alignment_hack.patch
rename to meta/packages/dosfstools/dosfstools/alignment_hack.patch
diff --git a/meta/packages/dosfstools/files/dosfstools-2.10-kernel-2.6.patch b/meta/packages/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
similarity index 100%
rename from meta/packages/dosfstools/files/dosfstools-2.10-kernel-2.6.patch
rename to meta/packages/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
diff --git a/meta/packages/dosfstools/files/dosfstools-msdos_fs-types.patch b/meta/packages/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
similarity index 100%
rename from meta/packages/dosfstools/files/dosfstools-msdos_fs-types.patch
rename to meta/packages/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
diff --git a/meta/packages/dosfstools/files/include-linux-types.patch b/meta/packages/dosfstools/dosfstools/include-linux-types.patch
similarity index 100%
rename from meta/packages/dosfstools/files/include-linux-types.patch
rename to meta/packages/dosfstools/dosfstools/include-linux-types.patch
diff --git a/meta/packages/dosfstools/files/mkdosfs-bootcode.patch b/meta/packages/dosfstools/dosfstools/mkdosfs-bootcode.patch
similarity index 100%
rename from meta/packages/dosfstools/files/mkdosfs-bootcode.patch
rename to meta/packages/dosfstools/dosfstools/mkdosfs-bootcode.patch
diff --git a/meta/packages/dosfstools/files/mkdosfs-dir.patch b/meta/packages/dosfstools/dosfstools/mkdosfs-dir.patch
similarity index 100%
rename from meta/packages/dosfstools/files/mkdosfs-dir.patch
rename to meta/packages/dosfstools/dosfstools/mkdosfs-dir.patch
diff --git a/meta/packages/dosfstools/files/msdos_fat12_undefined.patch b/meta/packages/dosfstools/dosfstools/msdos_fat12_undefined.patch
similarity index 100%
rename from meta/packages/dosfstools/files/msdos_fat12_undefined.patch
rename to meta/packages/dosfstools/dosfstools/msdos_fat12_undefined.patch
diff --git a/meta/packages/dosfstools/dosfstools_2.10.bb b/meta/packages/dosfstools/dosfstools_2.10.bb
index 100044b75d..4d8f6fb8e0 100644
--- a/meta/packages/dosfstools/dosfstools_2.10.bb
+++ b/meta/packages/dosfstools/dosfstools_2.10.bb
@@ -16,6 +16,7 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
            file://msdos_fat12_undefined.patch;patch=1 \
 	   file://include-linux-types.patch;patch=1"
 
+NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
 		   "MANDIR=${D}${mandir}/man8" install
diff --git a/meta/packages/dosfstools/dosfstools_2.11.bb b/meta/packages/dosfstools/dosfstools_2.11.bb
index a5f6e034dd..91430c0b6b 100644
--- a/meta/packages/dosfstools/dosfstools_2.11.bb
+++ b/meta/packages/dosfstools/dosfstools_2.11.bb
@@ -15,6 +15,7 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
            file://msdos_fat12_undefined.patch;patch=1 \
 	   file://include-linux-types.patch;patch=1"
 
+NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
 		   "MANDIR=${D}${mandir}/man8" install