diffstat of debian/ for live-build_3.0~a57-1 live-build_3.0~a57-1ubuntu11 changelog | 472 +++++++++++++++++++++ control | 9 patches/series | 22 patches/ubuntu-add-raring-version.patch | 14 patches/ubuntu-add-saucy-trusty-version.patch | 15 patches/ubuntu-arm64-support.patch | 16 patches/ubuntu-build-wubildr.patch | 45 ++ patches/ubuntu-casper-normalisation.patch | 25 + patches/ubuntu-chroot_headers_tidy.patch | 37 + patches/ubuntu-debootstrap-variants.patch | 29 + patches/ubuntu-ext-inodes.patch | 33 + patches/ubuntu-fix-binary-hooks.patch | 17 patches/ubuntu-fix-hooks.patch | 58 ++ patches/ubuntu-i386-generic-pae.patch | 46 ++ patches/ubuntu-kernel-img-conf.patch | 36 + patches/ubuntu-no-adjtime.patch | 35 + patches/ubuntu-no-xz-squashfs.patch | 25 + patches/ubuntu-package-lists-without-chroot.patch | 161 +++++++ patches/ubuntu-parent-mirror-binary-volatile.patch | 18 patches/ubuntu-powerpc-smp.patch | 35 + patches/ubuntu-ppc64el-support.patch | 20 patches/ubuntu-pt_chown.patch | 14 patches/ubuntu-remove-non-release-lists.patch | 29 + patches/ubuntu-resolvconf.patch | 24 + patches/ubuntu-wubi-initramfs-framebuffer.patch | 22 rules | 4 26 files changed, 1257 insertions(+), 4 deletions(-) diff -Nru live-build-3.0~a57/debian/changelog live-build-3.0~a57/debian/changelog --- live-build-3.0~a57/debian/changelog 2012-08-10 20:44:17.000000000 +0000 +++ live-build-3.0~a57/debian/changelog 2014-04-03 15:18:53.000000000 +0000 @@ -1,3 +1,100 @@ +live-build (3.0~a57-1ubuntu11) trusty; urgency=low + + * add release version for ubuntu saucy and trusty to fix a failure of + creating an usb startup disk with usb-creator (LP: #1300400) + + -- Paolo Sammicheli Mon, 31 Mar 2014 21:36:20 +0200 + +live-build (3.0~a57-1ubuntu10) trusty; urgency=medium + + * Add basic ppc64el support. + + -- Colin Watson Fri, 31 Jan 2014 10:34:15 +0000 + +live-build (3.0~a57-1ubuntu9) saucy; urgency=low + + * Add skeleton arm64 support, so that ubuntu-core can build. + * Mount devpts with gid=5,mode=620 to work without pt_chown. + + -- Adam Conrad Tue, 15 Oct 2013 18:35:58 +0100 + +live-build (3.0~a57-1ubuntu8) saucy; urgency=low + + * Drop etc/adjtime from scripts/build/lb_chroot_hacks. /etc/adjtime is not + needed and should not be used in Ubuntu. + + -- Steve Langasek Fri, 27 Sep 2013 11:20:17 -0700 + +live-build (3.0~a57-1ubuntu7) saucy; urgency=low + + * add release version for ubuntu raring to fix a failure of + creating an usb startup disk with usb-creator (LP: #1174791) + + -- Nobuto MURATA Wed, 01 May 2013 01:07:26 +0900 + +live-build (3.0~a57-1ubuntu6) raring; urgency=low + + * Drop e500 and e500mc kernel images and headers from powerpc images. + + -- Adam Conrad Tue, 23 Apr 2013 04:45:57 -0600 + +live-build (3.0~a57-1ubuntu5) raring; urgency=low + + * Update ubuntu-powerpc-smp.patch to include e500/e500mc + + -- Ben Collins Tue, 13 Nov 2012 13:31:33 -0500 + +live-build (3.0~a57-1ubuntu4) quantal; urgency=low + + * Don't turn on xz compression in mksquashfs for ubuntu builds. + + -- Adam Conrad Fri, 24 Aug 2012 15:05:30 -0600 + +live-build (3.0~a57-1ubuntu3) quantal; urgency=low + + * Fix execution of binary hooks. + + -- Colin Watson Fri, 24 Aug 2012 08:42:56 +0100 + +live-build (3.0~a57-1ubuntu2) quantal; urgency=low + + * Fix default for LB_PARENT_MIRROR_BINARY_VOLATILE. + * Fix handling of --bootstrap-flavour with debootstrap. + + -- Colin Watson Thu, 23 Aug 2012 11:07:39 +0100 + +live-build (3.0~a57-1ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add wubildr build support. + - Fix up live.cfg for casper. + - Drop Recommends on live-boot-doc and live-config-doc for now, until + such time as we switch away from casper. + - Mimic livecd-rootfs's handling of inodes on ext* filesystems to reduce + the pain of resizing preinstalled images. + - Drop gnu-fdisk from Recommends to Suggests; it's only used for USB + images. + - Generate an initramfs that uses the framebuffer for Wubi disk image + installs. + - Use i386 -generic-pae kernel flavour on Ubuntu precise. + - 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). + - Switch from powerpc to powerpc-smp kernel. + - Always set 'do_bootloader = no' in /etc/kernel-img.conf, and on some + architectures (notably powerpc) set 'link_on_boot = yes'. This + matches the behaviour of base-installer/library.sh more closely. + - Mark all the linux-headers-$(ABI) packages as autoinstalled, and then + autoremove cruft. + - Remove APT lists for non-release pockets. + * If --build-with-chroot is false, run ! lines in package-lists in the + host system. + * Fix hook execution. + * Break livecd-rootfs (<< 2.75), since there have been many interface + changes. + + -- Colin Watson Wed, 22 Aug 2012 13:20:30 +0100 + live-build (3.0~a57-1) unstable; urgency=low [ Daniel Baumann ] @@ -984,6 +1081,294 @@ -- Daniel Baumann Fri, 15 Jul 2011 20:33:24 +0200 +live-build (3.0~a24-1ubuntu40) quantal; urgency=low + + * Fix the previous change being canceled by a later apt-get update call. + Move the code to scripts/build/lb_chroot_archives (LP: #1034118) + + -- Stéphane Graber Tue, 07 Aug 2012 17:06:56 -0400 + +live-build (3.0~a24-1ubuntu39) quantal; urgency=low + + * ubuntu-remove-non-release-lists.patch: Remove APT lists for non-release + pockets. (LP: #1034118) + + -- Stéphane Graber Tue, 07 Aug 2012 15:06:51 -0400 + +live-build (3.0~a24-1ubuntu38) quantal; urgency=low + + * Clean up the binary.headers temp file from the previous change. + + -- Adam Conrad Sat, 28 Jul 2012 23:43:34 -0600 + +live-build (3.0~a24-1ubuntu37) quantal; urgency=low + + * Rewrite ubuntu-chroot_headers_tidy.patch to not attempt subshells + in Chroot() calls, as there's no sane way to escape arguments. + + -- Adam Conrad Sat, 28 Jul 2012 23:27:08 -0600 + +live-build (3.0~a24-1ubuntu36) quantal; urgency=low + + * Add a "|| true" to the apt-mark call, for images with no headers. + + -- Adam Conrad Thu, 26 Jul 2012 18:35:30 -0600 + +live-build (3.0~a24-1ubuntu35) quantal; urgency=low + + * ubuntu-chroot_headers_tidy.patch: Mark all the linux-headers-$(ABI) + packages as autoinstalled, and then autoremove cruft (LP: #1029556) + + -- Adam Conrad Thu, 26 Jul 2012 18:09:23 -0600 + +live-build (3.0~a24-1ubuntu34) quantal; urgency=low + + * Make sure /etc/kernel-img.conf always has "do_bootloader = no". + + -- Colin Watson Mon, 23 Jul 2012 17:56:56 +0100 + +live-build (3.0~a24-1ubuntu33) quantal; urgency=low + + * Only use i386 -generic-pae kernel flavour on Ubuntu precise; quantal + switched back to -generic. + + -- Colin Watson Wed, 23 May 2012 01:58:13 +0100 + +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 ] @@ -1056,6 +1441,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 ] @@ -1074,6 +1526,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~a57/debian/control live-build-3.0~a57/debian/control --- live-build-3.0~a57/debian/control 2012-08-10 20:44:17.000000000 +0000 +++ live-build-3.0~a57/debian/control 2012-08-22 12:17:56.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 (>= 9) Standards-Version: 3.9.3 @@ -13,12 +14,12 @@ Architecture: all Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static Recommends: - live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio, - gnu-fdisk + cpio Suggests: dosfstools, genisoimage, git, memtest86+ | memtest86, mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub, - uuid-runtime, win32-loader + uuid-runtime, win32-loader, gnu-fdisk +Breaks: livecd-rootfs (<< 2.75) 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~a57/debian/patches/series live-build-3.0~a57/debian/patches/series --- live-build-3.0~a57/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/series 2014-04-03 15:18:53.000000000 +0000 @@ -0,0 +1,22 @@ +ubuntu-build-wubildr.patch +ubuntu-casper-normalisation.patch +ubuntu-ext-inodes.patch +ubuntu-wubi-initramfs-framebuffer.patch +ubuntu-i386-generic-pae.patch +ubuntu-resolvconf.patch +ubuntu-powerpc-smp.patch +ubuntu-kernel-img-conf.patch +ubuntu-chroot_headers_tidy.patch +ubuntu-remove-non-release-lists.patch +ubuntu-package-lists-without-chroot.patch +ubuntu-fix-hooks.patch +ubuntu-parent-mirror-binary-volatile.patch +ubuntu-debootstrap-variants.patch +ubuntu-fix-binary-hooks.patch +ubuntu-no-xz-squashfs.patch +ubuntu-add-raring-version.patch +ubuntu-no-adjtime.patch +ubuntu-arm64-support.patch +ubuntu-pt_chown.patch +ubuntu-ppc64el-support.patch +ubuntu-add-saucy-trusty-version.patch diff -Nru live-build-3.0~a57/debian/patches/ubuntu-add-raring-version.patch live-build-3.0~a57/debian/patches/ubuntu-add-raring-version.patch --- live-build-3.0~a57/debian/patches/ubuntu-add-raring-version.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-add-raring-version.patch 2013-05-15 11:52:50.000000000 +0000 @@ -0,0 +1,14 @@ +Description: add raring version number as a known release +Origin: backport, http://live.debian.net/gitweb/?p=live-build.git;a=commit;h=d766063e128b6f51df58e90956f462343ca3808d +Bug-Ubuntu: https://launchpad.net/bugs/1174791 +Forwarded: not-needed +--- +Index: live-build-3.0~a57/functions/releases.sh +=================================================================== +--- live-build-3.0~a57.orig/functions/releases.sh 2012-08-09 20:32:51.000000000 +0900 ++++ live-build-3.0~a57/functions/releases.sh 2013-05-01 00:42:31.044073697 +0900 +@@ -26,3 +26,4 @@ + RELEASE_oneiric="11.10" # 2013-04-01 + RELEASE_precise="12.04" # LTS: 2017-04-01 + RELEASE_quantal="12.10" # 2014-04-01 ++RELEASE_raring="13.04" # 2014-01-01 diff -Nru live-build-3.0~a57/debian/patches/ubuntu-add-saucy-trusty-version.patch live-build-3.0~a57/debian/patches/ubuntu-add-saucy-trusty-version.patch --- live-build-3.0~a57/debian/patches/ubuntu-add-saucy-trusty-version.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-add-saucy-trusty-version.patch 2014-04-03 15:18:53.000000000 +0000 @@ -0,0 +1,15 @@ +Description: add saucy and trusty version number as a known release +Author: Paolo Sammicheli +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1300400 +Forwarded: not-needed +--- +Index: live-build-3.0~a57/functions/releases.sh +=================================================================== +--- live-build-3.0~a57.orig/functions/releases.sh ++++ live-build-3.0~a57/functions/releases.sh +@@ -27,3 +27,5 @@ RELEASE_oneiric="11.10" # 2013-04-01 + RELEASE_precise="12.04" # LTS: 2017-04-01 + RELEASE_quantal="12.10" # 2014-04-01 + RELEASE_raring="13.04" # 2014-01-01 ++RELEASE_saucy="13.10" # 2014-07-01 ++RELEASE_trusty="14.04" # LTS: 2019-04-01 diff -Nru live-build-3.0~a57/debian/patches/ubuntu-arm64-support.patch live-build-3.0~a57/debian/patches/ubuntu-arm64-support.patch --- live-build-3.0~a57/debian/patches/ubuntu-arm64-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-arm64-support.patch 2013-10-15 17:36:55.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Add skeleton arm64 support, so that ubuntu-core can build. +Author: Adam Conrad + +--- live-build-3.0~a57.orig/functions/defaults.sh ++++ live-build-3.0~a57/functions/defaults.sh +@@ -702,6 +702,10 @@ Set_defaults () + + # Setting linux flavour string + case "${LB_ARCHITECTURES}" in ++ arm64) ++ # Assume we'll have a generic kernel for arm64 some day: ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ++ ;; + armel) + case "${LB_MODE}" in + ubuntu|kubuntu) diff -Nru live-build-3.0~a57/debian/patches/ubuntu-build-wubildr.patch live-build-3.0~a57/debian/patches/ubuntu-build-wubildr.patch --- live-build-3.0~a57/debian/patches/ubuntu-build-wubildr.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-build-wubildr.patch 2012-08-20 15:43:54.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Build the wubildr bootloader for Wubi +Author: Evan Dandrea +Last-Update: 2012-08-20 + +Index: b/share/hooks/100-build-wubildr.binary +=================================================================== +--- /dev/null ++++ b/share/hooks/100-build-wubildr.binary +@@ -0,0 +1,36 @@ ++#! /bin/sh ++ ++set -e ++ ++# Build the wubildr bootloader for Wubi. ++ ++cd .. ++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~a57/debian/patches/ubuntu-casper-normalisation.patch live-build-3.0~a57/debian/patches/ubuntu-casper-normalisation.patch --- live-build-3.0~a57/debian/patches/ubuntu-casper-normalisation.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-casper-normalisation.patch 2012-08-20 15:43:42.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fixup live.cfg for casper +Author: Reinhard Tartler +Last-Update: 2012-08-20 + +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 +@@ -254,6 +254,13 @@ + sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ + ${_TARGET}/live.cfg ++ ++ case "${LB_INITRAMFS}" in ++ casper) ++ sed -i -e "s|boot=live|boot=casper|" \ ++ ${_SUFFIX}/live.cfg ++ ;; ++ esac + fi + + if [ -e ${_TARGET}/install.cfg ] diff -Nru live-build-3.0~a57/debian/patches/ubuntu-chroot_headers_tidy.patch live-build-3.0~a57/debian/patches/ubuntu-chroot_headers_tidy.patch --- live-build-3.0~a57/debian/patches/ubuntu-chroot_headers_tidy.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-chroot_headers_tidy.patch 2012-08-20 16:19:52.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Tidy up linux-headers installation and duplication + ubuntu-chroot_headers_tidy.patch: Mark all the linux-headers-$(ABI) + packages as autoinstalled, and then autoremove cruft (LP: #1029556) +Author: Adam Conrad +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1029556 +Forwarded: no +Last-Update: 2012-08-20 + +Index: b/scripts/build/lb_chroot +=================================================================== +--- a/scripts/build/lb_chroot ++++ b/scripts/build/lb_chroot +@@ -62,6 +62,12 @@ + + if [ "${_PASS}" = install ] + then ++ Chroot chroot "dpkg -l linux-headers-3*" 2>/dev/null \ ++ | awk '/^i/ {print $2}' > chroot.headers ++ for i in $(cat chroot.headers); do ++ Chroot chroot "apt-mark auto $i" ++ done ++ Chroot chroot "apt-get --purge -y autoremove" + Chroot chroot "dpkg-query -W" > chroot.packages.install + fi + done +Index: b/scripts/build/lb_clean +=================================================================== +--- a/scripts/build/lb_clean ++++ b/scripts/build/lb_clean +@@ -88,6 +88,7 @@ + ${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp + + rm -f chroot.packages.live chroot.packages.install ++ rm -f chroot.headers + + rm -f .build/chroot* + ;; diff -Nru live-build-3.0~a57/debian/patches/ubuntu-debootstrap-variants.patch live-build-3.0~a57/debian/patches/ubuntu-debootstrap-variants.patch --- live-build-3.0~a57/debian/patches/ubuntu-debootstrap-variants.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-debootstrap-variants.patch 2012-08-23 09:09:41.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Fix handling of --bootstrap-flavour with debootstrap +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/685675 +Last-Update: 2012-08-23 + +Index: b/scripts/build/lb_bootstrap_debootstrap +=================================================================== +--- a/scripts/build/lb_bootstrap_debootstrap ++++ b/scripts/build/lb_bootstrap_debootstrap +@@ -84,7 +84,18 @@ + false) + if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ] + then +- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}" ++ case "${LB_BOOTSTRAP_FLAVOUR}" in ++ minimal) ++ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase" ++ ;; ++ ++ standard) ++ ;; ++ ++ *) ++ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}" ++ ;; ++ esac + fi + ;; + esac diff -Nru live-build-3.0~a57/debian/patches/ubuntu-ext-inodes.patch live-build-3.0~a57/debian/patches/ubuntu-ext-inodes.patch --- live-build-3.0~a57/debian/patches/ubuntu-ext-inodes.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-ext-inodes.patch 2012-08-20 16:09:09.000000000 +0000 @@ -0,0 +1,33 @@ +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 +Last-Update: 2012-08-20 + +Index: b/scripts/build/lb_binary_rootfs +=================================================================== +--- a/scripts/build/lb_binary_rootfs ++++ b/scripts/build/lb_binary_rootfs +@@ -129,7 +129,7 @@ + FAKE_MTAB="true" + fi + +- 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 +@@ -199,7 +199,7 @@ + + 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~a57/debian/patches/ubuntu-fix-binary-hooks.patch live-build-3.0~a57/debian/patches/ubuntu-fix-binary-hooks.patch --- live-build-3.0~a57/debian/patches/ubuntu-fix-binary-hooks.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-fix-binary-hooks.patch 2012-08-24 07:42:29.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Fix execution of binary hooks +Author: Colin Watson +Last-Update: 2012-08-24 + +Index: b/scripts/build/lb_binary_hooks +=================================================================== +--- a/scripts/build/lb_binary_hooks ++++ b/scripts/build/lb_binary_hooks +@@ -50,7 +50,7 @@ + if [ -e "${FILE}" ] + then + cd binary +- ./"${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} ++ "${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} + cd "${OLDPWD}" + fi + done diff -Nru live-build-3.0~a57/debian/patches/ubuntu-fix-hooks.patch live-build-3.0~a57/debian/patches/ubuntu-fix-hooks.patch --- live-build-3.0~a57/debian/patches/ubuntu-fix-hooks.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-fix-hooks.patch 2012-08-22 10:50:43.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Fix hook execution +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685534 +Last-Update: 2012-08-21 + +Index: b/scripts/build/lb_chroot_hooks +=================================================================== +--- a/scripts/build/lb_chroot_hooks ++++ b/scripts/build/lb_chroot_hooks +@@ -54,12 +54,14 @@ + do + for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks + do +- if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ] +- then +- mkdir -p chroot/root/lb_chroot_hooks +- cp "${LOCATION}"/hooks/???-"${_HOOK}".chroot chroot/root/lb_chroot_hooks +- continue +- fi ++ for FILE in "${LOCATION}"/???-"${_HOOK}".chroot ++ do ++ if [ -e "${FILE}" ] ++ then ++ mkdir -p chroot/root/lb_chroot_hooks ++ cp "${FILE}" chroot/root/lb_chroot_hooks ++ fi ++ done + done + done + +Index: b/scripts/build/lb_binary_hooks +=================================================================== +--- a/scripts/build/lb_binary_hooks ++++ b/scripts/build/lb_binary_hooks +@@ -43,17 +43,18 @@ + # Running hooks + for _HOOK in ${LB_BINARY_HOOKS} + do +- for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks ++ for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks ++ do ++ for FILE in "${LOCATION}"/???-"${_HOOK}".binary + do +- if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ] ++ if [ -e "${FILE}" ] + then + cd binary +- ./"${LOCATION}/hooks/???-${_HOOK}.binary" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} ++ ./"${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} + cd "${OLDPWD}" +- +- continue + fi + done ++ done + done + + ## Processing local hooks diff -Nru live-build-3.0~a57/debian/patches/ubuntu-i386-generic-pae.patch live-build-3.0~a57/debian/patches/ubuntu-i386-generic-pae.patch --- live-build-3.0~a57/debian/patches/ubuntu-i386-generic-pae.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-i386-generic-pae.patch 2012-08-20 16:44:38.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: 2012-08-20 + +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -748,7 +748,14 @@ + ;; + + ubuntu|kubuntu) +- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ++ case "${LB_DISTRIBUTION}" in ++ precise) ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}" ++ ;; ++ *) ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ++ ;; ++ esac + ;; + + *) +Index: b/scripts/build/lb_binary_debian-installer +=================================================================== +--- a/scripts/build/lb_binary_debian-installer ++++ b/scripts/build/lb_binary_debian-installer +@@ -362,7 +362,14 @@ + + case "${LB_MODE}" in + ubuntu|kubuntu) +- DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" ++ case "${LB_DISTRIBUTION}" in ++ precise) ++ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae" ++ ;; ++ *) ++ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" ++ ;; ++ esac + ;; + + *) diff -Nru live-build-3.0~a57/debian/patches/ubuntu-kernel-img-conf.patch live-build-3.0~a57/debian/patches/ubuntu-kernel-img-conf.patch --- live-build-3.0~a57/debian/patches/ubuntu-kernel-img-conf.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-kernel-img-conf.patch 2012-08-20 16:15:10.000000000 +0000 @@ -0,0 +1,36 @@ +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 +@@ -118,6 +118,24 @@ + + fi + ++ cat > chroot/etc/kernel-img.conf << EOF ++# Kernel Image management overrides ++# See kernel-img.conf(5) for details ++do_symlinks = yes ++do_bootloader = no ++EOF ++ ++ case "${LB_ARCHITECTURES}" in ++ alpha|amd64|hppa|i386|ia64|m68k|mips|mipsel) ++ ;; ++ ++ *) ++ cat >> chroot/etc/kernel-img.conf << EOF ++link_in_boot = yes ++EOF ++ ;; ++ esac ++ + # Creating stage file + Create_stagefile .build/chroot_linux-image + fi diff -Nru live-build-3.0~a57/debian/patches/ubuntu-no-adjtime.patch live-build-3.0~a57/debian/patches/ubuntu-no-adjtime.patch --- live-build-3.0~a57/debian/patches/ubuntu-no-adjtime.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-no-adjtime.patch 2013-09-27 18:21:11.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Drop etc/adjtime from scripts/build/lb_chroot_hacks. + /etc/adjtime is not needed and should not be used in Ubuntu. +Author: Steve Langasek +Forwarded: no +Last-Update: 2013-09-27 + +--- live-build-3.0~a57.orig/scripts/build/lb_chroot_hacks ++++ live-build-3.0~a57/scripts/build/lb_chroot_hacks +@@ -218,9 +218,6 @@ esac + # 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 + +-# Remove build systems clock drift +-echo "0.0 0 0.0" > chroot/etc/adjtime +- + # Remove cruft + rm -f chroot/boot/initrd*bak* + rm -f chroot/etc/apt/trusted.gpg~ +@@ -229,6 +226,7 @@ rm -f chroot/etc/gshadow- chroot/etc/sha + rm -f chroot/var/cache/debconf/*-old + rm -f chroot/var/lib/dpkg/*-old + rm -f chroot/var/log/apt/term.log ++rm -f chroot/etc/adjtime + + # Delete and re-create temporary directories + TEMP_DIRS="/tmp /var/tmp" +@@ -277,7 +275,7 @@ then + done + + # Config files which need to be RW +- COW_FILES="/etc/adjtime /etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/*persistent-net.rules /etc/udev/rules.d/*persistent-cd.rules /etc/X11/xorg.conf" ++ COW_FILES="/etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/*persistent-net.rules /etc/udev/rules.d/*persistent-cd.rules /etc/X11/xorg.conf" + + # Where we will store RW config files + RW_DIRECTORY="/var/lib/live" diff -Nru live-build-3.0~a57/debian/patches/ubuntu-no-xz-squashfs.patch live-build-3.0~a57/debian/patches/ubuntu-no-xz-squashfs.patch --- live-build-3.0~a57/debian/patches/ubuntu-no-xz-squashfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-no-xz-squashfs.patch 2012-08-24 21:07:40.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Don't turn on xz compression in mksquashfs for ubuntu builds. +Author: Adam Conrad +Forwarded: no +Last-Update: 2012-08-24 + +--- live-build-3.0~a57.orig/scripts/build/lb_binary_rootfs ++++ live-build-3.0~a57/scripts/build/lb_binary_rootfs +@@ -363,8 +363,15 @@ case "${LB_CHROOT_FILESYSTEM}" in + ;; + + *) +- # FIXME: artax-backports too, once d-i has catched up +- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" ++ case "${LB_MODE}" in ++ ubuntu|kubuntu) ++ ++ ;; ++ *) ++ # FIXME: artax-backports too, once d-i has catched up ++ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" ++ ;; ++ esac + ;; + esac + diff -Nru live-build-3.0~a57/debian/patches/ubuntu-package-lists-without-chroot.patch live-build-3.0~a57/debian/patches/ubuntu-package-lists-without-chroot.patch --- live-build-3.0~a57/debian/patches/ubuntu-package-lists-without-chroot.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-package-lists-without-chroot.patch 2012-08-21 14:22:56.000000000 +0000 @@ -0,0 +1,161 @@ +Description: If --build-with-chroot is false, run ! lines in package-lists in the host system +Author: Colin Watson +Last-Update: 2012-08-21 + +Index: b/functions/packagelists.sh +=================================================================== +--- a/functions/packagelists.sh ++++ b/functions/packagelists.sh +@@ -43,7 +43,15 @@ + \!*) + _EXEC="$(echo ${_LB_LINE} | sed -e 's|^!||')" + +- chroot chroot ${_EXEC} ++ case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ chroot chroot sh -c "${_EXEC}" ++ ;; ++ ++ false) ++ eval ${_EXEC} ++ ;; ++ esac + ;; + + \#if\ *) +Index: b/scripts/build/lb_binary_package-lists +=================================================================== +--- a/scripts/build/lb_binary_package-lists ++++ b/scripts/build/lb_binary_package-lists +@@ -41,15 +41,33 @@ + if ls config/package-lists/*.list > /dev/null 2>&1 || \ + ls config/package-lists/*.list.binary > /dev/null 2>&1 + then +- # Restoring cache +- Restore_cache cache/packages.chroot +- +- # Check depends +- Check_package chroot/usr/bin/apt-ftparchive apt-utils +- Check_package chroot/usr/bin/grep-aptavail dctrl-tools +- +- # Installing depends +- Install_package ++ case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ # Restoring cache ++ Restore_cache cache/packages.chroot ++ ++ # Check depends ++ Check_package chroot/usr/bin/apt-ftparchive apt-utils ++ Check_package chroot/usr/bin/grep-aptavail dctrl-tools ++ ++ # Installing depends ++ Install_package ++ ;; ++ ++ false) ++ if [ ! -e /usr/bin/apt-ftparchive ]; then ++ # apt-utils ++ Echo_error "/usr/bin/apt-ftparchive - no such file." ++ exit 1 ++ fi ++ ++ if [ ! -e /usr/bin/grep-aptavail ]; then ++ # dctrl-tools ++ Echo_error "/usr/bin/grep-aptavail - no such file." ++ exit 1 ++ fi ++ ;; ++ esac + + if [ -e "${LIVE_BUILD}/share/bin/Packages" ] + then +@@ -133,11 +151,15 @@ + rm -rf chroot/binary.deb + mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status + +- # Removing depends +- Remove_package +- +- # Saving cache +- Save_cache cache/packages.chroot ++ case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ # Removing depends ++ Remove_package ++ ++ # Saving cache ++ Save_cache cache/packages.chroot ++ ;; ++ esac + + # Creating stage file + Create_stagefile .build/binary_package-lists +Index: b/scripts/build/lb_chroot_package-lists +=================================================================== +--- a/scripts/build/lb_chroot_package-lists ++++ b/scripts/build/lb_chroot_package-lists +@@ -46,14 +46,26 @@ + ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \ + ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1 + then +- # Checking depends +- Check_package chroot/usr/bin/grep-aptavail dctrl-tools +- +- # Restoring cache +- Restore_cache cache/packages.chroot +- +- # Installing depends +- Install_package ++ case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ # Checking depends ++ Check_package chroot/usr/bin/grep-aptavail dctrl-tools ++ ++ # Restoring cache ++ Restore_cache cache/packages.chroot ++ ++ # Installing depends ++ Install_package ++ ;; ++ ++ false) ++ if [ ! -e /usr/bin/grep-aptavail ]; then ++ # dctrl-tools ++ Echo_error "/usr/bin/grep-aptavail - no such file." ++ exit 1 ++ fi ++ ;; ++ esac + + if [ -e "${LIVE_BUILD}/share/bin/Packages" ] + then +@@ -76,15 +88,19 @@ + + rm -f chroot/bin/Packages + +- # Removing dctrl-tools again if the user has not installed it +- if ! grep -qs dctrl-tools chroot/root/packages.chroot +- then +- # Removing depends +- Remove_package +- fi +- +- # Saving cache +- Save_cache cache/packages.binary ++ case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ # Removing dctrl-tools again if the user has not installed it ++ if ! grep -qs dctrl-tools chroot/root/packages.chroot ++ then ++ # Removing depends ++ Remove_package ++ fi ++ ++ # Saving cache ++ Save_cache cache/packages.binary ++ ;; ++ esac + + # Creating stage file + Create_stagefile .build/chroot_package-lists.${_PASS} diff -Nru live-build-3.0~a57/debian/patches/ubuntu-parent-mirror-binary-volatile.patch live-build-3.0~a57/debian/patches/ubuntu-parent-mirror-binary-volatile.patch --- live-build-3.0~a57/debian/patches/ubuntu-parent-mirror-binary-volatile.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-parent-mirror-binary-volatile.patch 2012-08-23 08:22:19.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Fix default for LB_PARENT_MIRROR_BINARY_VOLATILE +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/685669 +Last-Update: 2012-08-23 + +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -596,7 +596,7 @@ + ;; + esac + +- LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR}}" ++ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR_BINARY}}" + ;; + + *) diff -Nru live-build-3.0~a57/debian/patches/ubuntu-powerpc-smp.patch live-build-3.0~a57/debian/patches/ubuntu-powerpc-smp.patch --- live-build-3.0~a57/debian/patches/ubuntu-powerpc-smp.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-powerpc-smp.patch 2013-04-23 11:15:52.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Switch Ubuntu from powerpc to powerpc-smp kernel +Author: Adam Conrad +Forwarded: no + +Index: b/scripts/build/lb_binary_debian-installer +=================================================================== +--- a/scripts/build/lb_binary_debian-installer ++++ b/scripts/build/lb_binary_debian-installer +@@ -395,7 +395,7 @@ + DI_REQ_PACKAGES="yaboot" + case "${LB_MODE}" in + ubuntu|kubuntu) +- 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" + ;; + + *) +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -803,11 +803,11 @@ + ubuntu|kubuntu) + 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~a57/debian/patches/ubuntu-ppc64el-support.patch live-build-3.0~a57/debian/patches/ubuntu-ppc64el-support.patch --- live-build-3.0~a57/debian/patches/ubuntu-ppc64el-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-ppc64el-support.patch 2014-01-31 10:34:12.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Add basic ppc64el support +Author: Colin Watson +Forwarded: no +Last-Update: 2014-01-31 + +Index: b/functions/defaults.sh +=================================================================== +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -830,6 +830,10 @@ + esac + ;; + ++ ppc64el) ++ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ++ ;; ++ + s390) + case "${LB_MODE}" in + progress|ubuntu|kubuntu) diff -Nru live-build-3.0~a57/debian/patches/ubuntu-pt_chown.patch live-build-3.0~a57/debian/patches/ubuntu-pt_chown.patch --- live-build-3.0~a57/debian/patches/ubuntu-pt_chown.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-pt_chown.patch 2013-10-15 17:47:05.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Mount devpts with gid=5,mode=620 to work without pt_chown. +Author: Adam Conrad + +--- live-build-3.0~a57.orig/scripts/build/lb_chroot_devpts ++++ live-build-3.0~a57/scripts/build/lb_chroot_devpts +@@ -49,7 +49,7 @@ case "${1}" in + mkdir -p chroot/dev/pts + + # Mounting /dev/pts +- ${LB_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts || true ++ ${LB_ROOT_COMMAND} mount devpts-live -t devpts -o gid=5,mode=620 chroot/dev/pts || true + fi + + # Creating stage file diff -Nru live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch --- live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch 2012-08-20 16:21:06.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Always remove apt lists for pockets other than the release one + The installer doesn't need non-release pocket lists and these are taking + up quite a bit of space on the media. + . + These other pockets changing quite frequently, they will usually have to + be re-downloaded by the time the system is installed anyway. +Author: Stéphane Graber +Origin: vendor +Last-Update: 2012-08-20 + +Index: b/scripts/build/lb_chroot_archives +=================================================================== +--- a/scripts/build/lb_chroot_archives ++++ b/scripts/build/lb_chroot_archives +@@ -881,6 +881,14 @@ + mkdir -p chroot/var/lib/apt/lists/partial + fi + ++ # Remove non-release pocket lists on Ubuntu ++ if [ "${LB_MODE}" = "ubuntu" ] ++ then ++ rm -f chroot/var/lib/apt/lists/*-updates_* ++ rm -f chroot/var/lib/apt/lists/*-security_* ++ rm -f chroot/var/lib/apt/lists/*-proposed_* ++ fi ++ + # Remove local package repository + rm -f chroot/etc/apt/sources.list.d/packages.list + rm -rf chroot/root/packages diff -Nru live-build-3.0~a57/debian/patches/ubuntu-resolvconf.patch live-build-3.0~a57/debian/patches/ubuntu-resolvconf.patch --- live-build-3.0~a57/debian/patches/ubuntu-resolvconf.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-resolvconf.patch 2012-08-20 16:13:00.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Remove resolvconf artifacts + 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). +Author: Adam Conrad +Last-Update: 2012-08-20 + +Index: b/scripts/build/lb_chroot_resolv +=================================================================== +--- a/scripts/build/lb_chroot_resolv ++++ b/scripts/build/lb_chroot_resolv +@@ -90,6 +90,12 @@ + 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 .build/chroot_resolv + ;; diff -Nru live-build-3.0~a57/debian/patches/ubuntu-wubi-initramfs-framebuffer.patch live-build-3.0~a57/debian/patches/ubuntu-wubi-initramfs-framebuffer.patch --- live-build-3.0~a57/debian/patches/ubuntu-wubi-initramfs-framebuffer.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/ubuntu-wubi-initramfs-framebuffer.patch 2012-08-20 16:09:18.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Use a framebuffer in the initramfs + Wubi disk image installs do a fair amount of work in the initramfs. +Author: Evan Dandrea +Last-Update: 2012-08-20 + +Index: b/scripts/build/lb_chroot_hacks +=================================================================== +--- a/scripts/build/lb_chroot_hacks ++++ b/scripts/build/lb_chroot_hacks +@@ -176,6 +176,12 @@ + ;; + esac + ++case "${SUBPROJECT}" in ++ wubi) ++ UPDATE_INITRAMFS_OPTIONS="$UPDATE_INITRAMFS_OPTIONS FRAMEBUFFER=y" ++ ;; ++esac ++ + if [ "${LB_INITRAMFS}" != "none" ] + then + Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u" diff -Nru live-build-3.0~a57/debian/rules live-build-3.0~a57/debian/rules --- live-build-3.0~a57/debian/rules 2012-08-10 20:44:17.000000000 +0000 +++ live-build-3.0~a57/debian/rules 2012-08-20 17:02:44.000000000 +0000 @@ -3,6 +3,10 @@ %: dh ${@} +override_dh_auto_build: + chmod +x share/hooks/100-build-wubildr.binary + dh_auto_build + override_dh_auto_install: dh_auto_install -- DESTDIR=debian/live-build