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

Import patches-unapplied version 2.294 to ubuntu/vivid-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 74b7fad340f8ad299332c40365542f97c375c75a

New changelog entries:
  * add more verbosity to the copy command for android fragments in
    ubuntu-touch
This commit is contained in:
Oliver Grawert 2015-03-13 11:10:33 +01:00 committed by usd-importer
parent 74b7fad340
commit 79e9de67c4
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.294) vivid; urgency=medium
* add more verbosity to the copy command for android fragments in
ubuntu-touch
-- Oliver Grawert <ogra@ubuntu.com> Fri, 13 Mar 2015 11:10:33 +0100
livecd-rootfs (2.293) vivid; urgency=low livecd-rootfs (2.293) vivid; urgency=low
[ Michael Vogt ] [ Michael Vogt ]

20
live-build/auto/build
View File

@ -448,31 +448,31 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then
if [ "$ARCH" = "armhf" ]; then if [ "$ARCH" = "armhf" ]; then
touchsubarches="flo manta grouper mako generic" touchsubarches="flo manta grouper mako generic"
for subarch in $touchsubarches; do for subarch in $touchsubarches; do
cp chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\ cp -v chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\
"${PREFIX}.system-armel+${subarch}.img" "${PREFIX}.system-armel+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\ cp -v chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\
"${PREFIX}.recovery-armel+${subarch}.img" "${PREFIX}.recovery-armel+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\ cp -v chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\
"${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 -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
# Android 4.4.2 based images don't ship a .zip file, do not fail if it does not exist # Android 4.4.2 based images do 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 -v chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\
"${PREFIX}.armel+${subarch}.zip" || true "${PREFIX}.armel+${subarch}.zip" || true
done done
fi fi
if [ "$ARCH" = "i386" ]; then if [ "$ARCH" = "i386" ]; then
touchsubarches="generic_x86" touchsubarches="generic_x86"
for subarch in $touchsubarches; do for subarch in $touchsubarches; do
cp chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\ cp -v chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\
"${PREFIX}.system-i386+${subarch}.img" "${PREFIX}.system-i386+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\ cp -v chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\
"${PREFIX}.recovery-i386+${subarch}.img" "${PREFIX}.recovery-i386+${subarch}.img"
cp chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\ cp -v chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\
"${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.boot-i386+${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-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}" cp -v "${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
done done
fi fi