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

Import patches-unapplied version 2.489 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: c582c0e6377b083ad1bfb1a85410fb447dc96d86

New changelog entries:
  [ Balint Reczey ]
  * Revert to building minimized and not minimimized images with the same
    ~2.2 GiB size
  * Stop suggesting partimage which is not used anymore
  * Drop Nexus 7 support
  [ Steve Langasek ]
  * Add support for passing snap channel to ubuntu-core image builds.
This commit is contained in:
Steve Langasek 2018-01-12 15:04:42 -08:00 committed by usd-importer
parent c582c0e637
commit bdda0b17ea
4 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
livecd-rootfs (2.489) bionic; urgency=medium
[ Balint Reczey ]
* Revert to building minimized and not minimimized images with the same
~2.2 GiB size
* Stop suggesting partimage which is not used anymore
* Drop Nexus 7 support
[ Steve Langasek ]
* Add support for passing snap channel to ubuntu-core image builds.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 12 Jan 2018 15:04:42 -0800
livecd-rootfs (2.488) bionic; urgency=medium
* Enable systemd-networkd by default for live-server installs.

1
debian/control vendored
View File

@ -35,7 +35,6 @@ Depends: ${misc:Depends},
vmdk-stream-converter [amd64 i386],
xz-utils,
zerofree
Suggests: partimage
Breaks: ubuntu-defaults-builder (<< 0.32)
Description: construction script for the livecd rootfs
livecd-rootfs provides the script used to create the root filesystem

15
live-build/auto/build
View File

@ -21,8 +21,9 @@ PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build
CHANNEL="${CHANNEL:-edge}"
env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
ubuntu-image -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \
-o "$PREFIX".img "$PREFIX".model-assertion
xz -0 -T4 "$PREFIX".img
mv seed.manifest "$PREFIX".manifest
@ -835,7 +836,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
fi
fi
if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
if [ "$SUBARCH" = "ac100" ]; then
# create the md5sum and size files for which we are actually doing all this
md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size
@ -856,16 +857,6 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
# create boot.img
Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"
if [ "$SUBARCH" = "nexus7" ]; then
# roll the android rootfs images
mkdir -p userdata
mv $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
apt-get -y install android-tools-fsutils
make_ext4fs -l 6G -s $PREFIX.ext4-$FLAVOUR userdata/
mv userdata/rootfs.tar.gz $PREFIX.rootfs.tar.gz
ln -sf "$PREFIX.ext4-$FLAVOUR" "$PREFIX.ext4"
fi
# clean up
lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@"

15
live-build/auto/config
View File

@ -642,16 +642,6 @@ case $ARCH in
add_package live ac100-tarball-installer
BINARY_REMOVE_LINUX=false
;;
nexus7)
COMPONENTS='main restricted universe multiverse'
add_package install zram-config abootimg
add_package install nvidia-tegra3 ubuntu-defaults-nexus7
add_package live ac100-tarball-installer
BINARY_REMOVE_LINUX=false
mkdir -p config/preseed
echo "linux-firmware-nexus7 shared/nexus7_notice_accepted boolean true" >config/preseed/linux-firmware-nexus7.preseed.chroot
echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot
;;
raspi2)
COMPONENTS='main restricted universe multiverse'
add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools
@ -717,11 +707,6 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
if [ "${SUBPROJECT:-}" = minimized ]; then
# try building minimized images in a 1GiB image but still allow overriding
# IMAGE_SIZE in lb build
echo 'IMAGE_SIZE=${IMAGE_SIZE:-'$((1024*1024*1024))'}' >> config/binary
fi
case $ARCH+$SUBARCH in
armhf+raspi2)