mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-22 10:51:11 +00:00
* live-build/auto/config:
- system-image: do not install ubuntu-minimal - system-image: install KERNEL_FLAVOURS=virtual on i386/amd64 - system-image: use "--linux-packages=linux-image"
This commit is contained in:
parent
1bec61e622
commit
8af855c26d
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -1,3 +1,12 @@
|
||||
livecd-rootfs (2.267) UNRELEASED; urgency=low
|
||||
|
||||
* live-build/auto/config:
|
||||
- system-image: do not install ubuntu-minimal
|
||||
- system-image: install KERNEL_FLAVOURS=virtual on i386/amd64
|
||||
- system-image: use "--linux-packages=linux-image"
|
||||
|
||||
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 Nov 2014 08:25:14 +0100
|
||||
|
||||
livecd-rootfs (2.266) vivid; urgency=medium
|
||||
|
||||
* Move the shorts click package to the custom tarball. LP: #1386177.
|
||||
|
@ -335,30 +335,35 @@ case $PROJECT in
|
||||
;;
|
||||
|
||||
ubuntu-core)
|
||||
add_task install minimal
|
||||
# mvo: This is for cron.daily-preinstalled
|
||||
# CDIMAGE_PREINSTALLED is not passed from build.py
|
||||
# and PREINSTALLED means something different. So
|
||||
# we use SUBPROJECT to pass on the information
|
||||
if [ "$SUBPROJECT" = "system-image" ]; then
|
||||
OPTS="${OPTS:+$OPTS }--apt-recommends false"
|
||||
|
||||
# no minimal as we want to be really minimal
|
||||
#add_task install minimal
|
||||
add_task install ubuntu-core
|
||||
|
||||
# some workarounds because the seeds are not quite
|
||||
# corrent at the moment
|
||||
add_package install dbus
|
||||
add_package install libpam-systemd
|
||||
add_package install isc-dhcp-client
|
||||
add_package install resolvconf
|
||||
|
||||
case $ARCH in
|
||||
i386|amd64)
|
||||
add_package install grub-pc
|
||||
KERNEL_FLAVOURS=virtual
|
||||
;;
|
||||
armhf)
|
||||
add_package install flash-kernel u-boot-tools
|
||||
KERNEL_FLAVOURS=generic
|
||||
;;
|
||||
esac
|
||||
|
||||
# generic kernel on amd64/arm for now
|
||||
KERNEL_FLAVOURS=generic
|
||||
OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
|
||||
|
||||
# contains the framework definition
|
||||
add_package install ubuntu-core-libs
|
||||
|
Loading…
x
Reference in New Issue
Block a user