diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
| commit | c1c331e7c545c7a2f0545d3b1ef9751c9571d357 (patch) | |
| tree | d2a4edf71f2c7204808e4543f3d743a81e95a1bd /tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | |
| parent | b2786c73c0f4d4b76f824e309598ce57065e30ab (diff) | |
| parent | 5f705f1e2c95b988ae39df7820f4034c49f375e4 (diff) | |
| download | morph-c1c331e7c545c7a2f0545d3b1ef9751c9571d357.tar.gz | |
Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'
Reviewed-by:
Richard Maw
Diffstat (limited to 'tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script')
| -rwxr-xr-x | tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index e0829968..ca1b1302 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -27,14 +27,11 @@ arch=$("$SRCDIR/scripts/test-morph" print-architecture) cd "$DATADIR/kernel-repo" cat <<EOF >linux.morph -{ - "name": "linux", - "kind": "chunk", - "install-commands": [ - "mkdir -p \"\$DESTDIR/boot\"", - "touch \"\$DESTDIR\"/boot/zImage" - ] -} +name: linux +kind: chunk +install-commands: + - mkdir -p "\$DESTDIR/boot" + - touch "\$DESTDIR/boot/zImage" EOF git add linux.morph git commit --quiet -m 'Make the kernel create a dummy zImage' |