diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-25 21:14:48 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-26 12:01:58 +0100 |
| commit | a825aaa0a7619ba17c73abbb1e043401ce70add3 (patch) | |
| tree | f08199e3a34f45911a64d7e9ce15119ca940b1fa /tests.as-root | |
| parent | 4bb2d42439c539e5e200dd61366b941898b7b46c (diff) | |
| download | morph-a825aaa0a7619ba17c73abbb1e043401ce70add3.tar.gz | |
Remove arch specific test in syslinux-disk builder
We only do this building on architectures we support, so there's no
need for variation.
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script index 10b563a7..b9216009 100755 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script @@ -20,6 +20,13 @@ set -eu +# We only support x86 systems with syslinux-disk. +arch=$(uname -m) +case "$arch" in + x86*) ;; + *) exit 0 ;; +esac + cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" morphsrepo="$DATADIR/morphs-repo" @@ -29,10 +36,10 @@ cd "$morphsrepo" git checkout --quiet -b custom master cat <<EOF >system.morph { - "name": "x86_64-system", + "name": "system", "kind": "system", "system-kind": "syslinux-disk", - "arch": "x86_64", + "arch": "$(arch)", "disk-size": "1G", "strata": [ "stratum" |