From d98eb03afbb20b9d02fa39c963a200bcba97c262 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 16 Aug 2013 13:27:24 +0200 Subject: [PATCH 01/24] make sure the bluetooth group has the right android GID on touch builds --- debian/changelog | 6 ++++++ live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 282a2725..9dd27cab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.174) UNRELEASED; urgency=low + + * make sure the bluetooth group has the right android GID on touch builds + + -- Oliver Grawert Fri, 16 Aug 2013 13:25:52 +0200 + livecd-rootfs (2.173) saucy; urgency=low [Michael Terry] diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot index 2f4b20d3..875b23d6 100755 --- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot +++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot @@ -36,7 +36,8 @@ else fi /bin/egrep -i "^bluetooth:" /etc/group if [ $? -eq 0 ]; then - echo "User bluetooth exists in /etc/group" + echo "User bluetooth exists in /etc/group changing ID to 1002" + groupmod -g 1002 bluetooth else echo "User bluetooth does not exist in /etc/group -- must create" groupadd -g 1002 bluetooth From 740ad68fa985fdc2c9c2b8fe82e9634c82e4a899 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 16 Aug 2013 13:27:54 +0200 Subject: [PATCH 02/24] releasing version 2.174 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9dd27cab..769c4672 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.174) UNRELEASED; urgency=low +livecd-rootfs (2.174) saucy; urgency=low * make sure the bluetooth group has the right android GID on touch builds From a1092a9c13e511d8d4753b424da5ce63d62fdd37 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 23 Aug 2013 16:26:19 +0200 Subject: [PATCH 03/24] move media-info file from /var/log/installer to /etc on touch images --- debian/changelog | 6 ++++++ live-build/auto/build | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 769c4672..40196abe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.175) UNRELEASED; urgency=low + + * move media-info file from /var/log/installer to /etc on touch images. + + -- Oliver Grawert Fri, 23 Aug 2013 16:25:08 +0200 + livecd-rootfs (2.174) saucy; urgency=low * make sure the bluetooth group has the right android GID on touch builds diff --git a/live-build/auto/build b/live-build/auto/build index 87b172be..bd2d56e8 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -237,9 +237,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS fi if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then INFO_DESC="$(lsb_release -d -s)" - - mkdir -p chroot/var/log/installer - echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/var/log/installer/media-info + echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info fi echo "===== Checking size of /usr/share/doc =====" From c047fb24324c6d9e9a0ee1c886be1060e5c3e4fa Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 23 Aug 2013 16:26:48 +0200 Subject: [PATCH 04/24] releasing version 2.175 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 40196abe..e0a3172f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.175) UNRELEASED; urgency=low +livecd-rootfs (2.175) saucy; urgency=low * move media-info file from /var/log/installer to /etc on touch images. From 16bc6cb9b3222a408821890de98a9b15059b23a5 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 23 Aug 2013 16:41:00 +0200 Subject: [PATCH 05/24] preserve a symlink of media-info for backwards compatibility --- debian/changelog | 6 ++++++ live-build/auto/build | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index e0a3172f..f4a6e72d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.176) UNRELEASED; urgency=low + + * preserve a symlink of media-info for backwards compatibility + + -- Oliver Grawert Fri, 23 Aug 2013 16:39:31 +0200 + livecd-rootfs (2.175) saucy; urgency=low * move media-info file from /var/log/installer to /etc on touch images. diff --git a/live-build/auto/build b/live-build/auto/build index bd2d56e8..67133091 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -238,6 +238,8 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then INFO_DESC="$(lsb_release -d -s)" echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info + mkdir -p chroot/var/log/installer + Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info" fi echo "===== Checking size of /usr/share/doc =====" From 014067af6e9626bea11ef8edaea3fe7adc1d4e6b Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 23 Aug 2013 16:41:26 +0200 Subject: [PATCH 06/24] releasing version 2.176 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f4a6e72d..0ffacfad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.176) UNRELEASED; urgency=low +livecd-rootfs (2.176) saucy; urgency=low * preserve a symlink of media-info for backwards compatibility From 39986bad6c2ae7bb15a31acd0159da537ef431d3 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 26 Aug 2013 16:53:29 +0200 Subject: [PATCH 07/24] do not forcefully use the admin group on touch images. this group was dropped in favour of the sudo group several releases ago --- debian/changelog | 7 +++++++ .../ubuntu-touch/hooks/02-add_user_to_groups.chroot | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ffacfad..0ac9276c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.177) UNRELEASED; urgency=low + + * do not forcefully use the admin group on touch images. this group was + dropped in favour of the sudo group several releases ago + + -- Oliver Grawert Mon, 26 Aug 2013 16:51:13 +0200 + livecd-rootfs (2.176) saucy; urgency=low * preserve a symlink of media-info for backwards compatibility diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot index 875b23d6..f2fed7cc 100755 --- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot +++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot @@ -2,15 +2,8 @@ USER=phablet -DEFGROUPS="tty,admin,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw" +DEFGROUPS="tty,sudo,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw" -/bin/egrep -i "^admin:" /etc/group -if [ $? -eq 0 ]; then - echo "User admin exists in /etc/group" -else - echo "User admin does not exists in /etc/group must create" - groupadd admin -fi /bin/egrep -i "^audio:" /etc/group if [ $? -eq 0 ]; then # Needed to change group id as audio is already created by ubuntu From 4f62ebd9841e93cae534785bc0b5aca9cd2d3685 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 26 Aug 2013 16:53:52 +0200 Subject: [PATCH 08/24] releasing version 2.177 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ac9276c..fa4c6e19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.177) UNRELEASED; urgency=low +livecd-rootfs (2.177) saucy; urgency=low * do not forcefully use the admin group on touch images. this group was dropped in favour of the sudo group several releases ago From 2978a1e0dde18bc34b30a9dc4ce0ac23950cadc1 Mon Sep 17 00:00:00 2001 From: Sergio Schvezov Date: Mon, 26 Aug 2013 17:23:27 -0300 Subject: [PATCH 09/24] Copying click packages to install search location instead of installing for a hardcoded user. --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa4c6e19..6d830c32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.178) UNRELEASED; urgency=low + + * Copying click packages to install search location instead of installing + for a hardcoded user. + + -- Sergio Schvezov Mon, 26 Aug 2013 17:22:14 -0300 + livecd-rootfs (2.177) saucy; urgency=low * do not forcefully use the admin group on touch images. this group was diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index 7c6f7cb5..bf9737ad 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -6,11 +6,12 @@ echo "Setting up click packages" click_uri=http://archive-team.internal/click_packages click_list=$click_uri/click_list +click_dir=/usr/share/preinstalled/click + +mkdir -p "$click_dir" for package in $(wget -qO- "$click_list") do echo "Setting up $package" - wget --no-verbose -O "$package" "$click_uri"/"$package" - click install --user=phablet --force-missing-framework "$package" - rm "$package" + wget --no-verbose -O "$click_dir"/"$package" "$click_uri"/"$package" done From f49f02be27f319ed897b3a41ae36191cea620091 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Mon, 26 Aug 2013 19:24:43 -0300 Subject: [PATCH 10/24] releasing version 2.178 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6d830c32..956b90d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.178) UNRELEASED; urgency=low +livecd-rootfs (2.178) saucy; urgency=low * Copying click packages to install search location instead of installing for a hardcoded user. From 1dc58ddbe59c3fbc60c8ca038977bb9af02861ad Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 27 Aug 2013 11:25:26 +0200 Subject: [PATCH 11/24] fix autopilot group handling on touch images --- debian/changelog | 7 +++++++ .../ubuntu-touch/hooks/70-reconfigure-autopilot.chroot | 10 ++++++++++ 2 files changed, 17 insertions(+) create mode 100644 live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot diff --git a/debian/changelog b/debian/changelog index 956b90d2..242ae390 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.179) UNRELEASED; urgency=low + + * add 70-reconfigure-autopilot.chroot to ubuntu-touch builds, to make sure + the phablet user actually ends up in the autopilot group + + -- Oliver Grawert Tue, 27 Aug 2013 11:23:56 +0200 + livecd-rootfs (2.178) saucy; urgency=low * Copying click packages to install search location instead of installing diff --git a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot new file mode 100644 index 00000000..0e28394e --- /dev/null +++ b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot @@ -0,0 +1,10 @@ +#!/bin/sh + +# make sure the phablet user is in the autopilot group +# (the user is not available when the package postinst +# adds all users of the sudo group to the autopilot one +# so we re-run the package configuration now + +echo "making sure phablet user is in the autopilot group" + +dpkg -l python-autopilot >/dev/null 2>&1 && dpkg-reconfigure python-autopilot From 4fc7a2e78e1bd1ad6b66900ec0211c6eb1798590 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 27 Aug 2013 11:26:01 +0200 Subject: [PATCH 12/24] releasing version 2.179 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 242ae390..650f8422 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.179) UNRELEASED; urgency=low +livecd-rootfs (2.179) saucy; urgency=low * add 70-reconfigure-autopilot.chroot to ubuntu-touch builds, to make sure the phablet user actually ends up in the autopilot group From 07406f5e8e27608adf101bda58d02e57a711433a Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 28 Aug 2013 16:38:51 +0200 Subject: [PATCH 13/24] change NM mangling from admin to sudo group, drop some extra env variables we dont need from touch images --- debian/changelog | 8 ++++++++ .../ubuntu-touch/hooks/45-add-adming-group-nm.chroot | 6 ------ live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot | 6 ++++++ live-build/ubuntu-touch/hooks/48-setup-env.chroot | 4 +--- 4 files changed, 15 insertions(+), 9 deletions(-) delete mode 100755 live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot create mode 100755 live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot diff --git a/debian/changelog b/debian/changelog index 650f8422..4f855254 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.180) UNRELEASED; urgency=low + + * make sure the NM configuration mangling of touch images uses the sudo and + not the admin group, "admin" is dead since years ... (LP: #1217596) + * drop a few superfluous env vars on request of Ted Gould + + -- Oliver Grawert Wed, 28 Aug 2013 16:27:12 +0200 + livecd-rootfs (2.179) saucy; urgency=low * add 70-reconfigure-autopilot.chroot to ubuntu-touch builds, to make sure diff --git a/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot b/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot deleted file mode 100755 index 2b1bb793..00000000 --- a/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -echo "Adding admin group policy to NM system service" - -sed -i 's//\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t<\/policy>\n\t\t/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf - diff --git a/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot b/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot new file mode 100755 index 00000000..e8779bfe --- /dev/null +++ b/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot @@ -0,0 +1,6 @@ +#!/bin/bash + +echo "Adding admin group policy to NM system service" + +sed -i 's//\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t<\/policy>\n\t\t/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf + diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index 0ab0c9fe..ed7e06c4 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -23,6 +23,4 @@ ANDROID_ROOT=/system EXTERNAL_STORAGE=/mnt/sdcard LANG=en_US.UTF-8 LANGUAGE=en_US:en -QT_IM_MODULE=maliitphablet -HUD_NO_STORE_USAGE_DATA=1 -INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment +QT_IM_MODULE=maliitphablet" > /etc/environment From 2f45e1f2e019b6aff1606b7d9e7d48f5f46b5750 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 28 Aug 2013 16:39:15 +0200 Subject: [PATCH 14/24] releasing version 2.180 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4f855254..cc5146cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.180) UNRELEASED; urgency=low +livecd-rootfs (2.180) saucy; urgency=low * make sure the NM configuration mangling of touch images uses the sudo and not the admin group, "admin" is dead since years ... (LP: #1217596) From d083723d88c1958f2aa5b8b2676d5795c1a384cd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 11:28:41 +0100 Subject: [PATCH 15/24] Use new multiple-database scheme in click 0.4.3 to preinstall click packages. --- debian/changelog | 7 +++++++ .../ubuntu-touch/hooks/60-install-click.chroot | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc5146cd..5acedc43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.181) UNRELEASED; urgency=low + + * Use new multiple-database scheme in click 0.4.3 to preinstall click + packages. + + -- Colin Watson Thu, 05 Sep 2013 11:28:15 +0100 + livecd-rootfs (2.180) saucy; urgency=low * make sure the NM configuration mangling of touch images uses the sudo and diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index bf9737ad..f90b4ba0 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -6,12 +6,19 @@ echo "Setting up click packages" click_uri=http://archive-team.internal/click_packages click_list=$click_uri/click_list -click_dir=/usr/share/preinstalled/click +click_db=/usr/share/click/preinstalled -mkdir -p "$click_dir" +mkdir -p -m 755 "$click_db" +chown clickpkg:clickpkg "$click_db" + +tmpdir="$(mktemp -d)" +cleanup () { rm -rf "$tmpdir"; } +trap cleanup EXIT for package in $(wget -qO- "$click_list") do echo "Setting up $package" - wget --no-verbose -O "$click_dir"/"$package" "$click_uri"/"$package" + wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package" + click install --force-missing-framework --root="$click_db" --all-users \ + "$tmpdir/$package" done From 805633bc05efaa458674cba8801c854977776150 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 11:29:14 +0100 Subject: [PATCH 16/24] Download core click packages from the right place when building images outside the Canonical datacentre. --- debian/changelog | 2 ++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5acedc43..34ed2e84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ livecd-rootfs (2.181) UNRELEASED; urgency=low * Use new multiple-database scheme in click 0.4.3 to preinstall click packages. + * Download core click packages from the right place when building images + outside the Canonical datacentre. -- Colin Watson Thu, 05 Sep 2013 11:28:15 +0100 diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index f90b4ba0..bb4c0008 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -4,7 +4,14 @@ set -e echo "Setting up click packages" -click_uri=http://archive-team.internal/click_packages +case $(hostname --fqdn) in + *.ubuntu.com) + click_uri=http://archive-team.internal/click_packages + ;; + *) + click_uri=http://people.canonical.com/~ubuntu-archive/click_packages + ;; +esac click_list=$click_uri/click_list click_db=/usr/share/click/preinstalled From 21f4bc0b0838e507522d9d05a6efd2a778203fda Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 11:30:23 +0100 Subject: [PATCH 17/24] releasing package livecd-rootfs version 2.181 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34ed2e84..3cc7806f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -livecd-rootfs (2.181) UNRELEASED; urgency=low +livecd-rootfs (2.181) saucy; urgency=low * Use new multiple-database scheme in click 0.4.3 to preinstall click packages. * Download core click packages from the right place when building images outside the Canonical datacentre. - -- Colin Watson Thu, 05 Sep 2013 11:28:15 +0100 + -- Colin Watson Thu, 05 Sep 2013 11:29:17 +0100 livecd-rootfs (2.180) saucy; urgency=low From 741ff8d8d177242261a670ea63eda64fea3c3a4d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 16:02:28 +0100 Subject: [PATCH 18/24] Log the hostname at the start of the build. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3cc7806f..0df5fd24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.182) UNRELEASED; urgency=low + + * Log the hostname at the start of the build. + + -- Colin Watson Thu, 05 Sep 2013 16:02:13 +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 From 1c5ea38bebcb423b486422842d7ac9e5fad20cef Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 16:03:10 +0100 Subject: [PATCH 19/24] Fix test for whether we're running in the Canonical datacentre when installing click packages. --- debian/changelog | 2 ++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0df5fd24..33e5c1ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ livecd-rootfs (2.182) UNRELEASED; 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:02:13 +0100 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 ;; *) From 430558b8cecbbd0a01dcbcfad868ff96e34cf01b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 16:03:54 +0100 Subject: [PATCH 20/24] releasing package livecd-rootfs version 2.182 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33e5c1ef..67ebbf02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.182) UNRELEASED; urgency=low +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:02:13 +0100 + -- Colin Watson Thu, 05 Sep 2013 16:03:15 +0100 livecd-rootfs (2.181) saucy; urgency=low From 00192887a256ab20e9a75aad47ff16127f7fa7c3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 6 Sep 2013 11:48:21 +0100 Subject: [PATCH 21/24] Make 60-install-click.chroot more verbose, in an attempt to figure out why this doesn't work in the datacentre. --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67ebbf02..548359f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.183) UNRELEASED; urgency=low + + * Make 60-install-click.chroot more verbose, in an attempt to figure out + why this doesn't work in the datacentre. + + -- Colin Watson Fri, 06 Sep 2013 11:47:49 +0100 + livecd-rootfs (2.182) saucy; urgency=low * Log the hostname at the start of the build. diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index 74928239..d8379642 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -1,6 +1,6 @@ #!/bin/sh -set -e +set -ex echo "Setting up click packages" @@ -22,7 +22,8 @@ tmpdir="$(mktemp -d)" cleanup () { rm -rf "$tmpdir"; } trap cleanup EXIT -for package in $(wget -qO- "$click_list") +wget --no-verbose -O "$tmpdir/click_list" "$click_list" +for package in $(cat "$tmpdir/click_list") do echo "Setting up $package" wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package" From 9f56629f09e03d877da7c96b994605b10955b25a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 6 Sep 2013 11:49:14 +0100 Subject: [PATCH 22/24] releasing package livecd-rootfs version 2.183 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 548359f5..2b005f9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.183) UNRELEASED; urgency=low +livecd-rootfs (2.183) saucy; urgency=low * Make 60-install-click.chroot more verbose, in an attempt to figure out why this doesn't work in the datacentre. - -- Colin Watson Fri, 06 Sep 2013 11:47:49 +0100 + -- Colin Watson Fri, 06 Sep 2013 11:48:25 +0100 livecd-rootfs (2.182) saucy; urgency=low From 976cbb15946c896371b1b644a88e661e1f747e86 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 6 Sep 2013 13:21:36 +0100 Subject: [PATCH 23/24] Revert to always using archive-team.internal in 60-install-click.chroot for now. This is unfortunate, but "hostname --fqdn" doesn't work at this stage. --- debian/changelog | 8 ++++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 11 ++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b005f9c..d1c683a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.184) UNRELEASED; urgency=low + + * Revert to always using archive-team.internal in 60-install-click.chroot + for now. This is unfortunate, but "hostname --fqdn" doesn't work at + this stage. + + -- Colin Watson Fri, 06 Sep 2013 13:21:08 +0100 + livecd-rootfs (2.183) saucy; urgency=low * Make 60-install-click.chroot more verbose, in an attempt to figure out diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index d8379642..6e29a364 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -1,17 +1,10 @@ #!/bin/sh -set -ex +set -e echo "Setting up click packages" -case $(hostname --fqdn) in - *.ubuntu.com|*.buildd) - click_uri=http://archive-team.internal/click_packages - ;; - *) - click_uri=http://people.canonical.com/~ubuntu-archive/click_packages - ;; -esac +click_uri=http://archive-team.internal/click_packages click_list=$click_uri/click_list click_db=/usr/share/click/preinstalled From 495518afbd48f4b71419414cd0f9d32431586c27 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 6 Sep 2013 13:22:10 +0100 Subject: [PATCH 24/24] releasing package livecd-rootfs version 2.184 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1c683a0..0793f633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.184) UNRELEASED; urgency=low +livecd-rootfs (2.184) saucy; urgency=low * Revert to always using archive-team.internal in 60-install-click.chroot for now. This is unfortunate, but "hostname --fqdn" doesn't work at this stage. - -- Colin Watson Fri, 06 Sep 2013 13:21:08 +0100 + -- Colin Watson Fri, 06 Sep 2013 13:21:42 +0100 livecd-rootfs (2.183) saucy; urgency=low