Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 19:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.96 to ubuntu/raring-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: ff441d12fb6e881aea43b7e8ff5ada20bab6c949

New changelog entries:
  * add nexus7 specific kernel cmdline
  * move the nexus7 processing up a bit in the code so we can modify the
    bootimg cmdline before the file gets copied around
This commit is contained in:
Oliver Grawert 2012-11-14 13:28:50 +01:00 committed by usd-importer
parent ff441d12fb
commit 1d42aa78bb
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.96) raring; urgency=low
* add nexus7 specific kernel cmdline
* move the nexus7 processing up a bit in the code so we can modify the
bootimg cmdline before the file gets copied around
-- Oliver Grawert <ogra@ubuntu.com> Wed, 14 Nov 2012 13:28:50 +0100
livecd-rootfs (2.95) raring; urgency=low livecd-rootfs (2.95) raring; urgency=low
* make the dependency on android-tools-fsutils not arch specific, seems * make the dependency on android-tools-fsutils not arch specific, seems

18
live-build/auto/build
View File

@ -376,6 +376,17 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
# create boot.img # create boot.img
Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}" Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"
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"'
# roll the android rootfs images
mkdir userdata
cp $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
make_ext4fs -l 6G -s $PREFIX.img-$FLAVOUR userdata/
ln -sf "$PREFIX.img-$FLAVOUR" "$PREFIX.img"
fi
# clean up # clean up
lb chroot_devpts remove "$@" lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@" lb chroot_sysfs remove "$@"
@ -384,13 +395,6 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR" cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR"
ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg" ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg"
if [ "$SUBARCH" = "nexus7" ]; then
# roll the android rootfs images
mkdir userdata
cp $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
make_ext4fs -l 6G -s $PREFIX.img-$FLAVOUR userdata/
ln -sf "$PREFIX.img-$FLAVOUR" "$PREFIX.img"
fi
fi fi
# LTSP chroot building (only in 32bit and for Edubuntu (DVD)) # LTSP chroot building (only in 32bit and for Edubuntu (DVD))