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

Take a different approach to working around deduplication cleverness in click, this time hopefully without breaking hooks.

Browse Source
This commit is contained in:
Colin Watson 2014-10-13 16:29:52 +01:00
parent 5d707813f0
commit 95c970f52f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,15 +16,8 @@ chown clickpkg:clickpkg "$click_db"
mkdir -p -m 755 "$click_db_custom" mkdir -p -m 755 "$click_db_custom"
chown clickpkg:clickpkg "$click_db_custom" chown clickpkg:clickpkg "$click_db_custom"
# move default configuration aside to stop click being clever about symlink
# layering
mv /etc/click/databases /etc/click/databases.tmp
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
cleanup () { cleanup () { rm -rf "$tmpdir"; }
rm -rf "$tmpdir"
mv /etc/click/databases.tmp /etc/click/databases
}
trap cleanup EXIT trap cleanup EXIT
CLICKARCH=$(dpkg --print-architecture) CLICKARCH=$(dpkg --print-architecture)
@ -55,8 +48,20 @@ do
;; ;;
esac esac
for root in $roots; do for root in $roots; do
if [ "$root" = "$click_db_custom" ]; then
# FIXME: there is no good way to stop click from
# deduplicating things when installing the same package in
# multiple databases; the best we can do is to temporarily
# pretend that the core database does not exist
mv /etc/click/databases/10_core.conf \
/etc/click/databases/10_core.conf.tmp
fi
click install --force-missing-framework --root="$root" --all-users \ click install --force-missing-framework --root="$root" --all-users \
"$tmpdir/$package" "$tmpdir/$package"
if [ "$root" = "$click_db_custom" ]; then
mv /etc/click/databases/10_core.conf.tmp \
/etc/click/databases/10_core.conf
fi
done done
fi fi
done done