diff --git a/debian/changelog b/debian/changelog index eefa3932..0d4c6826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +livecd-rootfs (2.194) saucy; urgency=low + + * prefix click packages in the manifest file with "click:" + + -- Oliver Grawert Fri, 11 Oct 2013 18:14:02 +0200 + +livecd-rootfs (2.193) saucy; urgency=low + + * drop SHELL=/system/bin/sh from /etc/environment on touch images (urgh) + + -- Oliver Grawert Fri, 11 Oct 2013 17:30:21 +0200 + +livecd-rootfs (2.192) saucy; urgency=low + + * add click packages to the manifest output on ubuntu touch + + -- Oliver Grawert Fri, 11 Oct 2013 14:29:41 +0200 + livecd-rootfs (2.191) saucy; urgency=low * ubuntu-touch: Make writable symlinks relative. diff --git a/live-build/auto/build b/live-build/auto/build index 67133091..38468e4b 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -418,6 +418,12 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then lb chroot_sysfs install "$@" lb chroot_devpts install "$@" + if [ -e "$PREFIX.manifest" ]; then + for line in read; do + echo "click:$line" >>"$PREFIX.manifest" + done <"$(Chroot chroot "click list")" + fi + if [ -e chroot/etc/resolv.conf ]; then mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig fi diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index 67f0900a..c8da3645 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -3,7 +3,6 @@ echo "I: setting up initial environment for Touch..." echo "HOSTNAME=android -SHELL=/system/bin/sh TERM=linux ANDROID_CACHE=/cache LOOP_MOUNTPOINT=/mnt/obb