Import patches-unapplied version 2.431 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 326e7b0b97

New changelog entries:
  [ Łukasz 'sil2100' Zemczak ]
  * Temporarily change the 60-install-click.chroot script to pull in clicks for
    arm64 builds from a different location for ubuntu-touch.
impish
Steve Langasek 8 years ago committed by usd-importer
parent 326e7b0b97
commit 7c2e3247f1

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.431) yakkety; urgency=medium
[ Łukasz 'sil2100' Zemczak ]
* Temporarily change the 60-install-click.chroot script to pull in clicks for
arm64 builds from a different location for ubuntu-touch.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 14 Sep 2016 14:27:40 -0500
livecd-rootfs (2.430) yakkety; urgency=medium livecd-rootfs (2.430) yakkety; urgency=medium
[ Michael Vogt ] [ Michael Vogt ]

@ -4,8 +4,19 @@ set -e
echo "Setting up click packages" echo "Setting up click packages"
CLICKARCH=$(dpkg --print-architecture)
click_uri=http://archive-team.internal/click_packages click_uri=http://archive-team.internal/click_packages
click_list=$click_uri/click_list if [ "$CLICKARCH" = "arm64" ]; then
# FIXME: this is temporary. Since right now we can't have arm64 clicks in the store
# (before implementing fat-packages), we need to fetch the arm64 click list from a
# different place
click_list=$click_uri/click_list.arm64
click_install_flags="--allow-unauthenticated"
else
click_list=$click_uri/click_list
click_install_flags=""
fi
click_db=/usr/share/click/preinstalled click_db=/usr/share/click/preinstalled
click_db_custom=/custom/click click_db_custom=/custom/click
@ -20,8 +31,6 @@ tmpdir="$(mktemp -d)"
cleanup () { rm -rf "$tmpdir"; } cleanup () { rm -rf "$tmpdir"; }
trap cleanup EXIT trap cleanup EXIT
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
@ -61,7 +70,7 @@ do
mv /etc/click/databases/10_core.conf \ mv /etc/click/databases/10_core.conf \
/etc/click/databases/10_core.conf.tmp /etc/click/databases/10_core.conf.tmp
fi fi
click install --force-missing-framework --root="$root" --all-users \ click install --force-missing-framework --root="$root" --all-users $click_install_flags \
"$tmpdir/$package" "$tmpdir/$package"
if [ "$root" = "$click_db_custom" ]; then if [ "$root" = "$click_db_custom" ]; then
mv /etc/click/databases/10_core.conf.tmp \ mv /etc/click/databases/10_core.conf.tmp \

Loading…
Cancel
Save