Commit Graph

261 Commits

Author SHA1 Message Date
Chris Lamb e7b3cabbd7 Fix d-i locations in yaboot entries. 2011-03-09 19:03:35 +01:00
Chris Lamb 7b881914d4 Fix trivial typographic error ("flavor" => "flavour") 2011-03-09 19:03:35 +01:00
Chris Lamb 21592c73bc Only deference symlinks on FAT{16,32} partitions on usb-hdd. 2011-03-09 19:03:35 +01:00
Chris Lamb f662127928 Revert always deferencing symlinks when installing some binary includes. 2011-03-09 19:03:35 +01:00
Chris Lamb 600d183d29 Add Echo_breakage for messages preceeding often-breaking stages and use before {c,}debootstrap calls 2011-03-09 19:03:35 +01:00
Chris Lamb 243ee8a6d3 Replace a few unweildy "if" statements with their "case" equivalents 2011-03-09 19:03:35 +01:00
Chris Lamb 85493ae3b2 Move Etch syslinux workaround closer to the original definitions 2011-03-09 19:03:35 +01:00
Chris Lamb 1bd10cea37 Use correct location of powerpc d-i images. 2011-03-09 19:03:35 +01:00
Chris Lamb 4d748e582c Set correct d-i image type on usb-hdd and tar image types 2011-03-09 19:03:35 +01:00
Chris Lamb 4950924195 Remove pointless "echo" statements pre- and post- cdebootstrap 2011-03-09 19:03:35 +01:00
Chris Lamb 991139e0f6 Allow LH_APT_SECURE to disable package cdebootstrap package authentication 2011-03-09 19:03:34 +01:00
Chris Lamb 25ad66e62d Rename USE_NETBOOT_DI to DI_IMAGE_TYPE 2011-03-09 19:03:34 +01:00
Chris Lamb a1caf63a92 Always deference symlinks when installing some binary includes to fix breakage on amd64. 2011-03-09 19:03:34 +01:00
Chris Lamb 41638d7921 Ensure "Using system defaults" message appears when calling lh_config without --verbose 2011-03-09 19:03:34 +01:00
Chris Lamb 01a611b24d Don't skip single dot-files in the root directory of binary and chroot local includes 2011-03-09 19:03:34 +01:00
Chris Lamb 7540b66682 Don't exclude live-installer when LH_DEBIAN_INSTALLER=live 2011-03-09 19:03:34 +01:00
Chris Lamb 90d2fedc09 Fix a few bogus guards in lh_binary_debian-installer 2011-03-09 19:03:34 +01:00
Daniel Baumann e6b633314e Parsing local arguments to lh_config last. 2011-03-09 19:03:34 +01:00
Daniel Baumann 76319632a1 Correcting order where system-wide lh_config defaults file is read, thanks to Juergen Fiedler <juergen.fiedler@gmail.com>. 2011-03-09 19:03:34 +01:00
Daniel Baumann 4c4e58ca20 Only saving source indices to indices cache if source indices are actually existing, thanks to Thanatermesis <thanatermesis.ecvs@elivecd.net>. 2011-03-09 19:03:34 +01:00
Daniel Baumann 11883b9f46 Correcting path for system-wide lh_config defaults file. 2011-03-09 19:03:34 +01:00
Marco Amadori 80a2f25b02 Added support for /etc/live-helper.
* lh_config system-wide configuration file, like an implicit specification
  of '--conffile=/etc/live-helper' to each lh_config call.
