From dbc0c8b1aa22a0fb8cff01d1f4b171a12b80e294 Mon Sep 17 00:00:00 2001 From: Sergio Schvezov Date: Mon, 26 Aug 2013 17:22:14 -0300 Subject: [PATCH] Import patches-unapplied version 2.178 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: d970213ac485db420972717b92039dd702dc1054 New changelog entries: * 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..956b90d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.178) saucy; 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