]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu-extract-sdk: allow install debugfs on rootfs
authorRobert Yang <liezhi.yang@windriver.com>
Wed, 30 May 2018 09:03:49 +0000 (17:03 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 2 Jul 2018 09:40:33 +0000 (10:40 +0100)
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
scripts/runqemu-extract-sdk

index 2a0dd50e0e4bab9b435d50a8be5f457674c80f26..f4286efb1f728facfed9977ce259a029c67bd7f9 100755 (executable)
@@ -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."