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

switch touch builds to use the packaged android img files (pending cdimage changes to publish these from the livefs builder)

Browse Source
This commit is contained in:
Oliver Grawert 2013-08-07 16:07:27 +02:00
parent f06dcf375a
commit 74ce6409a4
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) UNRELEASED; 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
* 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"
export FLASH_KERNEL_SKIP=True
lb chroot_proc install "$@"
lb chroot_sysfs install "$@"
lb chroot_devpts install "$@"
@ -429,20 +427,22 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
mv "${sourceslist}" "${sourceslist}.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 install ubuntu-touch-generic-initrd"
Chroot chroot "apt-get -y install android"
REL="$LB_DISTRIBUTION"
for subarch in $touchsubarches; do
kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|awk '/Depends: linux-image/ {print $2}')"
kver=${kpkg#linux-image-}
Chroot chroot "apt-get -y install $kpkg"
bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
cp "chroot/usr/share/android/product/${REL}-preinstalled-system-armel+${subarch}.img"\
"${PREFIX}.system-armel+${subarch}.img"
cp "chroot/usr/share/android/product/${REL}-preinstalled-recovery-armel+${subarch}.img"\
"${PREFIX}.recovery-armel+${subarch}.img"
cp "chroot/usr/share/android/product/${REL}-preinstalled-boot-armhf+${subarch}.img"\
"${PREFIX}.boot-armhf+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img
ln -s "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
cp "chroot/usr/share/android/product/${REL}-preinstalled-touch-armel+${subarch}.zip"\
"${PREFIX}.armel+${subarch}.zip"
done
lb chroot_devpts remove "$@"