mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-09 09:02:11 +00:00
Refactor/reorder ubuntu-cpc support for consistency with other flavors,
so that subarch overrides can be applied correctly.
This commit is contained in:
parent
9e06b90ead
commit
4f55631a9f
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -9,6 +9,10 @@ livecd-rootfs (2.374) UNRELEASED; urgency=medium
|
|||||||
* ubuntu-cpc:
|
* ubuntu-cpc:
|
||||||
- exclude s390x from should_install_grub
|
- exclude s390x from should_install_grub
|
||||||
|
|
||||||
|
[ Steve Langasek ]
|
||||||
|
* Refactor/reorder ubuntu-cpc support for consistency with other flavors,
|
||||||
|
so that subarch overrides can be applied correctly.
|
||||||
|
|
||||||
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Jan 2016 18:27:23 +0100
|
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Jan 2016 18:27:23 +0100
|
||||||
|
|
||||||
livecd-rootfs (2.373) xenial; urgency=medium
|
livecd-rootfs (2.373) xenial; urgency=medium
|
||||||
|
@ -470,6 +470,31 @@ case $PROJECT in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu-cpc)
|
ubuntu-cpc)
|
||||||
|
add_task install minimal standard cloud-image
|
||||||
|
add_package install ubuntu-minimal
|
||||||
|
|
||||||
|
BINARY_REMOVE_LINUX=false
|
||||||
|
OPTS="${OPTS:+$OPTS }--initramfs=none"
|
||||||
|
KERNEL_FLAVOURS=virtual
|
||||||
|
case $ARCH in
|
||||||
|
armhf)
|
||||||
|
KERNEL_FLAVOURS=generic-lpae
|
||||||
|
add_package install flash-kernel
|
||||||
|
add_task install server
|
||||||
|
;;
|
||||||
|
arm64)
|
||||||
|
KERNEL_FLAVOURS=generic
|
||||||
|
add_package install flash-kernel
|
||||||
|
add_task install server
|
||||||
|
;;
|
||||||
|
ppc64el)
|
||||||
|
add_task install server
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
OPTS="${OPTS:+$OPTS }--system=normal"
|
||||||
|
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
|
||||||
|
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
|
||||||
|
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
@ -555,33 +580,6 @@ case $PROJECT in
|
|||||||
esac
|
esac
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "$PROJECT" = "ubuntu-cpc" ]; then
|
|
||||||
BINARY_REMOVE_LINUX=false
|
|
||||||
OPTS="${OPTS:+$OPTS }--initramfs=none"
|
|
||||||
KERNEL_FLAVOURS=virtual
|
|
||||||
case $ARCH in
|
|
||||||
armhf)
|
|
||||||
KERNEL_FLAVOURS=generic-lpae
|
|
||||||
add_package install flash-kernel
|
|
||||||
add_task install server
|
|
||||||
;;
|
|
||||||
arm64)
|
|
||||||
KERNEL_FLAVOURS=generic
|
|
||||||
add_package install flash-kernel
|
|
||||||
add_task install server
|
|
||||||
;;
|
|
||||||
ppc64el)
|
|
||||||
add_task install server
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
OPTS="${OPTS:+$OPTS }--system=normal"
|
|
||||||
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
|
|
||||||
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
|
|
||||||
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
|
|
||||||
add_task install minimal standard cloud-image
|
|
||||||
add_package install ubuntu-minimal
|
|
||||||
fi
|
|
||||||
|
|
||||||
add_chroot_hook update-apt-file-cache
|
add_chroot_hook update-apt-file-cache
|
||||||
add_chroot_hook update-apt-xapian-index
|
add_chroot_hook update-apt-xapian-index
|
||||||
add_chroot_hook update-mlocate-database
|
add_chroot_hook update-mlocate-database
|
||||||
|
Loading…
x
Reference in New Issue
Block a user