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

Import patches-unapplied version 2.150 to ubuntu/saucy-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: c99101f413c149720c2e8bf404a05fba01347246

New changelog entries:
  * export $NOW in BuildLiveCD so we have it available in live-build
  * create a build stamp in /var/log/installer/media-info on Ubuntu Touch images
This commit is contained in:
Oliver Grawert 2013-06-26 11:32:31 +02:00 committed by usd-importer
parent c99101f413
commit ed5f40b753
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BuildLiveCD
View File

@ -129,6 +129,7 @@ for STE in $SUITES; do
NOW=${NOW}.$n NOW=${NOW}.$n
fi fi
NOW=${NOW} NOW=${NOW}
export NOW
LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
rm -f ${PUBDIR}latest rm -f ${PUBDIR}latest

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.150) saucy; urgency=low
* export $NOW in BuildLiveCD so we have it available in live-build
* create a build stamp in /var/log/installer/media-info on Ubuntu Touch images
-- Oliver Grawert <ogra@ubuntu.com> Wed, 26 Jun 2013 11:32:31 +0200
livecd-rootfs (2.149) saucy; urgency=low livecd-rootfs (2.149) saucy; urgency=low
* set QT_SELECT=qt5 in touch image environment * set QT_SELECT=qt5 in touch image environment

6
live-build/auto/build
View File

@ -235,6 +235,12 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
> chroot/etc/apt/sources.list > chroot/etc/apt/sources.list
rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
fi fi
if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
INFO_DESC="$(lsb_release -d -s)"
mkdir -p chroot/var/log/installer
echo "$INFO_DESC - $ARCH ($NOW)" >chroot/var/log/installer/media-info
fi
echo "===== Checking size of /usr/share/doc =====" echo "===== Checking size of /usr/share/doc ====="
echo BEGIN docdirs echo BEGIN docdirs