Ubuntu CD Images

Merge lp:~mvo/ubuntu-cdimage/system-image into lp:ubuntu-cdimage

  1. system-image
  2. Merge into mainline
Proposed by Michael Vogt
Status: Rejected
Rejected by: Steve Langasek
Proposed branch: lp:~mvo/ubuntu-cdimage/system-image
Merge into: lp:ubuntu-cdimage
Diff against target: 86 lines (+13/-6)
6 files modified
etc/config (+1/-1)
etc/crontab (+3/-0)
etc/default-arches (+2/-0)
lib/cdimage/build.py (+2/-2)
lib/cdimage/livefs.py (+4/-2)
lib/cdimage/tree.py (+1/-1)
To merge this branch: bzr merge lp:~mvo/ubuntu-cdimage/system-image
Reviewer Review Type Date Requested Status
Steve Langasek (community) Disapprove
Review via email: mp+227801@code.launchpad.net

Description of the change

This branch adds ubuntu-system-image to the image generation.

The branch is mostly based on cargo-culting what ubuntu-gnome is doing to get a image and I'm not sure yet how I can test it locally. Once I learn about that I will expand the README to explain the steps needed to add a new image type. Any guidance about this branch and about local testing is very welcome.

Thanks,
 Michael

To post a comment you must log in.
lp:~mvo/ubuntu-cdimage/system-image updated
1435. By Michael Vogt

lib/cdimage/build.py: use subprocess.check_call() to get error checking from rsync

1436. By Michael Vogt

use ubuntu-core instead of ubuntu-system-image and use cron.daily-preinstalled to create a new image type

1437. By Michael Vogt

bin/daily-checks: remove ubuntu-core for now until its clear if we need it here

Revision history for this message
Steve Langasek (vorlon) wrote :

Superseded by events

review: Disapprove

Unmerged revisions

1437. By Michael Vogt

bin/daily-checks: remove ubuntu-core for now until its clear if we need it here

1436. By Michael Vogt

use ubuntu-core instead of ubuntu-system-image and use cron.daily-preinstalled to create a new image type

1435. By Michael Vogt

lib/cdimage/build.py: use subprocess.check_call() to get error checking from rsync

1434. By Michael Vogt

add ubuntu-system-image

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/config'
2--- etc/config 2014-06-24 15:52:31 +0000
3+++ etc/config 2014-07-23 09:59:27 +0000
4@@ -36,7 +36,7 @@
5 # All projects currently being built. This is used for building source
6 # images. Note that we only need to include projects with their own seed
7 # collections, so not ubuntu-server.
8-ALL_PROJECTS="${ALL_PROJECTS:-ubuntu ubuntu-desktop-next kubuntu kubuntu-active edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin}"
9+ALL_PROJECTS="${ALL_PROJECTS:-ubuntu ubuntu-desktop-next kubuntu kubuntu-active edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-core}"
10
11 GNUPG_DIR="$CDIMAGE_ROOT/secret/dot-gnupg"
12 SIGNING_KEYID=FBB75451
13
14=== modified file 'etc/crontab'
15--- etc/crontab 2014-06-23 10:59:45 +0000
16+++ etc/crontab 2014-07-23 09:59:27 +0000
17@@ -55,4 +55,7 @@
18 # Also built on demand by touch release team.
19 02 2 * * * for-project ubuntu-touch cron.daily-preinstalled --live
20
21+# and preinstalled ubuntu core
22+14 16 * * * for-project ubuntu-core cron.daily-preinstalled --live
23+
24 */15 * * * * mirror-image-build-logs
25
26=== modified file 'etc/default-arches'
27--- etc/default-arches 2014-07-22 16:48:32 +0000
28+++ etc/default-arches 2014-07-23 09:59:27 +0000
29@@ -22,6 +22,8 @@
30 ubuntu-core daily quantal-raring amd64 armhf i386 powerpc
31 ubuntu-core daily saucy amd64 arm64 armhf i386 powerpc
32 ubuntu-core daily trusty- amd64 arm64 armhf i386 powerpc ppc64el
33+ubuntu-core daily-preinstalled utopic- amd64
34+
35 * livecd-base oneiric- amd64 i386 powerpc
36
37 jeos * * i386
38
39=== modified file 'lib/cdimage/build.py'
40--- lib/cdimage/build.py 2014-07-17 17:12:16 +0000
41+++ lib/cdimage/build.py 2014-07-23 09:59:27 +0000
42@@ -199,7 +199,7 @@
43 exclude = env.get("RSYNC_EXCLUDE", "").split()
44 source_target = ["%s/" % env["RSYNC_SRC"], "%s/" % target]
45
46- subprocess.call(
47+ subprocess.check_call(
48 command_base + [
49 "--exclude", "Packages*", "--exclude", "Sources*",
50 "--exclude", "Release*", "--exclude", "InRelease",
51@@ -207,7 +207,7 @@
52 stdout=log, stderr=subprocess.STDOUT, env=env)
53
54 # Second pass to update metadata and clean up old files.
55- subprocess.call(
56+ subprocess.check_call(
57 command_base + [
58 "--delay-updates", "--delete", "--delete-after",
59 ] + exclude + source_target,
60
61=== modified file 'lib/cdimage/livefs.py'
62--- lib/cdimage/livefs.py 2014-07-22 21:54:18 +0000
63+++ lib/cdimage/livefs.py 2014-07-23 09:59:27 +0000
64@@ -858,8 +858,10 @@
65 got_image = True
66 else:
67 continue
68- if (series >= "dapper" and project != "ubuntu-core" and
69- not config["CDIMAGE_SQUASHFS_BASE"] and
70+ if (series >= "dapper" and
71+ (project != "ubuntu-core" or
72+ config.image_type == "daily-preinstalled") and
73+ not config["CDIMAGE_SQUASHFS_BASE"] and
74 config.subproject != "wubi"):
75 download_live_items(config, arch, "kernel")
76 download_live_items(config, arch, "initrd")
77
78=== modified file 'lib/cdimage/tree.py'
79--- lib/cdimage/tree.py 2014-07-17 17:12:16 +0000
80+++ lib/cdimage/tree.py 2014-07-23 09:59:27 +0000
81@@ -1,4 +1,4 @@
82-# -*- coding: UTF-8 -*-
83+# -*- coding: utf-8 -*-
84
85 # Copyright (C) 2012, 2013 Canonical Ltd.
86 # Author: Colin Watson <cjwatson@ubuntu.com>

Subscribers

People subscribed via source and target branches