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

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 6ab1ece7b0fdce9e27ae8da448463b7a3ab4b6f2

New changelog entries:
  * Double-quotes prevented the previous change from working, so drop those.
    Additionally remove an hardcoded occurence of "saucy", instead using
    LB_DISTRIBUTION to avoid having to change that in the future.
This commit is contained in:
Stéphane Graber 2013-10-20 23:17:57 -04:00 committed by usd-importer
parent 6ab1ece7b0
commit 7d39f42e93
3 changed files with 14 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.198) trusty; urgency=low
* Double-quotes prevented the previous change from working, so drop those.
Additionally remove an hardcoded occurence of "saucy", instead using
LB_DISTRIBUTION to avoid having to change that in the future.
-- Stéphane Graber <stgraber@ubuntu.com> Sun, 20 Oct 2013 23:17:57 -0400
livecd-rootfs (2.197) trusty; urgency=low livecd-rootfs (2.197) trusty; urgency=low
* Workaround to make ubuntu-touch build with older android package. * Workaround to make ubuntu-touch build with older android package.

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: devel
Priority: optional Priority: optional
Build-Depends: debhelper (>= 7) Build-Depends: debhelper (>= 7)
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Standards-Version: 3.6.1.0 Standards-Version: 3.9.4
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Package: livecd-rootfs Package: livecd-rootfs

11
live-build/auto/build
View File

@ -433,21 +433,20 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
mv "${sourceslist}" "${sourceslist}.orig" mv "${sourceslist}" "${sourceslist}.orig"
mv "${sourceslist}.d" "${sourceslist}.d.orig" mv "${sourceslist}.d" "${sourceslist}.d.orig"
echo "deb $LB_PARENT_MIRROR_CHROOT saucy main universe multiverse restricted" >$sourceslist echo "deb $LB_PARENT_MIRROR_CHROOT ${LB_DISTRIBUTION} main universe multiverse restricted" >$sourceslist
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"
REL="$LB_DISTRIBUTION"
for subarch in $touchsubarches; do for subarch in $touchsubarches; do
cp "chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img"\ cp 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 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 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 "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
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"
done done