[oe-commits] [openembedded-core] 11/68: runqemu-extract-sdk: allow install debugfs on rootfs

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit fdd2fca2257172251ffb0fbc6dcd60bed01ee0f0
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed May 30 17:03:49 2018 +0800

    runqemu-extract-sdk: allow install debugfs on rootfs
    
    Usually, the debugfs' (-dbg.tar.*) work follow is:
    1) Install regular rootfs to dir_foo
    2) Install debugfs (-dbg.tar.*) to the same dir_foo
    
    So we need to allow installing the debugfs on top of the rootfs.
    
    (From OE-Core rev: c54147b286d72d7c4f8ca55a5a62f5d27bd5364a)
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/runqemu-extract-sdk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
index 2a0dd50..f4286ef 100755
--- a/scripts/runqemu-extract-sdk
+++ b/scripts/runqemu-extract-sdk
@@ -76,7 +76,9 @@ fi
 pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename "$SDK_ROOTFS_DIR").pseudo_state"
 pseudo_state_dir="$(readlink -f $pseudo_state_dir)"
 
-if [ -e "$pseudo_state_dir" ]; then
+debug_image="`echo $ROOTFS_TARBALL | grep '\-dbg\.tar\.'`"
+
+if [ -e "$pseudo_state_dir" -a -z "$debug_image" ]; then
 	echo "Error: $pseudo_state_dir already exists!"
 	echo "Please delete the rootfs tree and pseudo directory manually"
         echo "if this is really what you want."

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.