diff --git a/debian/changelog b/debian/changelog index 25631ef6..25ed34dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ livecd-rootfs (2.396) UNRELEASED; urgency=medium + [ Adam Conrad ] * Remove obsolete pvr-omap4 special-casing to simplify configs. + [ Daniel Watkins ] + * Enable building of powerpc cloud images. + -- Adam Conrad Sun, 03 Apr 2016 02:39:50 -0600 livecd-rootfs (2.395) xenial; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index 251db0ad..6783f52a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -470,6 +470,10 @@ case $PROJECT in ppc64el) add_task install server ;; + powerpc) + KERNEL_FLAVOURS=powerpc64-smp + add_task install server + ;; esac OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary index 045add8b..bc0a1777 100755 --- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary +++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary @@ -8,8 +8,8 @@ BOOT_MOUNTPOINT= ROOTPART_START=1 case $ARCH:$SUBARCH in - ppc64el:*) - echo "ppc64el disk images are handled separately" + ppc64el:*|powerpc:*) + echo "POWER disk images are handled separately" exit 0 ;; armhf:raspi2) diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary index 6647c9ec..a4e0b745 100755 --- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary @@ -1,7 +1,11 @@ #!/bin/bash -eux -if [ "$ARCH" != "ppc64el" ]; then - exit 0 -fi +case $ARCH in + ppc64el|powerpc) + ;; + *) + exit 0 + ;; +esac . /build/config/functions diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index 96e54203..61e12cfd 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -177,7 +177,7 @@ case $arch in add_serial_console hvc0 exit 0 ;; - s390x) + powerpc|s390x) exit 0 ;; esac