Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-22 02:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.314 to ubuntu/wily-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: eab885e33674c2a0740c9f1b660190ba7109dc9f

New changelog entries:
  [ Iain Lane ]
  * Small whitespace cleanup in live-build/auto/config
  [ Sebastien Bacher ]
  * Set kernel flavours variable to try to fix amd64 build
This commit is contained in:
Sebastien Bacher 2015-06-10 15:10:03 +02:00 committed by usd-importer
parent eab885e336
commit c9f12e25b1
2 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.314) wily; urgency=medium
[ Iain Lane ]
* Small whitespace cleanup in live-build/auto/config
[ Sebastien Bacher ]
* Set kernel flavours variable to try to fix amd64 build
-- Sebastien Bacher <seb128@ubuntu.com> Wed, 10 Jun 2015 15:10:03 +0200
livecd-rootfs (2.313) wily; urgency=medium
* Revert symlink changes, that creates build issues, copy updated hook

75
live-build/auto/config
View File

@ -207,6 +207,7 @@ case $PROJECT in
add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs
COMPONENTS='main restricted universe'
LIVE_TASK='ubuntu-touch-live'
KERNEL_FLAVOURS=generic
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
@ -371,48 +372,48 @@ case $PROJECT in
# 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"
OPTS="${OPTS:+$OPTS }--apt-recommends false"
# some workarounds because the seeds are not quite
# corrent at the moment
add_package install dbus
add_package install isc-dhcp-client
add_package install libpam-systemd
# no Task: header yet
add_package install ubuntu-snappy
# no minimal as we want to be really minimal
#add_task install minimal
# some workarounds because the seeds are not quite
# corrent at the moment
add_package install dbus
add_package install isc-dhcp-client
add_package install libpam-systemd
# no Task: header yet
add_package install ubuntu-snappy
# no minimal as we want to be really minimal
#add_task install minimal
add_task install ubuntu-core
# add special azure package
case $ARCH in
amd64)
# will be removed later when the azure
# specific device tarfile is created
add_package install walinuxagent
;;
i386)
# efi support can go once the task
# header is available for grub-efi-ia32-bin
add_package install grub-efi-ia32-bin
;;
esac
# add special azure package
case $ARCH in
amd64)
# will be removed later when the azure
# specific device tarfile is created
add_package install walinuxagent
;;
i386)
# efi support can go once the task
# header is available for grub-efi-ia32-bin
add_package install grub-efi-ia32-bin
;;
esac
# generic kernel etc
KERNEL_FLAVOURS=generic
case $ARCH in
i386|amd64)
add_package install grub-pc
;;
armhf)
add_package install flash-kernel u-boot-tools
;;
esac
OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
# generic kernel etc
KERNEL_FLAVOURS=generic
case $ARCH in
i386|amd64)
add_package install grub-pc
;;
armhf)
add_package install flash-kernel u-boot-tools
;;
esac
OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
# contains the framework definition
add_package install ubuntu-core-libs
# contains the framework definition
add_package install ubuntu-core-libs
# universe needed for 'system-image-cli'
COMPONENTS='main restricted universe'