Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-13 04:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.199 to ubuntu/trusty-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 7d39f42e935512bb488b3a64a6e38062e29af938

New changelog entries:
  * 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.
This commit is contained in:
Oliver Grawert 2013-11-26 15:14:18 +01:00 committed by usd-importer
parent 7d39f42e93
commit 59393695b6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.199) trusty; 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.

12
live-build/ubuntu-touch/hooks/60-install-click.chroot
View File

@ -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
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"
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