-
Committer:
Cody A.W. Somerville
-
Date:
2011-05-30 18:27:29 UTC
-
Revision ID:
cody.somerville@canonical.com-20110530182729-dzfja9lhn7chw4cj
* Merge with Debian, remaining delta:
. debian/control:
- Update maintainer and VCS fields.
- Do not produce live-helper transitional package.
- Added reprepro to recommends since base config branch has binary hook
that uses that.
- Updated live-build-cgi to depend on live-build instead of live-helper.
. functions/defaults.sh:
- Default GZIP_OPTIONS to '--fast' instead of '--best'.
- Use LH_MIRROR_CHROOT as default for LH_MIRROR_DEBIAN_INSTALLER instead
of LH_MIRROR_BOOTSTRAP.
- If 'uname -m' is x86_64 and LB_ARCHITECTURE is i386, append 'linux32'
to LB_ROOT_COMMAND to make build run as 32bit. This fixes build
failures due to dkms module makefiles relying on uname -m to determine
which linux kernel headers to use and what not.
. functions/losetup.sh:
- Created 'Lodetach' function to handle deleting loop devices. It calls
'udevadm settle', sync, and sleep 1 before deleting the loop device.
It will retry up to three times if failure is encountered. This change
is to avoid the busy loop device build failures (LP: #723178).
- Updated 'Losetup' function to use 'Lodetach' and to use --read-only
when setting up loop device to run fdisk.
. scripts/build/lb_binary:
- Run chroot_{debianchroot,dpkg,sysv-rc} helpers on chroot build
setup and teardown.
- Removed calls to recursively chown the root of the chroot or binary
if LB_ROOT_COMMAND is set as chown strips the suid bit (LP: #759421).
. scripts/build/lb_binary_chroot:
- Removed calls to recursively chown the root of the chroot or binary
if LB_ROOT_COMMAND is set as chown strips the suid bit (LP: #759421).
. scripts/build/lb_binary_debian-installer:
- Use a download path that includes the subarch when working with armel.
- If LH_DEBIAN_INSTALLER_URL is already set, use it.
. scripts/build/lb_binary_iso:
- Append GENISOIMAGE_OPTIONS_EXTRA to genisoimage options.
. scripts/build/lb_binary_linux-image:
- Only copy over linux and initrd images from chroot/boot/ if
LB_LINUX_PACKAGES doesn't equal 'none' (LP: #88355).
. scripts/build/lb_binary_local-packageslists:
- Don't download packages to install into binary pool that are already
installed into the chroot.
. scripts/build/lb_binary_rootfs:
- Removed calls to recursively chown the root of the chroot or binary
if LB_ROOT_COMMAND is set as chown strips the suid bit (LP: #759421).
. scripts/build/lb_binary_syslinux:
- Replace menu binary name sed hackery with more robust hack.
- Use relative path to splash and vesamenu.c32 to avoid complications
when an ISO is converted into a usb image.
. scripts/build/lb_binary_usb:
- Call our partitions 'OEM_BUILD' instead of 'DEBIAN_LIVE'.
- Updated to use 'Lodetach' function instead of handling detaching
loop devices themselves.
- Set partition flags after filesystem creation to avoid bug/malfeature
in libparted that would result in fs-type in partition table to be
changed to 83, ie. linux (LP: #735316).
. scripts/build/lb_bootstrap_cache,
scripts/build/lb_bootstrap_cdebootstrap,
scripts/build/lb_bootstrap_debootstrap,
scripts/build/lb_chroot_cache:
- Removed calls to recursively chown the root of the chroot or binary
if LB_ROOT_COMMAND is set as chown strips the suid bit (LP: #759421).
. scripts/build/lb_chroot_hacks:
- Remove attempt to chown the chroot if LB_ROOT_COMMAND is set as it
will always fail while proc, sysfs, etc. are still mounted.
. scripts/build/lb_chroot_local-hooks:
- Make copy of config directory available inside chroot while executing
local chroot hooks via bind mount.
. scripts/build/lb_chroot_upstart:
- Use correct path to initctl; it lives in /sbin - not /usr/sbin/.
. scripts/build/lb_source_usb:
- Updated to use 'Lodetach' function instead of handling detaching
loop devices themselves.
- Set partition flags after filesystem creation to avoid bug/malfeature
in libparted that would result in fs-type in partition table to be
changed to 83, ie. linux (LP: #735316).
. templates/syslinux/*:
- Customized to meet our needs.
* functions/releases.sh:
- Added entry for Ubuntu oneiric (LP: #773311)
* data/debian-cd/oneiric:
- Added symlink to maverick debian-cd data directory for oneiric release.
* hooks/minimal, hooks/reduced:
- Renamed the 'minimal' hook to 'reduced' to avoid being run automatically
if 'minimal' is specified in LB_TASKS.