diffstat for live-build-3.0~a24 live-build-3.0~a24 changelog | 322 +++++++++++++++++++ control | 7 patches/00git_precise_release.patch | 18 + patches/build-wubildr.patch | 45 ++ patches/examples-auto-config-typo.patch | 17 + patches/kubuntu-gnome-icon-cache.patch | 19 + patches/series | 23 + patches/stop-looking-for-kernels.patch | 15 patches/ubuntu-apt-xapian-index.patch | 25 + patches/ubuntu-armhf-support.patch | 11 patches/ubuntu-casper-normalisation.patch | 29 + patches/ubuntu-chroot_hacks-clean-tmpdirs.patch | 17 + patches/ubuntu-chroot_hacks-dbus-id.patch | 19 + patches/ubuntu-chroot_packages_install.patch | 19 + patches/ubuntu-ext-inodes.patch | 30 + patches/ubuntu-ext4.patch | 395 ++++++++++++++++++++++++ patches/ubuntu-gfxboot-theme.patch | 48 ++ patches/ubuntu-i386-generic-pae.patch | 46 ++ patches/ubuntu-kernel-img-conf.patch | 32 + patches/ubuntu-mlocate.patch | 25 + patches/ubuntu-ports-location.patch | 59 +++ patches/ubuntu-powerpc-smp.patch | 31 + patches/ubuntu-pyc-purge.patch | 31 + patches/ubuntu-resolvconf.patch | 39 ++ patches/ubuntu-syslinux-theme.patch | 20 + patches/ubuntu-timestamp.patch | 34 ++ patches/wubi-initramfs-framebuffer.patch | 19 + rules | 3 28 files changed, 1395 insertions(+), 3 deletions(-) diff -Nru live-build-3.0~a24/debian/changelog live-build-3.0~a24/debian/changelog --- live-build-3.0~a24/debian/changelog 2011-07-13 08:43:36.000000000 +0000 +++ live-build-3.0~a24/debian/changelog 2012-04-20 16:45:28.000000000 +0000 @@ -1,3 +1,238 @@ +live-build (3.0~a24-1ubuntu32) precise; urgency=low + + * Revert 3.0~a24-1ubuntu31; Wubi uses an old resize2fs which apparently + can't handle ext4. + + -- Colin Watson Fri, 20 Apr 2012 17:45:27 +0100 + +live-build (3.0~a24-1ubuntu31) precise; urgency=low + + * build-wubildr.patch: Switch wubi from ext3 to ext4 (LP: #859552) + + -- Adam Conrad Wed, 18 Apr 2012 14:54:48 -0600 + +live-build (3.0~a24-1ubuntu30) precise; urgency=low + + * ubuntu-kernel-img-conf.patch: On some architectures (notably powerpc), + create /etc/kernel-img.conf with the default contents plus 'link_on_boot + yes'. This matches the behaviour of base-installer/library.sh more + closely (LP: #958839). + + -- Colin Watson Wed, 18 Apr 2012 13:10:04 +0100 + +live-build (3.0~a24-1ubuntu29) precise; urgency=low + + * ubuntu-powerpc-smp.patch: Switch from powerpc to powerpc-smp kernel. + + -- Adam Conrad Tue, 20 Mar 2012 10:07:07 -0600 + +live-build (3.0~a24-1ubuntu28) precise; urgency=low + + * Add 00git_precise_release.patch: Add "precise" release version to + releases.sh. Backported from current Debian version. (LP: #941604) + + -- Martin Pitt Mon, 12 Mar 2012 11:18:41 +0100 + +live-build (3.0~a24-1ubuntu27) precise; urgency=low + + * debian/patches/examples-auto-config-typo.patch: Fixing left over + use of --packages-lists in examples/auto/config (LP: #923355) + + -- Rigved Rakshit Fri, 24 Feb 2012 16:10:47 +0530 + +live-build (3.0~a24-1ubuntu26) precise; urgency=low + + * build-wubildr.patch: Revert wubi ext4 switch, until the buildds + are running kernels that can actually mount ext4 filesystems. + + -- Adam Conrad Thu, 23 Feb 2012 09:26:02 -0700 + +live-build (3.0~a24-1ubuntu25) precise; urgency=low + + * build-wubildr.patch: Switch wubi from ext3 to ext4 (LP: #859552) + + -- Adam Conrad Wed, 22 Feb 2012 12:18:53 -0700 + +live-build (3.0~a24-1ubuntu24) precise; urgency=low + + * Revert ubuntu-chroot_hacks-clean-tmpdirs.patch for now, since + chroot_hacks clearly runs too early in the build, before we + umount various filesystems; need to rethink this (LP: #938867) + + -- Adam Conrad Wed, 22 Feb 2012 11:42:53 -0700 + +live-build (3.0~a24-1ubuntu23) precise; urgency=low + + * ubuntu-resolvconf.patch: If chroot/etc/resolvconf/resolv.conf.d + exists, tidy up the original and tail files, which are artifacts + of the build (and leak the host system's resolv.conf) + * ubuntu-chroot_hacks-clean-tmpdirs.patch: Clean out more cruft + in chroot/run, chroot/tmp, chroot/var/run, and chroot/var/tmp + + -- Adam Conrad Tue, 21 Feb 2012 16:33:43 -0700 + +live-build (3.0~a24-1ubuntu22) precise; urgency=low + + * Add ubuntu-resolvconf.patch: If /etc/resolv.conf is a dangling symlink, + test -e will return 1 and so lb_chroot_resolv won't move it to .orig. + This then causes cp to fail copying the buildd /etc/resolv.conf and + makes the whole build fail. + Instead, make it also do a test -L to detect symlinks. In such case, + also move it to .orig but don't Truncate it as that'd fail. + + -- Stéphane Graber Thu, 26 Jan 2012 22:15:54 -0500 + +live-build (3.0~a24-1ubuntu21) precise; urgency=low + + * Backport from upstream: + - Print the current time before starting a command with the lb wrapper + script (closes: #630089). + + -- Colin Watson Thu, 12 Jan 2012 23:17:19 +0000 + +live-build (3.0~a24-1ubuntu20) precise; urgency=low + + * Use i386 -generic-pae kernel flavour on Ubuntu >= precise (LP: #897786). + + -- Colin Watson Thu, 15 Dec 2011 16:24:29 +0000 + +live-build (3.0~a24-1ubuntu19) precise; urgency=low + + * ubuntu-armhf-support.patch: Mirror armel (non-)support as armhf + + -- Adam Conrad Fri, 02 Dec 2011 11:29:36 -0700 + +live-build (3.0~a24-1ubuntu18) precise; urgency=low + + * Generate an initramfs that uses the framebuffer for Wubi disk image + installs. + + -- Evan Dandrea Mon, 17 Oct 2011 11:15:06 +0100 + +live-build (3.0~a24-1ubuntu17) oneiric; urgency=low + + * Remove /var/lib/dbus/machine-id in lb_chroot_hacks to prevent every + machine installed from our media having the same ID. This is a + regression from the previous livecd-rootfs behaviour (LP: #322830) + + -- Adam Conrad Wed, 12 Oct 2011 12:11:16 +0100 + +live-build (3.0~a24-1ubuntu16) oneiric; urgency=low + + * Add ubuntu-chroot_packages_install.patch: Our current live-build version + only half-transitioned away from the *_local() functions. Put back the + call to lb chroot_local-packages, so that packages installed into + chroot/root/packages/ actually get installed. This is fixed properly in + 3.0~a25-1, so this can be dropped again at the next merge. (LP: #857494) + + -- Martin Pitt Wed, 28 Sep 2011 11:34:06 +0200 + +live-build (3.0~a24-1ubuntu15) oneiric; urgency=low + + * Backport from upstream: + - Add support for ext4 for binary and chroot filesystems (LP: #803547). + + -- Colin Watson Mon, 19 Sep 2011 18:26:17 +0100 + +live-build (3.0~a24-1ubuntu14) oneiric; urgency=low + + * Drop gnu-fdisk from Recommends to Suggests; it's only used for USB + images. + + -- Colin Watson Wed, 14 Sep 2011 14:02:26 +0100 + +live-build (3.0~a24-1ubuntu13) oneiric; urgency=low + + * Mimic livecd-rootfs's handling of inodes on ext* filesystems to + reduce the pain of resizing preinstalled images. (LP: #836810) + + -- Adam Conrad Mon, 29 Aug 2011 10:34:20 -0600 + +live-build (3.0~a24-1ubuntu12) oneiric; urgency=low + + * Look for the proper filename for the Wubi disk image in GRUB. + + -- Evan Dandrea Wed, 17 Aug 2011 12:32:10 +0100 + +live-build (3.0~a24-1ubuntu11) oneiric; urgency=low + + * Make sure the root disk appears in ubuntu/disks for Wubi. + + -- Evan Dandrea Tue, 16 Aug 2011 18:08:53 +0100 + +live-build (3.0~a24-1ubuntu10) oneiric; urgency=low + + * Copy gfxboot theme when building for Ubuntu. + * Only modify live.cfg for casper if it exists. + * Drop Recommends on live-boot-doc and live-config-doc for now, until such + time as we switch away from casper. + + -- Colin Watson Thu, 11 Aug 2011 18:58:41 +0100 + +live-build (3.0~a24-1ubuntu9) oneiric; urgency=low + + * set -e the Wubi hook. + + -- Evan Dandrea Tue, 26 Jul 2011 15:11:51 +0100 + +live-build (3.0~a24-1ubuntu8) oneiric; urgency=low + + * Make sure /host exists for Wubi. + + -- Evan Dandrea Tue, 26 Jul 2011 15:00:07 +0100 + +live-build (3.0~a24-1ubuntu7) oneiric; urgency=low + + * Revert previous change. That won't work at all. + + -- Evan Dandrea Mon, 25 Jul 2011 18:34:31 +0100 + +live-build (3.0~a24-1ubuntu6) oneiric; urgency=low + + * Generate the grub.cfg file for Wubi. + + -- Evan Dandrea Mon, 25 Jul 2011 18:03:48 +0100 + +live-build (3.0~a24-1ubuntu5) oneiric; urgency=low + + * There's no need for a wubi prefix on the resulting archive, and it + would require special-casing in cdimage. + + -- Evan Dandrea Mon, 18 Jul 2011 14:26:43 +0100 + +live-build (3.0~a24-1ubuntu4) oneiric; urgency=low + + * Forgot to move filesystem.ext3 to root.disk. Oops. + + -- Evan Dandrea Mon, 18 Jul 2011 09:21:18 +0100 + +live-build (3.0~a24-1ubuntu3) oneiric; urgency=low + + * Compress wubildr and the ext3 disk image for Wubi. + + -- Evan Dandrea Mon, 18 Jul 2011 01:02:39 +0100 + +live-build (3.0~a24-1ubuntu2) oneiric; urgency=low + + * Add stop-looking-for-kernels.patch, to stop trying to fiddle with + non-existent kernels when we explicitely didn't install any. + + -- Adam Conrad Fri, 15 Jul 2011 00:15:56 -0600 + +live-build (3.0~a24-1ubuntu1) oneiric; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Update the mlocate database (Debian #627332). + - Update the Apt Xapian index (Debian #627716). + - Add Kubuntu hook to remove GNOME icon cache (Debian #630088). + - Add hook to remove .pyc files (Debian #631281). + - Add wubildr build support. + - Use the correct mirror locations for Ubuntu ports. + - Fix up live.cfg for casper. + * Fix spelling of ubuntu-casper-normalisation patch. + + -- Colin Watson Wed, 13 Jul 2011 18:57:48 +0100 + live-build (3.0~a24-1) experimental; urgency=low [ Richard Nelson ] @@ -70,6 +305,73 @@ -- Daniel Baumann Wed, 29 Jun 2011 06:18:11 +0200 +live-build (3.0~a21-1ubuntu9) oneiric; urgency=low + + * drop patch to lb_binary_disk. According to upstream + (http://tinyurl.com/5vu3wpj), this needs to be done via some hook if + desired. Otherwise it becomes impossible to create images with more + than one kernel. + + -- Reinhard Tartler Sun, 10 Jul 2011 19:22:55 +0200 + +live-build (3.0~a21-1ubuntu8) oneiric; urgency=low + + * lb_binary_disk: Rename kernel paths to match what live.cfg in the + themes packages refer to. + * Fixup live.cfg for casper. + + -- Reinhard Tartler Sun, 10 Jul 2011 10:31:44 +0200 + +live-build (3.0~a21-1ubuntu7) oneiric; urgency=low + + * Link wubildr so BuildLiveCD can find it. + + -- Evan Dandrea Wed, 06 Jul 2011 12:40:21 +0100 + +live-build (3.0~a21-1ubuntu6) oneiric; urgency=low + + * Use the correct mirror locations for Ubuntu ports. + + -- Adam Conrad Wed, 06 Jul 2011 10:34:28 +0000 + +live-build (3.0~a21-1ubuntu5) oneiric; urgency=low + + * Add wubildr build support. + + -- Evan Dandrea Mon, 04 Jul 2011 17:37:03 +0100 + +live-build (3.0~a21-1ubuntu4) oneiric; urgency=low + + * Add hook to remove .pyc files (Debian #631281). + + -- Colin Watson Wed, 22 Jun 2011 15:36:51 +0100 + +live-build (3.0~a21-1ubuntu3) oneiric; urgency=low + + * Fix default for LB_PARENT_ARCHIVE_AREAS (Debian #630604). + + -- Colin Watson Wed, 15 Jun 2011 22:37:03 +0100 + +live-build (3.0~a21-1ubuntu2) oneiric; urgency=low + + * Make --architectures armel only fail if --linux-flavours was not passed + (Debian #630464). + + -- Colin Watson Tue, 14 Jun 2011 09:11:02 +0100 + +live-build (3.0~a21-1ubuntu1) oneiric; urgency=low + + [ Colin Watson ] + * Resynchronise with Debian. Remaining changes: + - Update the mlocate database (Debian #627332). + - Update the Apt Xapian index (Debian #627716). + - Add Kubuntu hook to remove GNOME icon cache (Debian #630088). + + [ Daniel Baumann ] + * Using -wildcards option when calling mksquashfs with an excludes file. + + -- Colin Watson Mon, 13 Jun 2011 20:41:17 +0100 + live-build (3.0~a21-1) unstable; urgency=low [ Daniel Baumann ] @@ -88,6 +390,26 @@ -- Daniel Baumann Mon, 13 Jun 2011 20:42:13 +0200 +live-build (3.0~a20-1ubuntu1) oneiric; urgency=low + + [ Daniel Baumann ] + * Obtaining the live passes package selection information at the latest + point to catch all other modifications in the package selection. + * Moving installation of live packages to second pass. + * Removing now unnecessary stagefile check in lb_source. + + [ Colin Watson ] + * Update the mlocate database (Debian #627332). + * Add an option to remove the kernel and initrd from the compressed + filesystem (Debian #627665). + * Add --initramfs-compression option (Debian #627677). + * Update the Apt Xapian index (Debian #627716). + * Add --swap-file-path and --swap-file-size options (Debian #629637). + * Add Kubuntu hook to remove GNOME icon cache (Debian #630088). + * Divert flash-kernel aside while building the chroot (Debian #630350). + + -- Colin Watson Mon, 13 Jun 2011 10:36:46 +0100 + live-build (3.0~a20-1) unstable; urgency=low [ Daniel Baumann ] diff -Nru live-build-3.0~a24/debian/control live-build-3.0~a24/debian/control --- live-build-3.0~a24/debian/control 2011-07-13 08:43:36.000000000 +0000 +++ live-build-3.0~a24/debian/control 2011-09-14 13:02:13.000000000 +0000 @@ -1,7 +1,8 @@ Source: live-build Section: misc Priority: optional -Maintainer: Debian Live Project +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Live Project Uploaders: Daniel Baumann Build-Depends: debhelper (>= 8) Build-Depends-Indep: gettext @@ -13,11 +14,11 @@ Package: live-build Architecture: all Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static -Recommends: live-boot-doc, live-config-doc, cpio, gettext-base, gnu-fdisk +Recommends: cpio, gettext-base Suggests: dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub, - uuid-runtime, win32-loader + uuid-runtime, win32-loader, gnu-fdisk Description: Debian Live - System Build Scripts live-build contains the scripts that build a Debian Live system image from a configuration directory. diff -Nru live-build-3.0~a24/debian/patches/00git_precise_release.patch live-build-3.0~a24/debian/patches/00git_precise_release.patch --- live-build-3.0~a24/debian/patches/00git_precise_release.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/00git_precise_release.patch 2012-03-12 10:18:25.000000000 +0000 @@ -0,0 +1,18 @@ +From 171207435f8a2b573a9f373747733b0fdfdbcca6 Mon Sep 17 00:00:00 2001 +From: Daniel Baumann +Date: Fri, 28 Oct 2011 14:31:36 +0200 +Subject: [PATCH] Adding precise in releases list. + +--- + functions/releases.sh | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +Index: live-build-3.0~a24/functions/releases.sh +=================================================================== +--- live-build-3.0~a24.orig/functions/releases.sh 2011-07-13 02:56:18.000000000 +0200 ++++ live-build-3.0~a24/functions/releases.sh 2012-03-12 11:18:18.503505128 +0100 +@@ -24,3 +24,4 @@ + RELEASE_maverick="10.10" # 2012-04-01 + RELEASE_natty="11.04" # 2012-10-01 + RELEASE_oneiric="11.10" ++RELEASE_precise="12.04" # LTS: 2017-04-01 diff -Nru live-build-3.0~a24/debian/patches/build-wubildr.patch live-build-3.0~a24/debian/patches/build-wubildr.patch --- live-build-3.0~a24/debian/patches/build-wubildr.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/build-wubildr.patch 2012-04-20 16:44:55.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Build the wubildr bootloader for Wubi +Author: Evan Dandrea +Last-Update: 2011-07-04 + +Index: b/examples/hooks/ubuntu_binary_build-wubildr.sh +=================================================================== +--- /dev/null ++++ b/examples/hooks/ubuntu_binary_build-wubildr.sh +@@ -0,0 +1,36 @@ ++#! /bin/sh ++set -e ++ ++# This is a hook for live-build(7) to build the wubildr bootloader for Wubi ++# To enable it, copy or symlink this hook into your config/binary_local-hooks ++# directory. ++ ++CHROOT="$(mktemp -d)" ++# grub-mkimage needs to be able to find the source file of the loopback image ++# in the location that losetup knows it is; however, in a chroot this file wont ++# be present, so we need to make it so by the magic of bind mounts: ++mkdir -p "ubuntu/disks" ++# FIXME: swap these next two lines around when the buildds can handle ext4: ++# mv "binary/boot/filesystem.ext4" "ubuntu/disks/root.disk" ++mv "binary/boot/filesystem.ext3" "ubuntu/disks/root.disk" ++mount -o loop "ubuntu/disks/root.disk" "$CHROOT" ++# Save the directory structure mkdir created, so that it can be removed later. ++REMOVE="$(mkdir -pv "$CHROOT$PWD" | head -n1 | sed "s,.*\`\(.*\)',\1,")" ++mount -o bind "$PWD" "$CHROOT$PWD" ++chroot "$CHROOT" mount -t proc proc /proc ++# Expected to already exist. ++touch wubildr ++# grub-install cries unless you point it at something. ++chroot "$CHROOT" grub-install /dev/null ++umount "$CHROOT/proc" ++umount "$CHROOT$PWD" ++rm -rf "$REMOVE" ++# /host is normally created by partman-auto-loop. ++mkdir "$CHROOT/host" ++umount "$CHROOT" ++mv wubildr binary/boot ++# Link output files somewhere BuildLiveCD will be able to find them. ++PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}" ++mv ubuntu/disks/root.disk binary/boot/root.disk ++rmdir -p ubuntu/disks ++tar cf - -C binary/boot root.disk wubildr | xz -9 > "$PREFIX.tar.xz" diff -Nru live-build-3.0~a24/debian/patches/examples-auto-config-typo.patch live-build-3.0~a24/debian/patches/examples-auto-config-typo.patch --- live-build-3.0~a24/debian/patches/examples-auto-config-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/examples-auto-config-typo.patch 2012-02-27 21:08:40.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Removed left over use of --packages-lists in examples/auto/config. + Correct usage is --package-lists, as shown here: + http://live.debian.net/manual/html/live-manual.en.html#319 +Author: Rigved Rakshit +Bug-Ubuntu: https://launchpad.net/bugs/923355 + +Index: live-build-3.0~a24/examples/auto/config +=================================================================== +--- live-build-3.0~a24.orig/examples/auto/config 2011-07-13 06:26:18.000000000 +0530 ++++ live-build-3.0~a24/examples/auto/config 2012-02-24 16:10:39.699666992 +0530 +@@ -1,5 +1,5 @@ + #!/bin/sh + + lb config noauto \ +- --packages-lists "standard" \ ++ --package-lists "standard" \ + "${@}" diff -Nru live-build-3.0~a24/debian/patches/kubuntu-gnome-icon-cache.patch live-build-3.0~a24/debian/patches/kubuntu-gnome-icon-cache.patch --- live-build-3.0~a24/debian/patches/kubuntu-gnome-icon-cache.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/kubuntu-gnome-icon-cache.patch 2011-07-13 17:54:11.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Add Kubuntu hook to remove GNOME icon cache +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/630088 +Forwarded: http://bugs.debian.org/630088 +Last-Update: 2011-06-11 + +Index: b/examples/hooks/kubuntu_chroot_icon-theme.sh +=================================================================== +--- /dev/null ++++ b/examples/hooks/kubuntu_chroot_icon-theme.sh +@@ -0,0 +1,8 @@ ++#! /bin/sh ++ ++# This is a hook for live-build(7) to remove the GNOME icon cache for ++# Kubuntu builds. ++# To enable it, copy or symlink this hook into your config/chroot_local-hooks ++# directory. ++ ++rm -f /usr/share/icons/*/icon-theme.cache diff -Nru live-build-3.0~a24/debian/patches/series live-build-3.0~a24/debian/patches/series --- live-build-3.0~a24/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/series 2012-04-18 11:52:55.000000000 +0000 @@ -0,0 +1,23 @@ +00git_precise_release.patch +ubuntu-mlocate.patch +ubuntu-apt-xapian-index.patch +kubuntu-gnome-icon-cache.patch +ubuntu-pyc-purge.patch +build-wubildr.patch +ubuntu-ports-location.patch +ubuntu-casper-normalisation.patch +stop-looking-for-kernels.patch +ubuntu-gfxboot-theme.patch +ubuntu-syslinux-theme.patch +ubuntu-ext-inodes.patch +ubuntu-ext4.patch +ubuntu-chroot_packages_install.patch +ubuntu-chroot_hacks-dbus-id.patch +wubi-initramfs-framebuffer.patch +ubuntu-armhf-support.patch +ubuntu-i386-generic-pae.patch +ubuntu-timestamp.patch +ubuntu-resolvconf.patch +examples-auto-config-typo.patch +ubuntu-powerpc-smp.patch +ubuntu-kernel-img-conf.patch diff -Nru live-build-3.0~a24/debian/patches/stop-looking-for-kernels.patch live-build-3.0~a24/debian/patches/stop-looking-for-kernels.patch --- live-build-3.0~a24/debian/patches/stop-looking-for-kernels.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/stop-looking-for-kernels.patch 2011-07-15 06:20:15.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Stop trying to fiddle with non-existent kernels when + we explicitely didn't install any via --linux-packages=none +Author: Adam Conrad + +--- live-build-3.0~a24.orig/scripts/build/lb_binary_linux-image ++++ live-build-3.0~a24/scripts/build/lb_binary_linux-image +@@ -24,7 +24,7 @@ Arguments "${@}" + Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source + Set_defaults + +-if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] ++if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LB_LINUX_PACKAGES}" = "none" ] + then + exit 0 + fi diff -Nru live-build-3.0~a24/debian/patches/ubuntu-apt-xapian-index.patch live-build-3.0~a24/debian/patches/ubuntu-apt-xapian-index.patch --- live-build-3.0~a24/debian/patches/ubuntu-apt-xapian-index.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-apt-xapian-index.patch 2011-07-13 17:54:11.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Update the APT Xapian index +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/627716 +Forwarded: http://bugs.debian.org/627716 +Last-Update: 2011-06-11 + +Index: b/scripts/build/lb_chroot_hacks +=================================================================== +--- a/scripts/build/lb_chroot_hacks ++++ b/scripts/build/lb_chroot_hacks +@@ -222,6 +222,14 @@ + Chroot chroot updatedb.mlocate + fi + ++# Update the Apt Xapian index. The package would do this itself, but (a) it ++# checks policy-rc.d which says it isn't allowed to, and (b) it wants to ++# build the index in the background which will be racy in the context of ++# live-build. ++if [ -x chroot/usr/sbin/update-apt-xapian-index ]; then ++ Chroot chroot /usr/sbin/update-apt-xapian-index --force --quiet ++fi ++ + # Remove build systems clock drift + echo "0.0 0 0.0" > chroot/etc/adjtime + diff -Nru live-build-3.0~a24/debian/patches/ubuntu-armhf-support.patch live-build-3.0~a24/debian/patches/ubuntu-armhf-support.patch --- live-build-3.0~a24/debian/patches/ubuntu-armhf-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-armhf-support.patch 2011-12-02 18:28:59.000000000 +0000 @@ -0,0 +1,11 @@ +--- live-build-3.0~a24/functions/defaults.sh.orig 2011-12-02 11:27:35.000000000 -0700 ++++ live-build-3.0~a24/functions/defaults.sh 2011-12-02 11:28:27.000000000 -0700 +@@ -592,7 +592,7 @@ + + # Setting linux flavour string + case "${LB_ARCHITECTURES}" in +- armel) ++ armel|armhf) + if [ -z "${LB_LINUX_FLAVOURS}" ] + then + Echo_error "There is no default kernel flavour defined for your architecture." diff -Nru live-build-3.0~a24/debian/patches/ubuntu-casper-normalisation.patch live-build-3.0~a24/debian/patches/ubuntu-casper-normalisation.patch --- live-build-3.0~a24/debian/patches/ubuntu-casper-normalisation.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-casper-normalisation.patch 2011-08-11 12:34:50.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Fixup live.cfg for casper +Author: Reinhard Tartler +Last-Update: 2011-07-10 + +live.cfg from the themes package include a 'boot=live' parameter, which works only +for live-config. casper OTOH requires 'boot=casper' + + +Index: b/scripts/build/lb_binary_syslinux +=================================================================== +--- a/scripts/build/lb_binary_syslinux ++++ b/scripts/build/lb_binary_syslinux +@@ -100,8 +100,16 @@ + then + sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + ${_SUFFIX}/live.cfg ++ ++ case "${LB_INITRAMFS}" in ++ casper) ++ sed -i -e "s|boot=live|boot=casper|" \ ++ ${_SUFFIX}/live.cfg ++ ;; ++ esac + fi + ++ + if [ -e ${_SUFFIX}/install.cfg ] + then + sed -i -e "s|@LB_BOOTAPPEND_INSTALL@|${LB_BOOTAPPEND_INSTALL}|g" \ diff -Nru live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch --- live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch 2012-02-22 00:14:04.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Clean up chroot/tmp chroot/run chroot/var/tmp chroot/var/run +Author: Adam Conrad + +--- live-build-3.0~a24.orig/scripts/build/lb_chroot_hacks ++++ live-build-3.0~a24/scripts/build/lb_chroot_hacks +@@ -248,6 +248,11 @@ rm -f chroot/var/cache/debconf/*-old + rm -f chroot/var/lib/dpkg/*-old + rm -f chroot/var/lib/dbus/machine-id + rm -f chroot/var/log/apt/term.log ++# Some of these are sometimes symlinks, but it never hurts to be thorough ++rm -rf chroot/run/* ++rm -rf chroot/tmp/* ++rm -rf chroot/var/run/* ++rm -rf chroot/var/tmp/* + + if [ -n "${LB_ROOT_COMMAND}" ] + then diff -Nru live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-dbus-id.patch live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-dbus-id.patch --- live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-dbus-id.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-dbus-id.patch 2011-10-12 11:18:19.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Remove /var/lib/dbus/machine-id + . + * Remove /var/lib/dbus/machine-id in lb_chroot_hacks to prevent every + machine installed from our media having the same ID. This is a + regression from the previous livecd-rootfs behaviour (LP: #322830) +Author: Adam Conrad +Bug-Ubuntu: https://bugs.launchpad.net/bugs/322830 + +--- +--- live-build-3.0~a24.orig/scripts/build/lb_chroot_hacks ++++ live-build-3.0~a24/scripts/build/lb_chroot_hacks +@@ -240,6 +240,7 @@ rm -f chroot/etc/group- chroot/etc/passw + rm -f chroot/etc/gshadow- chroot/etc/shadow- + rm -f chroot/var/cache/debconf/*-old + rm -f chroot/var/lib/dpkg/*-old ++rm -f chroot/var/lib/dbus/machine-id + rm -f chroot/var/log/apt/term.log + + if [ -n "${LB_ROOT_COMMAND}" ] diff -Nru live-build-3.0~a24/debian/patches/ubuntu-chroot_packages_install.patch live-build-3.0~a24/debian/patches/ubuntu-chroot_packages_install.patch --- live-build-3.0~a24/debian/patches/ubuntu-chroot_packages_install.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-chroot_packages_install.patch 2011-09-28 09:41:12.000000000 +0000 @@ -0,0 +1,19 @@ +Description: scripts/build/lb_chroot: Our current live-build version only + half-transitioned away from the *_local() functions. Put back the call to + lb chroot_local-packages, so that packages installed into + chroot/root/packages/ actually get installed. This is fixed properly in + 3.0~a25-1, so this can be dropped again at the next merge. +Author: Martin Pitt +Bug-Ubuntu: https://launchpad.net/bugs/857494 +Bug-Debian: http://bugs.debian.org/635046 + +--- live-build-3.0~a24.orig/scripts/build/lb_chroot ++++ live-build-3.0~a24/scripts/build/lb_chroot +@@ -50,6 +50,7 @@ lb chroot_resolv install ${*} + lb chroot_hostname install ${*} + lb chroot_apt install ${*} + lb chroot_archives install ${*} ++lb chroot_local-packages ${*} + + # Customizing chroot + lb chroot_linux-image ${*} diff -Nru live-build-3.0~a24/debian/patches/ubuntu-ext-inodes.patch live-build-3.0~a24/debian/patches/ubuntu-ext-inodes.patch --- live-build-3.0~a24/debian/patches/ubuntu-ext-inodes.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-ext-inodes.patch 2011-08-29 16:41:46.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Upstream changes introduced in version 3.0~a24-1ubuntu13 + . + * Mimic livecd-rootfs's handling of inodes on ext* filesystems to + reduce the pain of resizing preinstalled images. (LP: #836810) + . + * This patch is a dirty hack, and needs some TLC and generalisation + before it's reasonably upstreamable. +Author: Adam Conrad +Bug-Ubuntu: https://bugs.launchpad.net/bugs/836810 + +--- live-build-3.0~a24.orig/scripts/build/lb_binary_rootfs ++++ live-build-3.0~a24/scripts/build/lb_binary_rootfs +@@ -122,7 +122,7 @@ case "${LB_CHROOT_FILESYSTEM}" in + case "${LB_BUILD_WITH_CHROOT}" in + true) + dd if=/dev/zero of=chroot/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM} +- Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 filesystem.${LB_CHROOT_FILESYSTEM}" ++ Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -i 8192 -m 0 filesystem.${LB_CHROOT_FILESYSTEM}" + + mkdir -p filesystem.tmp + ${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp +@@ -187,7 +187,7 @@ case "${LB_CHROOT_FILESYSTEM}" in + + false) + dd if=/dev/zero of=binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM} +- mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} ++ mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -i 8192 -m 0 binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} + + mkdir -p filesystem.tmp + ${LB_ROOT_COMMAND} mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp diff -Nru live-build-3.0~a24/debian/patches/ubuntu-ext4.patch live-build-3.0~a24/debian/patches/ubuntu-ext4.patch --- live-build-3.0~a24/debian/patches/ubuntu-ext4.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-ext4.patch 2011-09-19 17:25:49.000000000 +0000 @@ -0,0 +1,395 @@ +Description: Add support for ext4 for binary and chroot filesystems +Author: Ben Howard +Author: Daniel Baumann +Author: intrigeri +Origin: backport, http://live.debian.net/gitweb?p=live-build.git;a=commitdiff;h=5d2fbf5d5adfd82f59b039d914c09e5dbca8296b +Bug-Ubuntu: https://bugs.launchpad.net/bugs/803547 +Forwarded: not-needed +Last-Update: 2011-09-19 + +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -772,7 +772,7 @@ + # Setting image filesystem + case "${LB_ARCHITECTURES}" in + sparc) +- LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext2}" ++ LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}" + ;; + + *) +Index: b/manpages/de/lb_config.de.1 +=================================================================== +--- a/manpages/de/lb_config.de.1 ++++ b/manpages/de/lb_config.de.1 +@@ -36,7 +36,7 @@ + .br + [\-b|\fB\-\-binary\-images\fP iso|iso\-hybrid|net|tar|usb\-hdd] + .br +- [\fB\-\-binary\-filesystem\fP fat16|fat32|ext2] ++ [\fB\-\-binary\-filesystem\fP fat16|fat32|ext2|ext3|ext4] + .br + [\fB\-\-bootappend\-install\fP \fIPARAMETER\fP|\fI"PARAMETERS"\fP] + .br +@@ -64,7 +64,7 @@ + .br + [\fB\-\-build\-with\-chroot\fP true|false] + .br +- [\fB\-\-chroot\-filesystem\fP ext2|ext3|squashfs|plain|jffs2] ++ [\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|plain|jffs2] + .br + [\fB\-\-clean\fP] + .br +@@ -320,13 +320,13 @@ + defines the image type to build. By default, for images using syslinux this + is set to iso\-hybrid to build CD/DVD images that may also be used like + usb\-hdd images, for non\-syslinux images, it defaults to iso. +-.IP "\fB\-\-binary\-filesystem\fP fat16|fat32|ext2" 4 ++.IP "\fB\-\-binary\-filesystem\fP fat16|fat32|ext2|ext3|ext4" 4 + defines the filesystem to be used in the image type. This only has an effect + if the selected binary image type does allow to choose a filesystem. For + example, when selection iso the resulting CD/DVD has always the filesystem + ISO9660. When building usb\-hdd images for usb sticks, this is active. Note + that it defaults to fat16 on all architectures except sparc where it +-defaults to ext2. Also note that if you choose fat16 and your resulting ++defaults to ext4. Also note that if you choose fat16 and your resulting + binary image gets bigger than 2GB, the binary filesystem automatically gets + switched to fat32. + .IP "\fB\-\-bootappend\-install\fP \fIPARAMETER\fP|\(dq\fIPARAMETERS\fP\(dq" 4 +@@ -402,7 +402,7 @@ + build\-time in the target distribution. Never do disable this option unless + you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI + understood its consequences.\fP +-.IP "\fB\-\-chroot\-filesystem\fP ext2|ext3|squashfs|plain|jffs2" 4 ++.IP "\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|plain|jffs2" 4 + defines which filesystem type should be used for the root filesystem + image. If you use plain, then no filesystem image is created and the root + filesystem content is copied on the binary image filesystem as flat +Index: b/manpages/en/lb_config.1 +=================================================================== +--- a/manpages/en/lb_config.1 ++++ b/manpages/en/lb_config.1 +@@ -31,7 +31,7 @@ + .br + [\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|net|tar|usb\-hdd] + .br +- [\fB\-\-binary\-filesystem\fR fat16|fat32|ext2] ++ [\fB\-\-binary\-filesystem\fR fat16|fat32|ext2|ext3|ext4] + .br + [\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR] + .br +@@ -59,7 +59,7 @@ + .br + [\fB\-\-build\-with\-chroot\fR true|false] + .br +- [\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2] ++ [\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|plain|jffs2] + .br + [\fB\-\-clean\fR] + .br +@@ -275,8 +275,8 @@ + defines the architecture of the to be build image. By default, this is set to the host architecture. Note that you cannot crossbuild for another architecture if your host system is not able to execute binaries for the target architecture natively. For example, building amd64 images on i386 and vice versa is possile if you have a 64bit capable i386 processor and the right kernel. But building powerpc images on an i386 system is not possible. + .IP "\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|net|tar|usb\-hdd" 4 + defines the image type to build. By default, for images using syslinux this is set to iso\-hybrid to build CD/DVD images that may also be used like usb\-hdd images, for non\-syslinux images, it defaults to iso. +-.IP "\fB\-\-binary\-filesystem\fR fat16|fat32|ext2" 4 +-defines the filesystem to be used in the image type. This only has an effect if the selected binary image type does allow to choose a filesystem. For example, when selection iso the resulting CD/DVD has always the filesystem ISO9660. When building usb\-hdd images for usb sticks, this is active. Note that it defaults to fat16 on all architectures except sparc where it defaults to ext2. Also note that if you choose fat16 and your resulting binary image gets bigger than 2GB, the binary filesystem automatically gets switched to fat32. ++.IP "\fB\-\-binary\-filesystem\fR fat16|fat32|ext2|ext3|ext4" 4 ++defines the filesystem to be used in the image type. This only has an effect if the selected binary image type does allow to choose a filesystem. For example, when selection iso the resulting CD/DVD has always the filesystem ISO9660. When building usb\-hdd images for usb sticks, this is active. Note that it defaults to fat16 on all architectures except sparc where it defaults to ext4. Also note that if you choose fat16 and your resulting binary image gets bigger than 2GB, the binary filesystem automatically gets switched to fat32. + .IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 + sets boot parameters specific to debian\-installer, if included. + .IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 +@@ -303,7 +303,7 @@ + defines the compression program to be used to compress tarballs. Defaults to gzip. + .IP "\fB\-\-build\-with\-chroot\fR true|false" 4 + defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences. +-.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2" 4 ++.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|plain|jffs2" 4 + defines which filesystem type should be used for the root filesystem image. If you use plain, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with a plain root filesystem, e.g. fat16/fat32 and plain don't work as linux does not support to run on them. + .IP "\fB\-\-clean\fR" 4 + minimizes config directory by automatically removing unused and thus empty subdirectories. +Index: b/manpages/po/de/lb_config.1.po +=================================================================== +--- a/manpages/po/de/lb_config.1.po ++++ b/manpages/po/de/lb_config.1.po +@@ -716,7 +716,7 @@ + + #. type: Plain text + #: en/lb_config.1:35 +-msgid " [B<--binary-filesystem> fat16|fat32|ext2]" ++msgid " [B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4]" + msgstr "" + + #. type: Plain text +@@ -786,7 +786,7 @@ + + #. type: Plain text + #: en/lb_config.1:63 +-msgid " [B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2]" ++msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2]" + msgstr "" + + #. type: Plain text +@@ -1437,7 +1437,7 @@ + #. type: IP + #: en/lb_config.1:278 + #, no-wrap +-msgid "B<--binary-filesystem> fat16|fat32|ext2" ++msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4" + msgstr "" + + #. type: Plain text +@@ -1448,7 +1448,7 @@ + "example, when selection iso the resulting CD/DVD has always the filesystem " + "ISO9660. When building usb-hdd images for usb sticks, this is active. Note " + "that it defaults to fat16 on all architectures except sparc where it " +-"defaults to ext2. Also note that if you choose fat16 and your resulting " ++"defaults to ext4. Also note that if you choose fat16 and your resulting " + "binary image gets bigger than 2GB, the binary filesystem automatically gets " + "switched to fat32." + msgstr "" +@@ -1656,7 +1656,7 @@ + #. type: IP + #: en/lb_config.1:306 + #, no-wrap +-msgid "B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2" ++msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2" + msgstr "" + + #. type: Plain text +Index: b/manpages/pot/lb_config.1.pot +=================================================================== +--- a/manpages/pot/lb_config.1.pot ++++ b/manpages/pot/lb_config.1.pot +@@ -716,7 +716,7 @@ + + #. type: Plain text + #: en/lb_config.1:35 +-msgid " [B<--binary-filesystem> fat16|fat32|ext2]" ++msgid " [B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4]" + msgstr "" + + #. type: Plain text +@@ -786,7 +786,7 @@ + + #. type: Plain text + #: en/lb_config.1:63 +-msgid " [B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2]" ++msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2]" + msgstr "" + + #. type: Plain text +@@ -1437,7 +1437,7 @@ + #. type: IP + #: en/lb_config.1:278 + #, no-wrap +-msgid "B<--binary-filesystem> fat16|fat32|ext2" ++msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4" + msgstr "" + + #. type: Plain text +@@ -1448,7 +1448,7 @@ + "example, when selection iso the resulting CD/DVD has always the filesystem " + "ISO9660. When building usb-hdd images for usb sticks, this is active. Note " + "that it defaults to fat16 on all architectures except sparc where it " +-"defaults to ext2. Also note that if you choose fat16 and your resulting " ++"defaults to ext4. Also note that if you choose fat16 and your resulting " + "binary image gets bigger than 2GB, the binary filesystem automatically gets " + "switched to fat32." + msgstr "" +@@ -1656,7 +1656,7 @@ + #. type: IP + #: en/lb_config.1:306 + #, no-wrap +-msgid "B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2" ++msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2" + msgstr "" + + #. type: Plain text +Index: b/scripts/build/lb_binary_rootfs +=================================================================== +--- a/scripts/build/lb_binary_rootfs ++++ b/scripts/build/lb_binary_rootfs +@@ -88,9 +88,9 @@ + done + + case "${LB_CHROOT_FILESYSTEM}" in +- ext2|ext3) ++ ext2|ext3|ext4) + # Checking depends +- Check_package chroot/sbin/mkfs.ext2 e2fsprogs ++ Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs + + # Restoring cache + Restore_cache cache/packages_binary +Index: b/scripts/build/lb_binary_usb +=================================================================== +--- a/scripts/build/lb_binary_usb ++++ b/scripts/build/lb_binary_usb +@@ -51,12 +51,12 @@ + if [ "${LB_ARCHITECTURES}" = "sparc" ] + then + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) +- Check_package chroot/sbin/mkfs.ext2 e2fsprogs ++ ext2|ext3|ext4) ++ Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs + ;; + + *) +- Echo_error "Sparc only supports booting from ext2, ext3 (or ufs)" ++ Echo_error "Sparc only supports booting from ext2, ext3, ext4 or ufs." + exit 1 + ;; + esac +@@ -128,7 +128,7 @@ + esac + + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) ++ ext2|ext3|ext4) + PARTITION_TYPE="ext2" + ;; + +@@ -171,7 +171,7 @@ + Losetup $FREELO chroot/binary.img 1 + + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) ++ ext2|ext3|ext4) + MKFS="${LB_BINARY_FILESYSTEM}" + MKFS_OPTIONS="-L DEBIAN_LIVE -m 0" + ;; +Index: b/scripts/build/lb_binary_virtual-hdd +=================================================================== +--- a/scripts/build/lb_binary_virtual-hdd ++++ b/scripts/build/lb_binary_virtual-hdd +@@ -46,8 +46,8 @@ + if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] + then + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) +- Check_package chroot/sbin/mkfs.ext2 e2fsprogs ++ ext2|ext3|ext4) ++ Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs + ;; + esac + fi +@@ -79,24 +79,16 @@ + fi + + case "${LB_BINARY_FILESYSTEM}" in +- ext2) +- Chroot chroot "mkfs.ext2 -F binary-virtual.img" +- ;; +- +- ext3) +- Chroot chroot "mkfs.ext3 -F binary-virtual.img" ++ ext2|ext3|ext4) ++ Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F binary-virtual.img" + ;; + esac + + mv chroot/binary-virtual.img ./ + else + case "${LB_BINARY_FILESYSTEM}" in +- ext2) +- mkfs.ext2 -F binary-virtual.img +- ;; +- +- ext3) +- mkfs.ext3 -F binary-virtual.img ++ ext2|ext3|ext4) ++ mkfs.${LB_BINARY_FILESYSTEM} . -F binary-virtual.img + ;; + esac + fi +Index: b/scripts/build/lb_config +=================================================================== +--- a/scripts/build/lb_config ++++ b/scripts/build/lb_config +@@ -40,7 +40,7 @@ + \t [--apt-secure true|false]\n\ + \t [-a|--architectures ARCHITECTURE]\n\ + \t [-b|--binary-images iso|iso-hybrid|net|tar|usb-hdd]\n\ +-\t [--binary-filesystem fat16|fat32|ext2]\n\ ++\t [--binary-filesystem fat16|fat32|ext2|ext3|ext4]\n\ + \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ + \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ + \t [--bootloader grub|syslinux|yaboot]\n\ +@@ -54,7 +54,7 @@ + \t [--checksums md5|sha1|sha256|none]\n\ + \t [--compression bzip2|gzip|lzip|none]\n\ + \t [--build-with-chroot true|false]\n\ +-\t [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\ ++\t [--chroot-filesystem ext2|ext3|ext4|squashfs|plain|jffs2]\n\ + \t [--clean\n\ + \t [-c|--conffile FILE]\n\ + \t [--debconf-frontend dialog|editor|noninteractive|readline]\n\ +Index: b/scripts/build/lb_source_usb +=================================================================== +--- a/scripts/build/lb_source_usb ++++ b/scripts/build/lb_source_usb +@@ -75,7 +75,7 @@ + fi + + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) ++ ext2|ext3|ext4) + PARTITION_TYPE="ext2" + ;; + +@@ -100,7 +100,7 @@ + Losetup $FREELO source.img 1 + + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) ++ ext2|ext3|ext4) + MKFS="${LB_BINARY_FILESYSTEM}" + MKFS_OPTIONS="-L DEBIAN_LIVE -m 0" + ;; +Index: b/scripts/build/lb_source_virtual-hdd +=================================================================== +--- a/scripts/build/lb_source_virtual-hdd ++++ b/scripts/build/lb_source_virtual-hdd +@@ -51,8 +51,8 @@ + if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] + then + case "${LB_BINARY_FILESYSTEM}" in +- ext2|ext3) +- Check_package chroot/sbin/mkfs.ext2 e2fsprogs ++ ext2|ext3|ext4) ++ Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs + ;; + esac + fi +@@ -76,24 +76,15 @@ + mv source-virtual.img chroot + + case "${LB_BINARY_FILESYSTEM}" in +- ext2) +- Chroot chroot "mkfs.ext2 -F -m 0 source-virtual.img" +- ;; +- +- ext3) +- Chroot chroot "mkfs.ext3 -F source-virtual.img" +- ;; ++ ext2|ext3|ext4) ++ Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F -m 0 source-virtual.img" + esac + + mv chroot/source-virtual.img ./ + else + case "${LB_BINARY_FILESYSTEM}" in +- ext2) +- mkfs.ext2 -F -m 0 source-virtual.img +- ;; +- +- ext3) +- mkfs.ext3 -F -m 0 source-virtual.img ++ ext2|ext3|ext4) ++ mkfs.${LB_BINARY_FILESYSTEM} -F -m 0 source-virtual.img + ;; + esac + fi diff -Nru live-build-3.0~a24/debian/patches/ubuntu-gfxboot-theme.patch live-build-3.0~a24/debian/patches/ubuntu-gfxboot-theme.patch --- live-build-3.0~a24/debian/patches/ubuntu-gfxboot-theme.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-gfxboot-theme.patch 2011-08-11 11:41:19.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Copy gfxboot theme when building for Ubuntu +Author: Colin Watson +Forwarded: no +Last-Update: 2011-08-11 + +Index: b/scripts/build/lb_binary_syslinux +=================================================================== +--- a/scripts/build/lb_binary_syslinux ++++ b/scripts/build/lb_binary_syslinux +@@ -53,6 +53,12 @@ + Check_package chroot/usr/bin/syslinux syslinux + Check_package chroot/usr/share/syslinux/themes/${LB_SYSLINUX_THEME} syslinux-themes-${LB_SYSLINUX_THEME} + ++ case "${LB_MODE}" in ++ ubuntu) ++ Check_package chroot/usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz gfxboot-theme-ubuntu ++ ;; ++ esac ++ + # Restoring cache + Restore_cache cache/packages_binary + +@@ -86,12 +92,25 @@ + true) + # Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly + Chroot chroot "cp -aL /usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live /root/tmp" ++ ++ case "${LB_MODE}" in ++ ubuntu) ++ Chroot chroot "tar xzf /usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C /root/tmp" ++ ;; ++ esac ++ + mv chroot/root/tmp/* ${_SUFFIX} + rmdir chroot/root/tmp + ;; + + false) + cp -aL /usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live/* ${_SUFFIX} ++ ++ case "${LB_MODE}" in ++ ubuntu) ++ tar xzf /usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C ${_SUFFIX} ++ ;; ++ esac + ;; + esac + diff -Nru live-build-3.0~a24/debian/patches/ubuntu-i386-generic-pae.patch live-build-3.0~a24/debian/patches/ubuntu-i386-generic-pae.patch --- live-build-3.0~a24/debian/patches/ubuntu-i386-generic-pae.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-i386-generic-pae.patch 2011-12-15 16:24:22.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Use i386 -generic-pae kernel flavour on Ubuntu >= precise +Author: Colin Watson +Bug-Ubuntu: https://bugs.launchpad.net/bugs/897786 +Forwarded: no +Last-Update: 2011-12-15 + +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -628,7 +628,14 @@ + ;; + + ubuntu) +- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ++ case "${LB_DISTRIBUTION}" in ++ lucid|maverick|natty|oneiric) ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ++ ;; ++ *) ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}" ++ ;; ++ esac + ;; + + *) +Index: b/scripts/build/lb_binary_debian-installer +=================================================================== +--- a/scripts/build/lb_binary_debian-installer ++++ b/scripts/build/lb_binary_debian-installer +@@ -319,7 +319,14 @@ + + case "${LB_MODE}" in + ubuntu) +- DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" ++ case "${LB_DISTRIBUTION}" in ++ lucid|maverick|natty|oneiric) ++ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" ++ ;; ++ *) ++ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae" ++ ;; ++ esac + ;; + + *) diff -Nru live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch --- live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch 2012-04-18 12:08:57.000000000 +0000 @@ -0,0 +1,32 @@ +Description: Put kernel symlinks in /boot on some architectures + This matches base-installer/library.sh more closely. +Author: Colin Watson +Bug-Ubuntu: https://bugs.launchpad.net/bugs/958839 +Forwarded: no +Last-Update: 2012-04-18 + +Index: b/scripts/build/lb_chroot_linux-image +=================================================================== +--- a/scripts/build/lb_chroot_linux-image ++++ b/scripts/build/lb_chroot_linux-image +@@ -53,6 +53,20 @@ + done + done + ++ case "${LB_ARCHITECTURES}" in ++ alpha|amd64|hppa|i386|ia64|m68k|mips|mipsel) ++ ;; ++ ++ *) ++ cat > chroot/etc/kernel-img.conf << EOF ++# Kernel Image management overrides ++# See kernel-img.conf(5) for details ++do_symlinks = yes ++link_in_boot = yes ++EOF ++ ;; ++ esac ++ + # Creating stage file + Create_stagefile .stage/chroot_linux-image + fi diff -Nru live-build-3.0~a24/debian/patches/ubuntu-mlocate.patch live-build-3.0~a24/debian/patches/ubuntu-mlocate.patch --- live-build-3.0~a24/debian/patches/ubuntu-mlocate.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-mlocate.patch 2011-07-13 17:54:11.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Update the mlocate database +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/627332 +Forwarded: http://bugs.debian.org/627332 +Last-Update: 2011-06-11 + +Index: b/scripts/build/lb_chroot_hacks +=================================================================== +--- a/scripts/build/lb_chroot_hacks ++++ b/scripts/build/lb_chroot_hacks +@@ -214,6 +214,14 @@ + # people might do in local hooks, and there might be no initrds at all. + find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r + ++# Update the mlocate database. It's convenient for this to be already up to ++# date on the live system, and it means that if the live system is later ++# installed to a hard disk then less work will be required after ++# installation. ++if [ -x chroot/usr/bin/updatedb.mlocate ]; then ++ Chroot chroot updatedb.mlocate ++fi ++ + # Remove build systems clock drift + echo "0.0 0 0.0" > chroot/etc/adjtime + diff -Nru live-build-3.0~a24/debian/patches/ubuntu-ports-location.patch live-build-3.0~a24/debian/patches/ubuntu-ports-location.patch --- live-build-3.0~a24/debian/patches/ubuntu-ports-location.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-ports-location.patch 2011-07-13 17:54:11.000000000 +0000 @@ -0,0 +1,59 @@ +Description: Use the correct mirror locations for Ubuntu ports. +Author: Adam Conrad + +--- live-build-3.0~a21.orig/functions/defaults.sh ++++ live-build-3.0~a21/functions/defaults.sh +@@ -327,7 +327,7 @@ Set_defaults () + ;; + + *) +- LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/}" ++ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/ubuntu-ports/}" + ;; + esac + +@@ -362,7 +362,7 @@ Set_defaults () + ;; + + *) +- LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/}" ++ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}" + ;; + esac + +@@ -389,7 +389,7 @@ Set_defaults () + ;; + + *) +- LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/}" ++ LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/ubuntu-ports/}" + ;; + esac + +@@ -443,7 +443,7 @@ Set_defaults () + ;; + + *) +- LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ports.ubuntu.com/}" ++ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ports.ubuntu.com/ubuntu-ports/}" + ;; + esac + +@@ -475,7 +475,7 @@ Set_defaults () + ;; + + *) +- LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/}" ++ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}" + ;; + esac + +@@ -502,7 +502,7 @@ Set_defaults () + ;; + + *) +- LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/}" ++ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/ubuntu-ports/}" + ;; + esac + ;; diff -Nru live-build-3.0~a24/debian/patches/ubuntu-powerpc-smp.patch live-build-3.0~a24/debian/patches/ubuntu-powerpc-smp.patch --- live-build-3.0~a24/debian/patches/ubuntu-powerpc-smp.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-powerpc-smp.patch 2012-03-20 16:06:50.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Switch Ubuntu from powerpc to powerpc-smp kernel +Author: Adam Conrad +Forwarded: no + +--- live-build-3.0~a24.orig/scripts/build/lb_binary_debian-installer ++++ live-build-3.0~a24/scripts/build/lb_binary_debian-installer +@@ -352,7 +352,7 @@ then + DI_REQ_PACKAGES="yaboot" + case "${LB_MODE}" in + ubuntu) +- DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp" ++ DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp" + ;; + + *) +--- live-build-3.0~a24.orig/functions/defaults.sh ++++ live-build-3.0~a24/functions/defaults.sh +@@ -683,11 +683,11 @@ Set_defaults () + ubuntu) + case "${LIST}" in + stripped|minimal) +- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}" ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}" + ;; + + *) +- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64-smp}" ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}" + ;; + esac + ;; diff -Nru live-build-3.0~a24/debian/patches/ubuntu-pyc-purge.patch live-build-3.0~a24/debian/patches/ubuntu-pyc-purge.patch --- live-build-3.0~a24/debian/patches/ubuntu-pyc-purge.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-pyc-purge.patch 2011-07-13 17:54:11.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Add hook to remove .pyc files +Author: Colin Watson +Bug-Debian: TODO +Forwarded: TODO +Last-Update: 2011-06-22 + +Index: b/examples/hooks/all_chroot_pyc-purge.sh +=================================================================== +--- /dev/null ++++ b/examples/hooks/all_chroot_pyc-purge.sh +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++# This is a hook for live-build(7) to remove byte-compiled Python modules. ++# To enable it, copy or symlink this hook into your config/chroot_local-hooks ++# directory. ++ ++find /usr -name \*.pyc -print0 | xargs -0r rm -f +Index: b/scripts/build/lb_chroot_hacks +=================================================================== +--- a/scripts/build/lb_chroot_hacks ++++ b/scripts/build/lb_chroot_hacks +@@ -227,7 +227,7 @@ + # build the index in the background which will be racy in the context of + # live-build. + if [ -x chroot/usr/sbin/update-apt-xapian-index ]; then +- Chroot chroot /usr/sbin/update-apt-xapian-index --force --quiet ++ Chroot chroot PYTHONDONTWRITEBYTECODE=1 /usr/sbin/update-apt-xapian-index --force --quiet + fi + + # Remove build systems clock drift diff -Nru live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch --- live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch 2012-02-21 23:39:39.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Deal with the case where /etc/resolv.conf is a symlink +Author: Stéphane Graber , Adam Conrad +Last-Update: 2012-01-26 + +--- live-build-3.0~a24.orig/scripts/build/lb_chroot_resolv ++++ live-build-3.0~a24/scripts/build/lb_chroot_resolv +@@ -51,6 +51,10 @@ case "${1}" in + # If you want to have a custom resolv.conf, please + # overwrite it with normal local_includes mechanism. + Truncate chroot/etc/resolv.conf.orig ++ elif [ -L chroot/etc/resolv.conf ] ++ then ++ # Move resolv.conf aside if it's a symlink (likely resolvconf) ++ mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig + fi + + if [ -f /etc/resolv.conf ] +@@ -77,7 +81,7 @@ case "${1}" in + # Copying local resolv.conf + cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf + rm -f chroot/etc/resolv.conf.orig +- elif [ -e chroot/etc/resolv.conf.orig ] ++ elif [ -e chroot/etc/resolv.conf.orig ] || [ -L chroot/etc/resolv.conf.orig ] + then + # Restoring resolv file or symlink + mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf +@@ -85,6 +89,12 @@ + # Truncating resolv file + Truncate chroot/etc/resolv.conf + fi ++ ++ # Clean up resolvconf's pollution ++ if [ -d chroot/etc/resolvconf/resolv.conf.d ]; then ++ rm -f chroot/etc/resolvconf/resolv.conf.d/original ++ rm -f chroot/etc/resolvconf/resolv.conf.d/tail ++ fi + + # Removing stage file + rm -f .stage/chroot_resolv diff -Nru live-build-3.0~a24/debian/patches/ubuntu-syslinux-theme.patch live-build-3.0~a24/debian/patches/ubuntu-syslinux-theme.patch --- live-build-3.0~a24/debian/patches/ubuntu-syslinux-theme.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-syslinux-theme.patch 2011-08-11 17:39:17.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Default to ubuntu-oneiric syslinux theme on Ubuntu +Author: Colin Watson +Forwarded: no +Last-Update: 2011-08-11 + +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -1035,6 +1035,10 @@ + LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-progress-standard}" + ;; + ++ ubuntu) ++ LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-ubuntu-oneiric}" ++ ;; ++ + *) + LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-debian-squeeze}" + ;; diff -Nru live-build-3.0~a24/debian/patches/ubuntu-timestamp.patch live-build-3.0~a24/debian/patches/ubuntu-timestamp.patch --- live-build-3.0~a24/debian/patches/ubuntu-timestamp.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-timestamp.patch 2012-01-12 23:16:56.000000000 +0000 @@ -0,0 +1,34 @@ +Description: Print the current time before starting a command with lb +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/630089 +Forwarded: http://bugs.debian.org/630089 +Applied-Upstream: yes +Last-Update: 2012-01-12 + +Index: b/scripts/build/lb +=================================================================== +--- a/scripts/build/lb ++++ b/scripts/build/lb +@@ -44,16 +44,19 @@ + + if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ] + then +- LB=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}" ++ SCRIPT="${LB_BASE}/scripts/build/${COMMAND}" + elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ] + then +- LB=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}" ++ SCRIPT=/usr/share/live/build/scripts/build/"${COMMAND}" + elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] + then +- LB=1 exec "${COMMAND}" "${@}" ++ SCRIPT="${COMMAND}" + else + Echo_error "no such script" + exit 1 + fi ++ ++ Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${*}" ++ LB=1 exec "${SCRIPT}" "${@}" + ;; + esac diff -Nru live-build-3.0~a24/debian/patches/wubi-initramfs-framebuffer.patch live-build-3.0~a24/debian/patches/wubi-initramfs-framebuffer.patch --- live-build-3.0~a24/debian/patches/wubi-initramfs-framebuffer.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/wubi-initramfs-framebuffer.patch 2011-10-17 10:12:11.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Use a framebuffer in the initramfs + Wubi disk image installs do a fair amount of work in the initramfs. +Author: Evan Dandrea + +--- live-build-3.0~a24.orig/scripts/build/lb_chroot_hacks ++++ live-build-3.0~a24/scripts/build/lb_chroot_hacks +@@ -187,6 +187,12 @@ case "${SUBPROJECT}" in + ;; + esac + ++case "${SUBPROJECT}" in ++ wubi) ++ UPDATE_INITRAMFS_OPTIONS="$UPDATE_INITRAMFS_OPTIONS FRAMEBUFFER=y" ++ ;; ++esac ++ + Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u" + + # We probably ought to use COMPRESS= in a temporary file in diff -Nru live-build-3.0~a24/debian/rules live-build-3.0~a24/debian/rules --- live-build-3.0~a24/debian/rules 2011-07-13 08:43:36.000000000 +0000 +++ live-build-3.0~a24/debian/rules 2011-07-13 17:54:11.000000000 +0000 @@ -7,6 +7,9 @@ $(MAKE) -C po clean override_dh_auto_build: + chmod +x examples/hooks/all_chroot_pyc-purge.sh \ + examples/hooks/kubuntu_chroot_icon-theme.sh \ + examples/hooks/ubuntu_binary_build-wubildr.sh $(MAKE) -C po update-po override_dh_auto_install: