diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-21 17:16:23 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-21 17:27:30 +0000 |
| commit | d1882582a3d0641a06f908c65de200e5b13ff5c2 (patch) | |
| tree | cf80a101c822ddbf040f5f90b7169fd46e915d41 /tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | |
| parent | 7172dca14d7306d79e93b97dcef3a006309f2e03 (diff) | |
| parent | 053c0993bb62dd5e1a73d3367ea04c70874f3bd1 (diff) | |
| download | morph-d1882582a3d0641a06f908c65de200e5b13ff5c2.tar.gz | |
Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/baserock/baserock/morph
This includes the following fixups:
- altering the bootstrap script to install ordereddict and simplejson.
- Adding a comment to clarify that it is intentional to use simplejson
if collections does not have OrderedDict
- Amending the copyright years to include 2013
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 | 4 |
1 files changed, 1 insertions, 3 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 8bf25dee..088e6925 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011, 2012 Codethink Limited +# Copyright (C) 2011, 2012, 2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,8 +21,6 @@ set -eu -. "$SRCDIR/scripts/python-check" - cache="$DATADIR/cache/artifacts" arch=$(uname -m) |