Commit Graph

325 Commits

Author SHA1 Message Date
Chris Lamb 382d244050 Always add our apt_preference(5) pinning stanza when using local-packages.
This mostly reverts my most recent chroot_local-packages/preferences commit
as I found problems when re-running parts of the build: as the pinning
stanza was removed, calls to "apt-get upgrade" from within live-helper
would remove replacement packages placed in chroot_local-packages.

This isn't 100% foolproof - running apt-get upgrade on the binary image may
still attempt to remove replacement packages (heavy users of this should
probably be using their own repo for this sort of thing anyway).
2011-03-09 19:03:37 +01:00
Chris Lamb bb56b10384 Ensure packages in config/chroot_local-packages override all others.
This reverts config/chroot_local-packages to almost original semantics by
giving any package in chroot_local-packages a priority of 1001, allowing
it to "downgrade" packages and generally override the standard APT sources.

I think this follows the idea of this directory more and is likely to be
more useful with this setup - rebuilding a package simply to bump a version
number or keeping a custom apt_preferences(5) file around kinda sucks,
especially as it is often used as a temporary workaround.
2011-03-09 19:03:37 +01:00
Chris Lamb 6538fac66f Test whether to use hard-links when caching d-i downloads. 2011-03-09 19:03:37 +01:00
Chris Lamb 38a545b3d1 Don't install Recommends of d-i packages. 2011-03-09 19:03:37 +01:00
Chris Lamb c0d2b4ef05 Call "Check_defaults" in lh_build.
This ensures that incompatible configurations that are created by editing
files in config/ are detected when building the image via lh_build.

