From 6ee060fae7b708440f474417e6ff3a096aab927e Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 1 Aug 2013 19:14:06 +0200 Subject: [PATCH 1/8] drop unity-next PPA from ubuntu-touch builds, unity8 is in the archive now --- debian/changelog | 6 ++++++ .../archives/ubuntu-unity-next.key.chroot | 13 ------------- .../archives/ubuntu-unity-next.list.chroot | 2 -- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot diff --git a/debian/changelog b/debian/changelog index d474436f..a45b2349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.168) UNRELEASED; urgency=low + + * drop unity-next PPA from ubuntu-touch builds, unity8 is in the archive now + + -- Oliver Grawert Thu, 01 Aug 2013 19:11:55 +0200 + livecd-rootfs (2.167) saucy; urgency=low * make sure FLASH_KERNEL_SKIP is set when we post-process touch images diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot deleted file mode 100644 index 0ce716cb..00000000 --- a/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaF -vaiNCwzK7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD -+1hw9xSvMXGO/dOaZv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0 -MkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0 -ZWFtiLgEEwECACIFAlCiaeACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ -EEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gda41lQsqLFXDWdYFaF1FqrLNa -6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ22JNS5UIXmwSKO5P -Ix8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZMByN -=VBVL ------END PGP PUBLIC KEY BLOCK----- diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot deleted file mode 100644 index 4917feb7..00000000 --- a/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main -# deb-src http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main From f06dcf375ac3b59eeff0975a10db6ad568c5149f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 1 Aug 2013 19:17:06 +0200 Subject: [PATCH 2/8] releasing version 2.168 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a45b2349..27f1ff11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.168) UNRELEASED; urgency=low +livecd-rootfs (2.168) saucy; urgency=low * drop unity-next PPA from ubuntu-touch builds, unity8 is in the archive now From 74ce6409a49c1c95a6d58f5ba92f6821423c2ea0 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 16:07:27 +0200 Subject: [PATCH 3/8] switch touch builds to use the packaged android img files (pending cdimage changes to publish these from the livefs builder) --- debian/changelog | 7 +++++++ live-build/auto/build | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 27f1ff11..24572bd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 diff --git a/live-build/auto/build b/live-build/auto/build index 91bd8a02..c6a58254 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -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 "$@" From 54b97639a09f228aca21ca4354479accd79e7c5f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 16:07:57 +0200 Subject: [PATCH 4/8] releasing version 2.169 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 24572bd9..b46b7461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.169) UNRELEASED; urgency=low +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) From 17fcb0f65a48b5298b8848da515196e6af33755c Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 19:22:15 +0200 Subject: [PATCH 5/8] fix package mirror in android package install routine --- debian/changelog | 6 ++++++ live-build/auto/build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b46b7461..0bd68a44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.169ubuntu1) UNRELEASED; urgency=low + + * fix package mirror in android package install routine + + -- Oliver Grawert Wed, 07 Aug 2013 19:17:43 +0200 + livecd-rootfs (2.169) saucy; urgency=low * switch touch builds to use the packaged android img files (pending cdimage diff --git a/live-build/auto/build b/live-build/auto/build index c6a58254..c25b19ac 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -427,7 +427,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then mv "${sourceslist}" "${sourceslist}.orig" mv "${sourceslist}.d" "${sourceslist}.d.orig" - echo "deb ${MIRROR} saucy main universe multiverse restricted" >$sourceslist + echo "deb $LB_PARENT_MIRROR_CHROOT saucy main universe multiverse restricted" >$sourceslist Chroot chroot "apt-get -y update" Chroot chroot "apt-get -y install android" From 9e2888738a240a472bc3b63ba45385fd843c988e Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 19:22:55 +0200 Subject: [PATCH 6/8] releasing version 2.170 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0bd68a44..958e5d06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.169ubuntu1) UNRELEASED; urgency=low +livecd-rootfs (2.170) saucy; urgency=low * fix package mirror in android package install routine From f897e608df32957b6d31f6467fcd9a304603853d Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 21:58:09 +0200 Subject: [PATCH 7/8] seems unlike my local build the buildd doesnt get along with links, use copy instead --- debian/changelog | 7 +++++++ live-build/auto/build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 958e5d06..edda4fc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.171) UNRELEASED; urgency=low + + * seems unlike my local build the buildd doesnt get along with links, use + copy instead + + -- Oliver Grawert Wed, 07 Aug 2013 21:56:07 +0200 + livecd-rootfs (2.170) saucy; urgency=low * fix package mirror in android package install routine diff --git a/live-build/auto/build b/live-build/auto/build index c25b19ac..87b172be 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -440,7 +440,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then 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 "${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 From 37bef7f65ea64a1035658a6d63d8807b519ea58c Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 7 Aug 2013 21:58:40 +0200 Subject: [PATCH 8/8] releasing version 2.171 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index edda4fc3..83aee46b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.171) UNRELEASED; urgency=low +livecd-rootfs (2.171) saucy; urgency=low * seems unlike my local build the buildd doesnt get along with links, use copy instead