Merge lp:~mzanetti/livecd-rootfs/drop-sf-support

This commit is contained in:
Steve Langasek 2018-11-19 16:53:56 -08:00
commit f2f3512339
2 changed files with 3 additions and 1 deletions

3
debian/changelog vendored
View File

@ -5,6 +5,9 @@ livecd-rootfs (2.547) UNRELEASED; urgency=medium
* For ubuntu-image consumption, export the kernel and initrd to
image/boot/uboot for raspi*.
[ Michael Zanetti ]
* Don't set QML2_IMPORT_PATH in environment for Ubuntu Touch images.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 19 Nov 2018 10:39:33 -0800
livecd-rootfs (2.546) disco; urgency=medium

View File

@ -13,7 +13,6 @@ ANDROID_BOOTLOGO=1
LD_LIBRARY_PATH=/vendor/lib:/system/lib
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ANDROID_DATA=/data
QML2_IMPORT_PATH=/usr/lib/@DEB_HOST_MULTIARCH@/qt5/imports
QT_SELECT=qt5
SHLVL=1
MKSH=/system/bin/sh