This is intended to for human consumption, with the full set of metadata in /baserock/system-artifact-name.meta. It currently lists system name, the symbolic ref of the system morphology and build date. --- morphlib/builder2.py | 15 ++++++++++++++- tests.as-root/disk-builds-rootfs-and-kernel.script | 1 + tests.as-root/disk-builds-rootfs-and-kernel.stdout | 3 +++ .../syslinux-disk-builds-rootfs-and-kernel.script | 1 + .../syslinux-disk-builds-rootfs-and-kernel.stdout | 3 +++ tests.as-root/tarball-image-is-sensible.script | 1 + tests.as-root/tarball-image-is-sensible.stdout | 2 ++ 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/morphlib/builder2.py b/morphlib/builder2.py index d376805..0de0ebf 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -14,6 +14,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import datetime import json import logging import os @@ -541,6 +542,18 @@ class SystemKindBuilder(BuilderBase): # pragma: no cover ldconfig(self.app.runcmd, path) + def write_metadata(self, instdir, artifact_name): + BuilderBase.write_metadata(self, instdir, artifact_name) + + os_release_file = os.path.join(instdir, 'etc', 'os-release') + if not os.path.exists(os.path.dirname(os_release_file)): + os.makedirs(os.path.dirname(os_release_file)) + with morphlib.savefile.SaveFile(os_release_file, 'w') as f: + f.write('Baserock %s, built from ref %s on %s\n' % + (self.artifact.source.morphology['name'], + self.artifact.source.original_ref, + datetime.date.today())) + def create_fstab(self, path): '''Create an /etc/fstab inside a system tree. @@ -615,7 +628,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover system_kind, self.args, self.kwargs) logging.debug('Building system with %s' % repr(builder)) self.app.status(msg='Building system %(system_name)s', - system_name=self.artifact.name) + system_name=self.artifact.source.morphology['name']) return builder.build_and_cache() diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script index 3b9174c..0b3207e 100755 --- a/tests.as-root/disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/disk-builds-rootfs-and-kernel.script @@ -105,5 +105,6 @@ trap 'cd /; umount -d "$device"' INT TERM ERR cd "$DATADIR/mnt" find | LC_ALL=C sort -u +sed -e 's/ on [0-9\-]\+//' "$DATADIR/mnt/factory-run/etc/os-release" cd "$DATADIR" umount -d "$device" diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.stdout b/tests.as-root/disk-builds-rootfs-and-kernel.stdout index 929f284..7600c16 100644 --- a/tests.as-root/disk-builds-rootfs-and-kernel.stdout +++ b/tests.as-root/disk-builds-rootfs-and-kernel.stdout @@ -16,6 +16,7 @@ ./factory-run/boot/vmlinuz ./factory-run/etc ./factory-run/etc/fstab +./factory-run/etc/os-release ./factory/baserock ./factory/baserock/hello.meta ./factory/baserock/linux.meta @@ -28,3 +29,5 @@ ./factory/boot/vmlinuz ./factory/etc ./factory/etc/fstab +./factory/etc/os-release +Baserock system, built from ref custom 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 746ca3c..ffe6c1c 100755 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script @@ -113,5 +113,6 @@ trap 'cd /; umount -d "$device"' INT TERM ERR cd "$DATADIR/mnt" find | LC_ALL=C sort -u +sed -e 's/ on [0-9\-]\+//' "$DATADIR/mnt/factory-run/etc/os-release" cd "$DATADIR" umount -d "$device" diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout index 1b64387..c5fe466 100644 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout @@ -17,6 +17,7 @@ ./factory-run/boot/vmlinuz ./factory-run/etc ./factory-run/etc/fstab +./factory-run/etc/os-release ./factory-run/extlinux.conf ./factory/baserock ./factory/baserock/hello.meta @@ -30,4 +31,6 @@ ./factory/boot/vmlinuz ./factory/etc ./factory/etc/fstab +./factory/etc/os-release ./factory/extlinux.conf +Baserock system, built from ref custom diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 6e4af67..056cc68 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -34,3 +34,4 @@ mkdir -p "$extracted" cd "$extracted" tar -xf "$tar" find . -mindepth 1 | xargs ls -dF | LC_ALL=C sort -u +sed -e 's/ on [0-9\-]\+//' "$extracted/etc/os-release" diff --git a/tests.as-root/tarball-image-is-sensible.stdout b/tests.as-root/tarball-image-is-sensible.stdout index 46a9409..4bc5e6f 100644 --- a/tests.as-root/tarball-image-is-sensible.stdout +++ b/tests.as-root/tarball-image-is-sensible.stdout @@ -16,4 +16,6 @@ ./boot/vmlinuz ./etc/ ./etc/fstab +./etc/os-release ./extlinux.conf +Baserock hello-tarball, built from ref tarball-links -- 1.7.10.4

On Fri, Oct 26, 2012 at 03:41:00PM +0100, Richard Maw wrote: Merged and pushed.