make the click package installation check for proper architecture

ubuntu/trusty
Oliver Grawert 11 years ago
parent a9e80f9118
commit 68d3bbf11f

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.199) UNRELEASED; urgency=low
* make the click package installation check for proper architecture before
trying to install packages from the list, so that i386 touch builds do not
fall over with "wrong architecture" failures at the click install step.
-- Oliver Grawert <ogra@ubuntu.com> Tue, 26 Nov 2013 15:14:18 +0100
livecd-rootfs (2.198) trusty; urgency=low
* Double-quotes prevented the previous change from working, so drop those.

@ -15,11 +15,15 @@ tmpdir="$(mktemp -d)"
cleanup () { rm -rf "$tmpdir"; }
trap cleanup EXIT
CLICKARCH=$(dpkg --print-architecture)
wget --no-verbose -O "$tmpdir/click_list" "$click_list"
for package in $(cat "$tmpdir/click_list")
do
if echo $package | egrep -q _$CLICKARCH.click|_all.click|_unknown.click; then
echo "Setting up $package"
wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
click install --force-missing-framework --root="$click_db" --all-users \
"$tmpdir/$package"
fi
done

Loading…
Cancel
Save