dosfstools: Convert to use install step for staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/dosfstools/dosfstools-native_2.10.bb b/meta/packages/dosfstools/dosfstools-native_2.10.bb
index 494e5135c932124742a78d3f8ea5d8f3c0f8b0a9..4853c154add65e9acb5c08377f72201ca633baaf 100644 (file)
--- 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 100044b75d0469856941507b9963324a3316aad3..4d8f6fb8e03a3994dae4e5ad6afea4792e462a6a 100644 (file)
--- 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 a5f6e034dd35e8ad3e6c038af50511d569bfd1b0..91430c0b6bcab144799303427a3bc397177664bb 100644 (file)
--- 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