livecd-rootfs

Merge lp:~daniel-thewatkins/livecd-rootfs/powerpc into lp:livecd-rootfs

  1. powerpc
  2. Merge into trunk
Proposed by Dan Watkins on 2016-04-07
Status: Merged
Merged at revision: 1355
Proposed branch: lp:~daniel-thewatkins/livecd-rootfs/powerpc
Merge into: lp:livecd-rootfs
Diff against target: 77 lines (+18/-6)
5 files modified
debian/changelog (+4/-0)
live-build/auto/config (+4/-0)
live-build/ubuntu-cpc/hooks/032-disk-image.binary (+2/-2)
live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary (+7/-3)
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+1/-1)
To merge this branch: bzr merge lp:~daniel-thewatkins/livecd-rootfs/powerpc
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2016-04-07 Pending
Review via email: mp+291250@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-03 08:41:30 +0000
3+++ debian/changelog 2016-04-07 13:34:52 +0000
4@@ -1,7 +1,11 @@
5 livecd-rootfs (2.396) UNRELEASED; urgency=medium
6
7+ [ Adam Conrad ]
8 * Remove obsolete pvr-omap4 special-casing to simplify configs.
9
10+ [ Daniel Watkins ]
11+ * Enable building of powerpc cloud images.
12+
13 -- Adam Conrad <adconrad@ubuntu.com> Sun, 03 Apr 2016 02:39:50 -0600
14
15 livecd-rootfs (2.395) xenial; urgency=medium
16
17=== modified file 'live-build/auto/config'
18--- live-build/auto/config 2016-04-03 08:41:30 +0000
19+++ live-build/auto/config 2016-04-07 13:34:52 +0000
20@@ -470,6 +470,10 @@
21 ppc64el)
22 add_task install server
23 ;;
24+ powerpc)
25+ KERNEL_FLAVOURS=powerpc64-smp
26+ add_task install server
27+ ;;
28 esac
29 OPTS="${OPTS:+$OPTS }--system=normal"
30 OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
31
32=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
33--- live-build/ubuntu-cpc/hooks/032-disk-image.binary 2016-02-12 17:49:17 +0000
34+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary 2016-04-07 13:34:52 +0000
35@@ -8,8 +8,8 @@
36 ROOTPART_START=1
37
38 case $ARCH:$SUBARCH in
39- ppc64el:*)
40- echo "ppc64el disk images are handled separately"
41+ ppc64el:*|powerpc:*)
42+ echo "POWER disk images are handled separately"
43 exit 0
44 ;;
45 armhf:raspi2)
46
47=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
48--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary 2016-02-06 08:34:16 +0000
49+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary 2016-04-07 13:34:52 +0000
50@@ -1,7 +1,11 @@
51 #!/bin/bash -eux
52-if [ "$ARCH" != "ppc64el" ]; then
53- exit 0
54-fi
55+case $ARCH in
56+ ppc64el|powerpc)
57+ ;;
58+ *)
59+ exit 0
60+ ;;
61+esac
62
63 . /build/config/functions
64
65
66=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
67--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2016-02-14 22:34:21 +0000
68+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2016-04-07 13:34:52 +0000
69@@ -177,7 +177,7 @@
70 add_serial_console hvc0
71 exit 0
72 ;;
73- s390x)
74+ powerpc|s390x)
75 exit 0
76 ;;
77 esac

Subscribers

People subscribed via source and target branches