Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 13:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.208 to ubuntu/trusty-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 0ae537f96e10219baf325cdafdf7c8e405535085

New changelog entries:
  * Adding support for ubuntu-touch i386 based images
This commit is contained in:
Ricardo Salveti de Araujo 2014-03-28 19:00:25 -03:00 committed by usd-importer
parent 0ae537f96e
commit d0fa866363
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.208) trusty; urgency=medium
* Adding support for ubuntu-touch i386 based images
-- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Fri, 28 Mar 2014 19:00:25 -0300
livecd-rootfs (2.207) trusty; urgency=medium livecd-rootfs (2.207) trusty; urgency=medium
* touch/80-enable-libhybris.chroot: making libhybris the default alternatives * touch/80-enable-libhybris.chroot: making libhybris the default alternatives

46
live-build/auto/build
View File

@ -409,9 +409,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
fi fi
if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then if [ "$PROJECT" = "ubuntu-touch" ]; then
touchsubarches="flo manta grouper mako generic"
sourceslist="chroot/etc/apt/sources.list" sourceslist="chroot/etc/apt/sources.list"
lb chroot_proc install "$@" lb chroot_proc install "$@"
@ -437,20 +435,36 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
Chroot chroot "apt-get -y update" Chroot chroot "apt-get -y update"
Chroot chroot "apt-get -y install android" Chroot chroot "apt-get -y install android"
for subarch in $touchsubarches; do if [ "$ARCH" = "armhf" ]; then
cp chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\ touchsubarches="flo manta grouper mako generic"
"${PREFIX}.system-armel+${subarch}.img" for subarch in $touchsubarches; do
cp chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\ cp chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\
"${PREFIX}.recovery-armel+${subarch}.img" "${PREFIX}.system-armel+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\ cp chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\
"${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.recovery-armel+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img cp chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\
cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" "${PREFIX}.boot-armhf+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img
cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
# goldfish does not ship a .zip file, do not fail if it does not exist # Android 4.4.2 based images don't ship a .zip file, do not fail if it does not exist
cp chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\ cp chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\
"${PREFIX}.armel+${subarch}.zip" || true "${PREFIX}.armel+${subarch}.zip" || true
done done
fi
if [ "$ARCH" = "i386" ]; then
touchsubarches="generic_x86"
for subarch in $touchsubarches; do
cp chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\
"${PREFIX}.system-i386+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\
"${PREFIX}.recovery-i386+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\
"${PREFIX}.boot-i386+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img
cp "${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
done
fi
lb chroot_devpts remove "$@" lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@" lb chroot_sysfs remove "$@"