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

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: b86f4a8d4a1225f2e343f95ea129c60bed2e114d

New changelog entries:
  * add support for copying goldfish android images out of the android package
This commit is contained in:
Oliver Grawert 2013-11-27 12:22:07 +01:00 committed by usd-importer
parent b86f4a8d4a
commit 7e480206fa
2 changed files with 10 additions and 2 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.201) trusty; urgency=low
* add support for copying goldfish android images out of the android package
-- Oliver Grawert <ogra@ubuntu.com> Wed, 27 Nov 2013 12:22:07 +0100
livecd-rootfs (2.200) trusty; urgency=low livecd-rootfs (2.200) trusty; urgency=low
* use proper quoting for egrep call in click installer * use proper quoting for egrep call in click installer

6
live-build/auto/build
View File

@ -410,7 +410,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
fi fi
if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
touchsubarches="maguro manta grouper mako" touchsubarches="maguro manta grouper mako goldfish"
sourceslist="chroot/etc/apt/sources.list" sourceslist="chroot/etc/apt/sources.list"
@ -446,8 +446,10 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
"${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.boot-armhf+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img # drop this following line once cdimage can handle -boot-*.img
cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
# goldfish does not 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" "${PREFIX}.armel+${subarch}.zip" || true
done done
lb chroot_devpts remove "$@" lb chroot_devpts remove "$@"