2011-03-09 19:03:34 +01:00
Marco Amadori 2b287d6b6c Removed a useless space. 2011-03-09 19:03:34 +01:00
Chris Lamb b067d159ec Create chroot_local-preseed/ directory when building config/ in lh_config 2011-03-09 19:03:34 +01:00
Daniel Baumann ae58d0f7af Producing rsyncable tarballs where possible. 2011-03-09 19:03:33 +01:00
Chris Lamb ac27ecc2e0 Allow fallback to chroot_package-lists inside binary lists
Without this, a modified version of the (say) "gnome" list inside
chroot_package-lists would be completely ignored when installing binary
packagelists.
2011-03-09 19:03:32 +01:00
Chris Lamb efa7c76589 Remove temporary binary package list files 2011-03-09 19:03:32 +01:00
Chris Lamb ffa20df082 Tidy calls to new Expand_packagelist 2011-03-09 19:03:32 +01:00
Daniel Baumann 002c79ef51 Some formating and style cleanups. 2011-03-09 19:03:32 +01:00
Daniel Baumann cc3c1ff10d Using one single packages cache directory for all chroot packages. 2011-03-09 19:03:32 +01:00
Daniel Baumann 7bcdcf7f05 Using hardlinks to copy local packages into chroot. 2011-03-09 19:03:32 +01:00
Daniel Baumann d23cf256e8 Moving lh_chroot_packages call in lh_chroot to old place. 2011-03-09 19:03:32 +01:00
Chris Lamb 36cc525945 Install most chroot packages in one ${LH_APT} call (Closes: #475739)
This patch installs (almost) all chroot packages by queueing the package
names into a single file and then installing that. It depends on my
previous patch to install local packages by using an APT mirror.

This speeds up image build causes even greater speedups once more packages
adopt triggers.

(Packages installed by debconf preseeding are not touched, nor are packages
installed by tasks.)
2011-03-09 19:03:32 +01:00
Chris Lamb ae785955db Install local packages using a local APT repo instead of using "dpkg -i"
This patch modifies chroot_sources to build a small APT repo of the
local-packages and use that for local package installation instead of
"dpkg -i". This has a few advantages:

 * Removes the true ugliness that is "dpkg -i *.deb && apt-get install -f".
   This not only is slow and brittle, it causes scary "dpkg dependency
   error" messages to appear in build logs.

 * We can (ie. not implemented here) move to installing all the packages
   from:

    - lh_chroot_packages (ie. ${LH_PACKAGES})
    - lh_chroot_local-packages (ie. config/chroot_local-packages/*.deb)
    - lh_chroot_local-packageslists
    - lh_chroot_packages-lists
    - lh_chroot_linux-image

   .. in one shot. This would primarily improve speed as we would not keep
   invoking ${LH_APT}, and package installations can share triggers and
   suchlike -- installing a custom live-initramfs via local packages
   currently costs an additional "update-initramfs -u" call.

   It would also fix a number of obscure dependency cases, such as the one
   documented in #475739, and--if the user is using aptitude--may even
   result in better resolution choices.

 * Removes some messy and somewhat brittle code in lh_chroot_linux-image
   that edgecases a local live-initramfs.

The disadvantages are:

 * If local packages are being used and we are building in a chroot, we
   must refresh the sources list and rebuild the repo before building the
   binary images. (However, before this patch, we had to do this anyway if
   the binary mirrors were different from the chroot ones.)

 * We must add a little hack to the minimal hook to detect whether we are
   using local packages and not remove apt-utils (which creates the
   repository in lh_chroot_sources) if that is the case -- we cannot simply
   use "Install_package" inside lh_chroot_sources as we are not guaranteed
   to have working APT data because the minimal hook deliberately removes
   them!
2011-03-09 19:03:32 +01:00
Tiago Bortoletto Vaz 001bb75189 lh_chroot_local-preseed: fix minor typo 2011-03-09 19:03:32 +01:00
Chris Lamb 46e2a3271b lh_binary_debian-installer: Add dependency on 'wget'
The 'minimal' hook removes wget, which is used extensively by the Debian
Installer hook.
2011-03-09 19:03:32 +01:00
Chris Lamb 0e8c38206d Fix a number of issues with Syslinux templates (Closes: #476204)
This fixes:

 * The ugly "toboot" and "to\nboot" problems
 * Mistitled F4 page
 * Ugly line-breaking of Debian Live URL
2011-03-09 19:03:32 +01:00
Chris Lamb 90be1cb4b5 Use "find -path" for matching "path/to/file" files (Closes: #476206)
This means that /isolinux/isolinux.bin and /boot/grub/stage2_eltorito are
not included in md5sum files anymore as intended. It also prevents a
strange and verbose warning from appearing in build logs.
2011-03-09 19:03:32 +01:00
Chris Lamb cb88778a23 Fix quoting when installing local packages (Closes: #470683)
This was causing problems when building a package and there were binary
packages in the directory above 'config/'. See [0] and [1] for more info.

 [0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=463406
 [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476294
2011-03-09 19:03:32 +01:00
Chris Lamb b0a4988bb7 Fix typo in policy-rc.d 2011-03-09 19:03:32 +01:00
Daniel Baumann 5fe14264e0 Sorting image file lists. 2011-03-09 19:03:32 +01:00
Daniel Baumann ef1b163040 Creating binary and source file lists in build directory. 2011-03-09 19:03:32 +01:00
Daniel Baumann e296deef49 Also copying binary package list to build directory. 2011-03-09 19:03:32 +01:00
Daniel Baumann ea154f8609 Also adding a packages.txt when building etch images, although there is a casper/filesystem.manifest already. 2011-03-09 19:03:32 +01:00
Chris Lamb c3462bceab lh_chroot_linux-image: Catch missing case in local live-initramfs handling
This patch catches the case when LH_APT is "apt", its default value. This
was causing build failures when using a local live-initramfs .deb.
2011-03-09 19:03:32 +01:00
Chris Lamb 50e21abdb5 helpers/lh_config, functions/defaults.sh: Correct "boostrap" -> "bootstrap" 2011-03-09 19:03:32 +01:00
Daniel Baumann c37435dcc5 Sort md5sum.txt files again after filename. 2011-03-09 19:03:32 +01:00
Daniel Baumann ce7388dc68 Updating help output of lh_config. 2011-03-09 19:03:32 +01:00
Daniel Baumann 74030ce0a6 Applied patch from Erwan Le Gall <elegall@linagora.com> to give a warning when installing local packages with wrong naming scheme. 2011-03-09 19:03:32 +01:00
Daniel Baumann 26fc30d8eb Using new Read_conffile(); now. 2011-03-09 19:03:31 +01:00