Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-05 16:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop special-casing of ubuntu-core:system-image in places, now that

Browse Source 
ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
This commit is contained in:
Steve Langasek 2016-05-09 16:31:57 -07:00
parent 8b79962b99
commit baf4f47379
2 changed files with 54 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
livecd-rootfs (2.410) UNRELEASED; urgency=medium livecd-rootfs (2.410) UNRELEASED; urgency=medium
* Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion. * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
* Drop special-casing of ubuntu-core:system-image in places, now that
ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 09 May 2016 15:02:22 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 09 May 2016 15:02:22 -0700

116
live-build/auto/config
View File

@ -350,66 +350,60 @@ case $PROJECT in
;; ;;
ubuntu-core) ubuntu-core)
# mvo: This is for cron.daily-preinstalled OPTS="${OPTS:+$OPTS }--apt-recommends false"
# 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"
# some workarounds because the seeds are not quite # some workarounds because the seeds are not quite
# corrent at the moment # corrent at the moment
add_package install dbus add_package install dbus
add_package install isc-dhcp-client add_package install isc-dhcp-client
add_package install libpam-systemd add_package install libpam-systemd
add_package install ppp add_package install ppp
add_package install watchdog add_package install watchdog
# no Task: header yet # no Task: header yet
add_package install snapd add_package install snapd
add_package install ubuntu-core-snapd-units add_package install ubuntu-core-snapd-units
# no minimal as we want to be really minimal # no minimal as we want to be really minimal
#add_task install minimal #add_task install minimal
add_task install ubuntu-core add_task install ubuntu-core
# more packages are pulled in via the seed. # more packages are pulled in via the seed.
# (important to remember when comparing to the # (important to remember when comparing to the
# livecd-rootfs from ppa:snappy-dev/image) # livecd-rootfs from ppa:snappy-dev/image)
case $ARCH in case $ARCH in
i386) i386)
# efi support can go once the task # efi support can go once the task
# header is available for grub-efi-ia32-bin # header is available for grub-efi-ia32-bin
add_package install grub-efi-ia32-bin add_package install grub-efi-ia32-bin
;; ;;
esac esac
# generic kernel etc # generic kernel etc
KERNEL_FLAVOURS=none KERNEL_FLAVOURS=none
case $ARCH in case $ARCH in
i386) i386)
add_package install grub-pc add_package install grub-pc
;; ;;
amd64) amd64)
add_package install grub-pc-bin add_package install grub-pc-bin
add_package install grub-efi-amd64-signed add_package install grub-efi-amd64-signed
add_package install shim-signed add_package install shim-signed
;; ;;
armhf) armhf)
add_package install flash-kernel u-boot-tools add_package install flash-kernel u-boot-tools
;; ;;
arm64) arm64)
add_package install u-boot-tools add_package install u-boot-tools
;; ;;
esac esac
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
# contains the framework definition # contains the framework definition
add_package install ubuntu-core-libs add_package install ubuntu-core-libs
# universe needed for 'system-image-cli' and multiverse for firmware # universe needed for 'system-image-cli' and multiverse for firmware
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;; ;;
@ -561,17 +555,11 @@ case $ARCH in
esac esac
case $PROJECT in case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd) ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
case $SUBPROJECT in OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
system-image) KERNEL_FLAVOURS=none
# keep the kernel for the system-image build BINARY_REMOVE_LINUX=false
;; ;;
*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
;;
esac
esac esac
add_chroot_hook update-apt-file-cache add_chroot_hook update-apt-file-cache