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

Import patches-unapplied version 2.36 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 99d9759e40c30685af6759cae6e5d9bbed8cc6f7

New changelog entries:
  [ Colin Watson ]
  * BuildLiveCD: Add subproject and ubuntu-defaults-image locale to error
    mail subject.
  * BuildLiveCD: Install recommendations of ubuntu-defaults-builder.
  [ Oliver Grawert ]
  * also store the size of the ac100 tarball in the initrd, since the tarball 
    changes its name several times during build we need a second criteria to not
    loop over all availiable tarballs with md5sum at install time.
This commit is contained in:
Oliver Grawert 2011-09-06 15:25:52 +02:00 committed by usd-importer
parent 99d9759e40
commit 3bad58702f
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BuildLiveCD
View File

@ -14,7 +14,7 @@ finish() {
fi fi
if [ "$SEND_LOG" = "yes" ]; then if [ "$SEND_LOG" = "yes" ]; then
exec >/dev/null 2>&1 exec >/dev/null 2>&1
mailx -s "LiveCD: $STATUS $STE:$FS${SUBARCH:+-$SUBARCH} build on ${ARCH}" buildd+porters < "$BUILD_LOG" mailx -s "LiveCD: $STATUS $STE:$FS${SUBPROJECT:+-$SUBPROJECT}${SUBARCH:+-$SUBARCH}${UBUNTU_DEFAULTS_LOCALE:+-$UBUNTU_DEFAULTS_LOCALE} build on ${ARCH}" buildd+porters < "$BUILD_LOG"
fi fi
rm -f ~/buildLiveCD.lock rm -f ~/buildLiveCD.lock
nohup ~/bin/pruneLiveCD >/dev/null 2>&1 & nohup ~/bin/pruneLiveCD >/dev/null 2>&1 &
@ -114,7 +114,8 @@ for STE in $SUITES; do
if [ -d ~/build-${STE}-live/chroot-${STE} ]; then if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs ubuntu-defaults-builder || true sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y --install-recommends ubuntu-defaults-builder || true
fi fi
done done
for STE in $SUITES; do for STE in $SUITES; do

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
livecd-rootfs (2.36) oneiric; urgency=low
[ Colin Watson ]
* BuildLiveCD: Add subproject and ubuntu-defaults-image locale to error
mail subject.
* BuildLiveCD: Install recommendations of ubuntu-defaults-builder.
[ Oliver Grawert ]
* also store the size of the ac100 tarball in the initrd, since the tarball
changes its name several times during build we need a second criteria to not
loop over all availiable tarballs with md5sum at install time.
-- Oliver Grawert <ogra@ubuntu.com> Tue, 06 Sep 2011 15:25:52 +0200
livecd-rootfs (2.35) oneiric; urgency=low livecd-rootfs (2.35) oneiric; urgency=low
* Set KERNEL_FLAVOURS for mx5. * Set KERNEL_FLAVOURS for mx5.

3
live-build/auto/build
View File

@ -184,8 +184,9 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
fi fi
if [ "$SUBARCH" = "ac100" ]; then if [ "$SUBARCH" = "ac100" ]; then
# create the md5sum file for which we are actually doing all this # create the md5sum and size files for which we are actually doing all this
md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5 md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size
# make sure update-initramfs feels cosy and warm in the environment # make sure update-initramfs feels cosy and warm in the environment
lb chroot_proc install "$@" lb chroot_proc install "$@"