This also has the side-effect of ensuring that configuration warnings (if
any) appear for live-magic.
2011-03-09 19:03:37 +01:00
Chris Lamb bd4a6204bb Print nicer error message when bootstrap missing from LH_CACHE_STAGES. 2011-03-09 19:03:37 +01:00
Chris Lamb 2da3bcef16 Remove 'E:' prefix in call to Echo_error - it gets added later too. 2011-03-09 19:03:37 +01:00
Daniel Baumann b13a8381a4 Only using hardlinks for local-packages when hardlinks are possible. 2011-03-09 19:03:37 +01:00
Daniel Baumann b4c24e4136 Removing make-live legacy helper. 2011-03-09 19:03:37 +01:00
Daniel Baumann 698992351c Making check for local-patches silent. 2011-03-09 19:03:37 +01:00
Daniel Baumann 4b7b96bce8 Making check for local-includes silent. 2011-03-09 19:03:37 +01:00
Tiago Bortoletto Vaz 8eb8c921d6 Improving message when using default values in /etc/default/live-helper. 2011-03-09 19:03:37 +01:00
Chris Lamb d58eaafd5a Add lh_chroot_local-patches helper to apply local patches against chroot. 2011-03-09 19:03:37 +01:00
Chris Lamb b9c6f0a083 Fix cache poisoning issue in lh_binary_debian-installer with 404 downloads
When wget 404's, an target file is created - this poisons the cache as the
file is apparently downloaded but in actuality is simply empty. We fix this
by unconditionally deleting the cache file if wget fails and emitting an
error.
2011-03-09 19:03:37 +01:00
Chris Lamb 1b37572080 Don't attempt to use live-installer on Etch; it would simply result in no bootstrap method. 2011-03-09 19:03:37 +01:00
Chris Lamb 2a2668aef9 Cache d-i kernel, initrd and mini.iso downloads (Closes: #492085) 2011-03-09 19:03:37 +01:00
Chris Lamb 877603ae02 Wrap most calls to wget in lh_binary_debian-installer. 2011-03-09 19:03:37 +01:00
Daniel Baumann 4ca717c428 Using rfc2606 invalid tld instead of dummy. 2011-03-09 19:03:37 +01:00
Daniel Baumann 8b2ee102d2 Using better suited variable name for live-helpers local key. 2011-03-09 19:03:37 +01:00
Chris Lamb a74d37bdc0 Additionally clean md5sum.txt temporary file. 2011-03-09 19:03:37 +01:00
Chris Lamb a00b0987a9 Remove pointless whitespace. 2011-03-09 19:03:37 +01:00
Chris Lamb 5686484347 Temporarily replace /dev/urandom with /dev/random when creating local packages key.
This avoids blocking automated mage builds; we don't care about the
security of this key anyway.
2011-03-09 19:03:37 +01:00
Chris Lamb 1985ada3a9 Correct d-i kernel and initrd locations in grub entries. Thanks to Jun NOGATA <nogajun@gmail.com> for the patch. (Closes: #490245) 2011-03-09 19:03:37 +01:00
Chris Lamb 22f8d1cf18 Fix a bug where a /etc/apt/preferences supplied in chroot_local-includes was always being deleted when used in conjunction with config/chroot_apt/preferences. 2011-03-09 19:03:37 +01:00
Chris Lamb dd074f1461 Abort build if working directory contains spaces - not supported by (at least) debootstrap and cdebootstrap. 2011-03-09 19:03:36 +01:00
Chris Lamb cb7809fc83 Replace spaces in LH_BOOTSTRAP_{IN,EX}CLUDE variables with commas on use. Thanks to Cyril Brulebois <cyril.brulebois@kerlabs.com>. (Closes: #490114) 2011-03-09 19:03:36 +01:00
Chris Lamb b6e8bde6d5 Fix syntax error in --ignore-system-defaults handling. 2011-03-09 19:03:36 +01:00
Chris Lamb 0e0c22cb6f Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9) 2011-03-09 19:03:36 +01:00
Chris Lamb 5883931966 Fix bug where command-line argument --ignore-system-default was not seen before it was required. 2011-03-09 19:03:36 +01:00
Chris Lamb 6e64be0c82 Fix formatting error with --ignore-system-defaults in "lh_config --help" 2011-03-09 19:03:36 +01:00
Chris Lamb c907da2ad1 Add --ignore-system-defaults option to not source /etc/default/live-helper. 2011-03-09 19:03:36 +01:00
Chris Lamb bb528d9f19 Use a temporary apt key when installing local packages (Closes: #488257)
This patch also allows preferring locally provided packages by preferencing
repositories with the label 'local-packages' in chroot_apt/preferences.
2011-03-09 19:03:36 +01:00
Chris Lamb ad5c5bc2c7 Fix caching of APT indices (Closes: #478744)
I've tested this the cross-product of LH_APT={apt,aptitude} and
LH_APT_SECURE={enabled,disabled} with no problems.
2011-03-09 19:03:36 +01:00
Chris Lamb e4e77a0c91 Refactor d-i GTK image selection, ensuring the GTK installer is only chosen on the netboot variant when building on powerpc. 2011-03-09 19:03:36 +01:00
Chris Lamb e7b0c3b78a Only consider linux-image-2.6-prep powerpc kernel image on Etch. 2011-03-09 19:03:36 +01:00
Chris Lamb 19039961c8 Refactor remote d-i location handling and ensure correct locations for powerpc. 2011-03-09 19:03:36 +01:00
Chris Lamb 412ac01000 Re-order a case statement for consistency. 2011-03-09 19:03:36 +01:00
Chris Lamb a46e647710 Fix incorrect test for sparc architecture in binary include handling. 2011-03-09 19:03:36 +01:00
Chris Lamb 730cf9e4eb Add support for generation of sparc netboot images. 2011-03-09 19:03:36 +01:00
Chris Lamb 9f1a88d0d9 Add support for sparc "tar" binary image type. 2011-03-09 19:03:36 +01:00
Chris Lamb fd9c9df5a8 Add support for sparc install includes. 2011-03-09 19:03:36 +01:00
Chris Lamb 468838fdad Refactor destination setting in lh_binary_silo to check arguments at beginning of the script. 2011-03-09 19:03:36 +01:00
Chris Lamb 1271828d6d Abort build if building from the root directory (/) as this causes misc build failures. 2011-03-09 19:03:36 +01:00
Chris Lamb 9fba09b735 Emit a warning when running lh_build without a config/ directory. 2011-03-09 19:03:36 +01:00
Chris Lamb 5e310e0fca Migrate a few uses of grep to In_list. 2011-03-09 19:03:36 +01:00
Chris Lamb f24582d59d Remove a useless space 2011-03-09 19:03:35 +01:00
Chris Lamb 988db3ba49 Consolidate grep text searching predicates to use "grep -qs"
If this is deemed not portable enough in the future, it should be easy
enough to find/replace.
2011-03-09 19:03:35 +01:00
Chris Lamb 5f3168deb7 Revert aborting live d-i installation if minimal/stripped is selected and instead attempt to not break the chroot too much in this case 2011-03-09 19:03:35 +01:00
Chris Lamb a5e675792a Replace another unweildy "if P1 || P2" statement with its "case" equivalent. 2011-03-09 19:03:35 +01:00
Chris Lamb 8474de1d65 Remove more imported whitespaces. 2011-03-09 19:03:35 +01:00