From 164ac67eb48ebe22134caa8e2a5d5e43595287eb Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 20 Nov 2012 16:45:06 +0100 Subject: [PATCH] Import patches-unapplied version 2.102 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: f12aa71a19aad90cb94702f9d6b40da3fba154fe New changelog entries: * create the nexus7 rootfs image with .ext4 as suffix instead of using .img, so debian-cd knows how to handle it --- debian/changelog | 7 +++++++ live-build/auto/build | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12141d59..8b7aa5c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.102) raring; urgency=low + + * create the nexus7 rootfs image with .ext4 as suffix instead of using + .img, so debian-cd knows how to handle it + + -- Oliver Grawert Tue, 20 Nov 2012 16:45:06 +0100 + livecd-rootfs (2.101) raring; urgency=low * instead of mangling the ac100 bootimg for nexus7 support, ship a proper diff --git a/live-build/auto/build b/live-build/auto/build index 053e7b4c..654b1c13 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -384,9 +384,9 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then # roll the android rootfs images mkdir -p userdata mv $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz - make_ext4fs -l 6G -s $PREFIX.img-$FLAVOUR userdata/ + make_ext4fs -l 6G -s $PREFIX.ext4-$FLAVOUR userdata/ mv userdata/rootfs.tar.gz $PREFIX.rootfs.tar.gz - ln -sf "$PREFIX.img-$FLAVOUR" "$PREFIX.img" + ln -sf "$PREFIX.ext4-$FLAVOUR" "$PREFIX.ext4" fi # clean up