From 3fc5871d18b52dabf61f149d3e239c0074e17347 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 16:03:15 +0100 Subject: [PATCH] Import patches-unapplied version 2.182 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 647e5bbcb6bbd721c6fad04390a9d5a75ad62803 New changelog entries: * Log the hostname at the start of the build. * Fix test for whether we're running in the Canonical datacentre when installing click packages. --- debian/changelog | 8 ++++++++ live-build/auto/config | 2 ++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3cc7806f..67ebbf02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.182) saucy; urgency=low + + * Log the hostname at the start of the build. + * Fix test for whether we're running in the Canonical datacentre when + installing click packages. + + -- Colin Watson Thu, 05 Sep 2013 16:03:15 +0100 + livecd-rootfs (2.181) saucy; urgency=low * Use new multiple-database scheme in click 0.4.3 to preinstall click diff --git a/live-build/auto/config b/live-build/auto/config index 6fa27e8f..e6011089 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -3,6 +3,8 @@ set -e rm -rf config +echo "Building on $(hostname --fqdn)" + SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index bb4c0008..74928239 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -5,7 +5,7 @@ set -e echo "Setting up click packages" case $(hostname --fqdn) in - *.ubuntu.com) + *.ubuntu.com|*.buildd) click_uri=http://archive-team.internal/click_packages ;; *)