diff options
| -rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs | 8 | ||||
| -rwxr-xr-x | scripts/runqemu-export-rootfs | 2 | ||||
| -rwxr-xr-x | scripts/runqemu-extract-sdk | 15 |
3 files changed, 14 insertions, 11 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs index 62dc170c8a..d1a595b268 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs +++ b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs @@ -28,7 +28,6 @@ extract_rootfs() native_sysroot=$3 target_sysroot=$2 PSEUDO_COMMAND="$native_sysroot/usr/bin/pseudo" - PSEUDO_OPTS="-P $natvie_sysroot/usr" TAR_OPTS="-xjf" PSEUDO_OPTS="-P $native_sysroot/usr" @@ -46,9 +45,10 @@ extract_rootfs() mkdir -p "$target_sysroot" fi - mkdir -p "$target_sysroot/var/pseudo" - touch "$target_sysroot/var/pseudo/pseudo.pid" - PSEUDO_LOCALSTATEDIR="$target_sysroot/var/pseudo" + pseudo_state_dir="$target_sysroot/../$(basename "$target_sysroot").pseudo_state" + mkdir -p "$pseudo_state_dir" + touch "$pseudo_state_dir/pseudo.pid" + PSEUDO_LOCALSTATEDIR="$pseudo_state_dir" export PSEUDO_LOCALSTATEDIR echo_info "Extracting rootfs: $1, using pseudo..." diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs index f8213ba4ef..3c77dd74cd 100755 --- a/scripts/runqemu-export-rootfs +++ b/scripts/runqemu-export-rootfs @@ -68,7 +68,7 @@ NFSPID=~/.runqemu-sdk/nfs$NFS_INSTANCE.pid MOUNTPID=~/.runqemu-sdk/mount$NFS_INSTANCE.pid PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr" -PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo" +PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/../$(basename $NFS_EXPORT_DIR).pseudo_state" export PSEUDO_LOCALSTATEDIR if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk index 4b5247597f..509af66216 100755 --- a/scripts/runqemu-extract-sdk +++ b/scripts/runqemu-extract-sdk @@ -73,15 +73,18 @@ if [ ! -d "$SDK_ROOTFS_DIR" ]; then mkdir -p "$SDK_ROOTFS_DIR" fi -if [ -e "$SDK_ROOTFS_DIR/var/pseudo" ]; then - echo "Error: $SDK_ROOTFS_DIR/var/pseudo already exists!" - echo "Please delete the entire rootfs tree manually if this is really what you want" +pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename "$SDK_ROOTFS_DIR").pseudo_state" + +if [ -e "$pseudo_state_dir" ]; 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." exit 1 fi -mkdir -p "$SDK_ROOTFS_DIR/var/pseudo" -touch "$SDK_ROOTFS_DIR/var/pseudo/pseudo.pid" -PSEUDO_LOCALSTATEDIR="$SDK_ROOTFS_DIR/var/pseudo" +mkdir -p "$pseudo_state_dir" +touch "$pseudo_state_dir/pseudo.pid" +PSEUDO_LOCALSTATEDIR="$pseudo_state_dir" export PSEUDO_LOCALSTATEDIR echo "Extracting rootfs tarball using pseudo..." |