From f12aa71a19aad90cb94702f9d6b40da3fba154fe Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 20 Nov 2012 12:37:33 +0100 Subject: [PATCH] Import patches-unapplied version 2.101 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 0392f3aa208d555d93ec47bacc5aa8c13562407b New changelog entries: * instead of mangling the ac100 bootimg for nexus7 support, ship a proper config in ac100-tarball-installer and build the nexus7 one from scratch as well. --- debian/changelog | 8 ++++++++ live-build/auto/build | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 88d7da19..12141d59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.101) raring; urgency=low + + * instead of mangling the ac100 bootimg for nexus7 support, ship a proper + config in ac100-tarball-installer and build the nexus7 one from scratch + as well. + + -- Oliver Grawert Tue, 20 Nov 2012 12:37:33 +0100 + livecd-rootfs (2.100) raring; urgency=low * clean up the userdata dir diff --git a/live-build/auto/build b/live-build/auto/build index 825b8a68..053e7b4c 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -378,7 +378,8 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then if [ "$SUBARCH" = "nexus7" ]; then # adjust the bootimg cmdline parameters - Chroot chroot "abootimg -u /boot/installer-${KVERS}.img -c 'cmdline=root=/dev/mmcblk0p9 ro console=tty1 fbcon=rotate:1 quiet splash'" + rm -rf /boot/installer-${KVERS}.img + Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-nexus7 -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}" # roll the android rootfs images mkdir -p userdata