Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 77f39e99b7c5d44fb4bf760bb1c33d8e47412ada

New changelog entries:
  * fix build stamp handling for ubuntu-touch (requires an RT to have IS
    update BuildLiveCD on the builders)
This commit is contained in:
Oliver Grawert 2013-07-11 16:34:34 +02:00 committed by usd-importer
parent 77f39e99b7
commit 543bc14843
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BuildLiveCD
View File

@ -128,8 +128,6 @@ for STE in $SUITES; do
typeset -i n=1; while [ -d ${PUBDIR}${NOW}.$n ]; do n=n+1; done
NOW=${NOW}.$n
fi
NOW=${NOW}
export NOW
LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
rm -f ${PUBDIR}latest
@ -140,7 +138,7 @@ for STE in $SUITES; do
if $LIVE_BUILD; then
$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && rm -rf auto && mkdir -p auto && for f in config build clean; do ln -s /usr/share/livecd-rootfs/live-build/auto/\$f auto/; done" >> ${LOG} 2>&1 || true
$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && lb clean --purge" >> ${LOG} 2>&1 || true
if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && NOW=${NOW} SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
exit 1
fi
COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.156) saucy; urgency=low
* fix build stamp handling for ubuntu-touch (requires an RT to have IS
update BuildLiveCD on the builders)
-- Oliver Grawert <ogra@ubuntu.com> Thu, 11 Jul 2013 16:34:34 +0200
livecd-rootfs (2.155) saucy; urgency=low
* try to hand the exported $NOW over from live-build/auto/config as

3
live-build/auto/config
View File

@ -89,8 +89,6 @@ PREINSTALL_POOL_SEEDS=
CHROOT_HOOKS=
BINARY_HOOKS=
BUILDSTAMP="${NOW}"
add_chroot_hook ()
{
CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1"
@ -399,6 +397,7 @@ lb config noauto \
echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary
case $PROJECT in
ubuntu-server)