From 510f16b757b673d8bde094ae562976bc05d96a67 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 5 Jan 2018 01:52:00 +0100 Subject: [PATCH 1/3] Stop suggesting partimage which is not used anymore --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 65dd4cf7..c66d3901 100644 --- a/debian/control +++ b/debian/control @@ -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 From df89bff043ef4e57202086910fb6875edc461ebd Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Sat, 6 Jan 2018 01:26:42 +0100 Subject: [PATCH 2/3] Drop Nexus 7 support --- live-build/auto/build | 12 +----------- live-build/auto/config | 10 ---------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index 89e67875..aa447bdd 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -835,7 +835,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 +856,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 "$@" diff --git a/live-build/auto/config b/live-build/auto/config index 1faf049b..9abaaa65 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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 From c499490e55498c368cbc1fde5f01621daee3377e Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Sat, 6 Jan 2018 23:49:44 +0100 Subject: [PATCH 3/3] Update changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c2afb8bf..e422424e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ livecd-rootfs (2.489) UNRELEASED; urgency=medium * 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 - -- Balint Reczey Thu, 04 Jan 2018 14:37:51 +0100 + -- Balint Reczey Sat, 06 Jan 2018 23:49:15 +0100 livecd-rootfs (2.488) bionic; urgency=medium