--- morphlib/plugins/tarball-systembuilder_plugin.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/morphlib/plugins/tarball-systembuilder_plugin.py b/morphlib/plugins/tarball-systembuilder_plugin.py index 9f805cd..ca218ac 100644 --- a/morphlib/plugins/tarball-systembuilder_plugin.py +++ b/morphlib/plugins/tarball-systembuilder_plugin.py @@ -17,6 +17,7 @@ import json import logging import os +from os.path import relpath import shutil import time from collections import defaultdict @@ -52,10 +53,7 @@ class RootfsTarballBuilder(SystemKindBuilder): # pragma: no cover self.copy_kernel_into_artifact_cache(fs_root) unslashy_root = fs_root[1:] def uproot_info(info): - if info.name == unslashy_root: - info.name = "." - elif info.name.startswith(unslashy_root): - info.name = "." + info.name[len(unslashy_root):] + info.name = relpath(info.name, unslashy_root) return info artiname = self.artifact.source.morphology['name'] tar = tarfile.TarFile.gzopen(fileobj=handle, mode="w", -- 1.7.5.4

--- tests.as-root/tarball-image-is-sensible.script | 35 ++++++++++ tests.as-root/tarball-image-is-sensible.setup | 87 ++++++++++++++++++++++++ tests.as-root/tarball-image-is-sensible.stdout | 18 +++++ 3 files changed, 140 insertions(+), 0 deletions(-) create mode 100755 tests.as-root/tarball-image-is-sensible.script create mode 100755 tests.as-root/tarball-image-is-sensible.setup create mode 100644 tests.as-root/tarball-image-is-sensible.stdout diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script new file mode 100755 index 0000000..d1245cb --- /dev/null +++ b/tests.as-root/tarball-image-is-sensible.script @@ -0,0 +1,35 @@ +#!/bin/sh +# +# A system kind of 'rootfs-tarball' should create a tarball containing +# all the required files +# +# Copyright (C) 2012 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -eu + +source "$SRCDIR/scripts/fix-committer-info" + +tar=$("$SRCDIR/morph" \ + --no-default-config --config="$DATADIR/morph.conf" --verbose \ + build-morphology test:morphs-repo tarball-links hello-tarball 2>&1 | + grep "system hello-tarball-rootfs is cached at" | + sed -nre "s/^.*system hello-tarball-rootfs is cached at (\S+)$/\1/p") + +extracted="$DATADIR/extracted" +mkdir -p "$extracted" +cd "$extracted" +tar -xf "$tar" +find . -mindepth 1 | LC_ALL=C sort -u | xargs ls -dF diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup new file mode 100755 index 0000000..f9aaed2 --- /dev/null +++ b/tests.as-root/tarball-image-is-sensible.setup @@ -0,0 +1,87 @@ +#!/bin/bash +# +# Copyright (C) 2011, 2012 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +set -eu + +source "$SRCDIR/scripts/fix-committer-info" + +chunkrepo="$DATADIR/chunk-repo" +cd "$chunkrepo" +git checkout -b tarball-links +cat >links.morph <<'EOF' +{ + "name": "links", + "kind": "chunk", + "build-system": "manual", + "install-commands": [ + "mkdir -p \"$DESTDIR/bin\"", + "touch \"$DESTDIR/bin/true\"", + "cd \"$DESTDIR/bin\" && ln true true-hardlink", + "cd \"$DESTDIR/bin\" && ln -s true true-symlink" + ] +} +EOF +git add links.morph +git commit --quiet -m 'Add link adding chunk' + +morphsrepo="$DATADIR/morphs-repo" +cd "$morphsrepo" +git checkout -b tarball-links +cat <<EOF > hello-tarball.morph +{ + "name": "hello-tarball", + "kind": "system", + "system-kind": "rootfs-tarball", + "arch": "$(uname -m)", + "strata": [ + { + "morph": "link-stratum", + "repo": "test:morphs-repo", + "ref": "tarball-links" + }, + { + "morph": "hello-stratum", + "repo": "test:morphs-repo", + "ref": "tarball-links" + }, + { + "morph": "linux-stratum", + "repo": "test:morphs-repo", + "ref": "tarball-links" + } + ] +} +EOF +git add hello-tarball.morph + +cat <<EOF > link-stratum.morph +{ + "name": "link-stratum", + "kind": "stratum", + "chunks": [ + { + "name": "links", + "repo": "test:chunk-repo", + "ref": "tarball-links", + "build-depends": [] + } + ] +} +EOF +git add link-stratum.morph +git commit --quiet -m "add morphs" diff --git a/tests.as-root/tarball-image-is-sensible.stdout b/tests.as-root/tarball-image-is-sensible.stdout new file mode 100644 index 0000000..34eb675 --- /dev/null +++ b/tests.as-root/tarball-image-is-sensible.stdout @@ -0,0 +1,18 @@ +./baserock/ +./baserock/hello-stratum.meta +./baserock/hello.meta +./baserock/link-stratum.meta +./baserock/links.meta +./baserock/linux-stratum.meta +./baserock/linux.meta +./bin/ +./bin/hello* +./bin/true +./bin/true-hardlink +./bin/true-symlink@ +./boot/ +./boot/System.map +./boot/vmlinuz +./etc/ +./etc/fstab +./extlinux.conf -- 1.7.5.4