=== modified file 'bin/find-live-filesystem'
--- bin/find-live-filesystem 2014-10-10 10:38:37 +0000
+++ bin/find-live-filesystem 2014-11-12 06:57:20 +0000
@@ -33,7 +33,7 @@
"%prog ARCH cloop|squashfs|kernel|kernel-efi-signed|initrd|bootimg|"
"manifest|manifest-desktop|manifest-remove|"
"size|winfoss|wubi|umenu|usb-creator|ltsp-squashfs|"
- "ext2|ext3|ext4|rootfs.tar.gz|custom.tar.gz|tar.xz|iso")
+ "ext2|ext3|ext4|rootfs.tar.gz|custom.tar.gz|device.tar.gz|tar.xz|iso")
_, args = parser.parse_args()
if len(args) < 2:
parser.error("need architecture and item")
=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py 2014-10-10 10:52:42 +0000
+++ lib/cdimage/build.py 2014-11-13 07:16:42 +0000
@@ -494,6 +494,11 @@
if os.path.exists(custom):
shutil.copy2(
custom, "%s.custom.tar.gz" % output_prefix)
+ if config.project == "ubuntu-core":
+ device = "%s.device.tar.gz" % live_prefix
+ if os.path.exists(device):
+ shutil.copy2(
+ device, "%s.device.tar.gz" % output_prefix)
def _debootstrap_script(config):
=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py 2014-10-10 10:46:16 +0000
+++ lib/cdimage/livefs.py 2014-11-13 07:16:42 +0000
@@ -626,7 +626,7 @@
if item in (
"cloop", "squashfs", "manifest", "manifest-desktop", "manifest-remove",
"size", "ext2", "ext3", "ext4", "rootfs.tar.gz", "custom.tar.gz",
- "tar.xz", "iso",
+ "device.tar.gz", "tar.xz", "iso",
):
if project == "tocd3":
# auto-purged - reverting to plan B
@@ -947,6 +947,10 @@
)
download_live_items(config, arch, "custom.tar.gz")
+ if config.project == "ubuntu-core":
+ for arch in config.arches:
+ download_live_items(config, arch, "device.tar.gz")
+
if (project == "edubuntu" and config["CDIMAGE_INSTALL"] and
series <= "hardy"):
for cpuarch in config.cpuarches:
=== modified file 'lib/cdimage/tests/test_livefs.py'
--- lib/cdimage/tests/test_livefs.py 2014-10-10 10:42:09 +0000
+++ lib/cdimage/tests/test_livefs.py 2014-11-12 06:57:20 +0000
@@ -983,7 +983,7 @@
for item in (
"cloop", "squashfs", "manifest", "manifest-desktop",
"manifest-remove", "size", "ext2", "ext3", "ext4", "rootfs.tar.gz",
- "custom.tar.gz", "tar.xz", "iso",
+ "custom.tar.gz", "tar.xz", "iso", "device.tar.gz",
):
self.assertPathsEqual(
["http://kapok.buildd/~buildd/LiveCD/precise/kubuntu/"
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py 2014-10-30 11:30:48 +0000
+++ lib/cdimage/tree.py 2014-11-12 06:57:20 +0000
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
# Copyright (C) 2012, 2013 Canonical Ltd.
# Author: Colin Watson <cjwatson@ubuntu.com>
@@ -1901,6 +1901,12 @@
"%s.custom.tar.gz" % source_prefix,
"%s.custom.tar.gz" % target_prefix)
+ if os.path.exists("%s.device.tar.gz" % source_prefix):
+ logger.info("Publishing %s device tarball ..." % arch)
+ shutil.move(
+ "%s.device.tar.gz" % source_prefix,
+ "%s.device.tar.gz" % target_prefix)
+
# zsync metafiles
if osextras.find_on_path("zsyncmake"):
logger.info("Making %s zsync metafile ..." % arch)
@@ -2933,7 +2939,7 @@
# Copy, to make sure we have a canonical version of this.
artifacts = ["iso", "list", "img", "img.gz", "tar.gz", "img.tar.gz",
- "tar.xz", "bootimg", "custom.tar.gz"]
+ "tar.xz", "bootimg", "custom.tar.gz", "device.tar.gz"]
for ext in artifacts:
if not os.path.exists(daily(ext)):
continue