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

Merge lp:~rbalint/livecd-rootfs/drop-nexus7-support

Browse Source
This commit is contained in:
Balint Reczey 2018-01-09 01:29:01 +01:00
commit d3e460d399
4 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -2,8 +2,10 @@ livecd-rootfs (2.489) UNRELEASED; urgency=medium
* Revert to building minimized and not minimimized images with the same * Revert to building minimized and not minimimized images with the same
~2.2 GiB size ~2.2 GiB size
* Stop suggesting partimage which is not used anymore
* Drop Nexus 7 support
-- Balint Reczey <rbalint@ubuntu.com> Thu, 04 Jan 2018 14:37:51 +0100 -- Balint Reczey <rbalint@ubuntu.com> Sat, 06 Jan 2018 23:49:15 +0100
livecd-rootfs (2.488) bionic; urgency=medium livecd-rootfs (2.488) bionic; urgency=medium

1
debian/control vendored
View File

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

12
live-build/auto/build
View File

@ -835,7 +835,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
fi fi
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 # create the md5sum and size files for which we are actually doing all this
md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5 md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size
@ -856,16 +856,6 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
# create boot.img # 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}" 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 # clean up
lb chroot_devpts remove "$@" lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@" lb chroot_sysfs remove "$@"

10
live-build/auto/config
View File

@ -642,16 +642,6 @@ case $ARCH in
add_package live ac100-tarball-installer add_package live ac100-tarball-installer
BINARY_REMOVE_LINUX=false 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) raspi2)
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools