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

Import patches-unapplied version 2.169 to ubuntu/saucy-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 6f2173d60f651b9f656573e5a822b2c29e053fa7

New changelog entries:
  * switch touch builds to use the packaged android img files (pending cdimage
    changes to publish these from the livefs builder)
This commit is contained in:
Oliver Grawert 2013-08-07 16:05:45 +02:00 committed by usd-importer
parent 6f2173d60f
commit 485503920c
2 changed files with 20 additions and 13 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.169) saucy; urgency=low
* switch touch builds to use the packaged android img files (pending cdimage
changes to publish these from the livefs builder)
-- Oliver Grawert <ogra@ubuntu.com> Wed, 07 Aug 2013 16:05:45 +0200
livecd-rootfs (2.168) saucy; urgency=low livecd-rootfs (2.168) saucy; urgency=low
* drop unity-next PPA from ubuntu-touch builds, unity8 is in the archive now * drop unity-next PPA from ubuntu-touch builds, unity8 is in the archive now

26
live-build/auto/build
View File

@ -414,8 +414,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
sourceslist="chroot/etc/apt/sources.list" sourceslist="chroot/etc/apt/sources.list"
export FLASH_KERNEL_SKIP=True
lb chroot_proc install "$@" lb chroot_proc install "$@"
lb chroot_sysfs install "$@" lb chroot_sysfs install "$@"
lb chroot_devpts install "$@" lb chroot_devpts install "$@"
@ -429,20 +427,22 @@ 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 http://ftpmaster.internal/ubuntu/ saucy main universe" >$sourceslist echo "deb ${MIRROR} saucy main universe multiverse restricted" >$sourceslist
Chroot chroot "apt-get -y update" Chroot chroot "apt-get -y update"
Chroot chroot "apt-get -y install ubuntu-touch-generic-initrd" Chroot chroot "apt-get -y install android"
REL="$LB_DISTRIBUTION"
for subarch in $touchsubarches; do for subarch in $touchsubarches; do
kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|awk '/Depends: linux-image/ {print $2}')" cp "chroot/usr/share/android/product/${REL}-preinstalled-system-armel+${subarch}.img"\
kver=${kpkg#linux-image-} "${PREFIX}.system-armel+${subarch}.img"
Chroot chroot "apt-get -y install $kpkg" cp "chroot/usr/share/android/product/${REL}-preinstalled-recovery-armel+${subarch}.img"\
"${PREFIX}.recovery-armel+${subarch}.img"
bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}" cp "chroot/usr/share/android/product/${REL}-preinstalled-boot-armhf+${subarch}.img"\
initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch" "${PREFIX}.boot-armhf+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img
Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}" ln -s "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}" cp "chroot/usr/share/android/product/${REL}-preinstalled-touch-armel+${subarch}.zip"\
"${PREFIX}.armel+${subarch}.zip"
done done
lb chroot_devpts remove "$@" lb chroot_devpts remove "$@"