allow install of "multi" click packages in 60-install-click.chroot on ubuntu-touch

This commit is contained in:
Oliver Grawert 2015-06-19 10:43:49 +02:00
parent 5fa4811051
commit 2667aa6305
2 changed files with 7 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,5 +1,6 @@
livecd-rootfs (2.317) UNRELEASED; urgency=medium livecd-rootfs (2.317) UNRELEASED; urgency=medium
[ Sebastien Bacher ]
* live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot: * live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot:
- create other needed directories - create other needed directories
* live-build/ubuntu-desktop-next/includes.chroot: * live-build/ubuntu-desktop-next/includes.chroot:
@ -9,7 +10,11 @@ livecd-rootfs (2.317) UNRELEASED; urgency=medium
the users are added by the script and not the usual postinst so their the users are added by the script and not the usual postinst so their
uderdirs are not created as they should uderdirs are not created as they should
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 19 Jun 2015 10:26:41 +0200 [ Oliver Grawert ]
* allow install of "multi" click packages in 60-install-click.chroot on
ubuntu-touch
-- Oliver Grawert <ogra@ubuntu.com> Fri, 19 Jun 2015 10:42:53 +0200
livecd-rootfs (2.316) wily; urgency=medium livecd-rootfs (2.316) wily; urgency=medium

View File

@ -25,7 +25,7 @@ CLICKARCH=$(dpkg --print-architecture)
wget --no-verbose -O "$tmpdir/click_list" "$click_list" wget --no-verbose -O "$tmpdir/click_list" "$click_list"
for package in $(cat "$tmpdir/click_list") for package in $(cat "$tmpdir/click_list")
do do
if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click"; then if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click|_multi.click"; then
echo "Setting up $package" echo "Setting up $package"
wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package" wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
# FIXME: first attempt, a hard-coded list of the packages that go to # FIXME: first attempt, a hard-coded list of the packages that go to