Make run-built-arm-image work with newer baserock images

4 files changed, 1 insertions, 114 deletions

diff --git a/armv7-versatile/create-source-disk.sh b/armv7-versatile/create-source-disk.sh
deleted file mode 100755
index aaeee82..0000000
--- a/armv7-versatile/create-source-disk.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DIR="$1"
-
-if [[ -z "$DIR" ]]; then
-  echo "Usage: $0 <INSTALL DIR>"
-  exit 1
-fi
-
-cd "$DIR"
-
-SOURCE_DISK="devel-system-armv7-versatile.src.img"
-
-if [[ ! -f "$SOURCE_DISK" ]]; then
-  qemu-img create -f qcow2 "$SOURCE_DISK" 30G
-fi
diff --git a/armv7-versatile/download-image.sh b/armv7-versatile/download-image.sh
deleted file mode 100755
index 1aff10d..0000000
--- a/armv7-versatile/download-image.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DIR="$1"
-IMAGE_BASENAME="$2"
-
-if [[ -z "$IMAGE_BASENAME" ]]; then
-  echo "Usage: $0 <INSTALL DIR> <IMAGE BASE NAME>"
-  echo "Example: $0 . devel-system-armv7-versatile"
-  exit 1
-fi
-
-COMPRESSED_IMAGE="$IMAGE_BASENAME.img.gz"
-DECOMPRESSED_IMAGE=${COMPRESSED_IMAGE/.gz/}
-KERNEL_IMAGE="$IMAGE_BASENAME.zimage"
-
-if [[ ! -d "$DIR" ]]; then
-  mkdir -p "$DIR"
-fi
-
-cd "$DIR"
-
-if [[ ! -f "$COMPRESSED_IMAGE" ]]; then
-  echo "Downloading development image..."
-  curl "http://download.baserock.org/baserock/$COMPRESSED_IMAGE" > \
-    "$COMPRESSED_IMAGE"
-fi
-
-if [[ ! -f "$KERNEL_IMAGE" ]]; then
-  echo "Downloading kernel image..."
-  curl "http://download.baserock.org/baserock/$KERNEL_IMAGE" > \
-    "$KERNEL_IMAGE"
-fi
-
-if [[ ! -f "$DECOMPRESSED_IMAGE" ]]; then
-  echo "Decompressing development image..."
-  gzip -cd "$COMPRESSED_IMAGE" > "$DECOMPRESSED_IMAGE"
-fi
diff --git a/armv7-versatile/run-baserock-image.sh b/armv7-versatile/run-baserock-image.sh
deleted file mode 100755
index 695d331..0000000
--- a/armv7-versatile/run-baserock-image.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DIR="$1"
-
-if [[ -z "$DIR" ]]; then
-  echo "Usage: $0 <INSTALL DIR>"
-  exit 1
-fi
-
-
-if [[ ! -d "$DIR" ]]; then
-  mkdir -p "$DIR"
-fi
-
-IMAGE_BASENAME="devel-system-armv7-versatile"
-COMPRESSED_IMAGE="$DIR/$IMAGE_BASENAME.img.gz"
-DECOMPRESSED_IMAGE=${COMPRESSED_IMAGE/.gz/}
-KERNEL_IMAGE="$DIR/$IMAGE_BASENAME.zimage"
-
-./download-image.sh "$DIR" "$IMAGE_BASENAME"
-
-# If we ever get multiple disks working on qemu ARM, execute:
-# ./create-source-disk.sh "$DIR"
-# Because the devel image doesn't have enough space to develop on the
-# main partition, resize it.
-truncate --size=5G "$DECOMPRESSED_IMAGE"
-sfdisk "$DECOMPRESSED_IMAGE" <<EOF
-1,,83,*
-EOF
-
-
-find_tunctl() {
-    for path in `which tunctl` /{usr/,usr/local/}{bin,sbin}/tunctl; do
-        if [ -x "$path" ]; then
-            return 0
-	fi
-    done
-    return 1
-}
-
-if ! find_tunctl; then
-cat >&2 <<EOF
-Could not find tunctl executable in standard paths or PATH
-
-On Fedora it is in the tunctl package.
-On Ubuntu it is in the uml-utilities package.
-EOF
-fi
-
-MACHINE=qemuarmv7 PATH="$PATH:$(pwd)" OE_TMPDIR=/ KERNEL="$KERNEL_IMAGE" \
-    ROOTFS="$DECOMPRESSED_IMAGE" \
-    sh ./runqemu serial \
-        bootparams="rootflags=subvol=factory-run root=/dev/mmcblk0p1" \
-	btrfs qemuparams="-m 1024 -M vexpress-a9"
diff --git a/armv7-versatile/run-built-arm-image.sh b/armv7-versatile/run-built-arm-image.sh
index 41e1a6d..5a7edb0 100755
--- a/armv7-versatile/run-built-arm-image.sh
+++ b/armv7-versatile/run-built-arm-image.sh
@@ -20,5 +20,5 @@ fi
 
 MACHINE=qemuarmv7 PATH="$PATH:$(pwd)" OE_TMPDIR=/ KERNEL="$1" ROOTFS="$2" \
     sh ./runqemu serial \
-        bootparams="rootflags=subvol=factory-run root=/dev/mmcblk0" \
+        bootparams="rootflags=subvol=systems/version1/run root=/dev/mmcblk0" \
 	btrfs qemuparams="-m 1024 -M vexpress-a9"