Commit Graph

62 Commits

Author SHA1 Message Date
Daniel Baumann 50d889c714 Changing binary indices behaviour as suggested by Ben Armstrong <synrg@debian.org>, means we're now including binary sources by default (unless they are the same as chroot ones), and binary indices now only controls if apt lists need to be included in the resulting binary image. 2011-03-09 19:17:03 +01:00
Daniel Baumann 701b5affd4 For consistency, using true|false instead of enabled|disabled in configuration options. 2011-03-09 19:17:03 +01:00
Daniel Baumann 6b1d9f2ab8 Adding suffix .list to sources.list.d snipplets. 2011-03-09 19:17:02 +01:00
Daniel Baumann 89ae063991 Using /etc/apt/sources.list.d mechanism for local sources.list snipplets. 2011-03-09 19:17:02 +01:00
Daniel Baumann 5e4952e8a7 Adding debian version 2.0~a1-1. 2011-03-09 19:16:26 +01:00
Karl Goetz 23fc01e1b8 Correcting comment about replacing /dev/urandom with /dev/random. 2011-03-09 19:09:48 +01:00
Cody A.W. Somerville a486d3e1ad Adding Ubuntu mode. 2011-03-09 19:09:44 +01:00
Daniel Baumann 9a8304d03b Adding new setting for binary indices: If set to none, no indices are included at all. 2011-03-09 19:09:42 +01:00
Daniel Baumann 989f26d87b Updating year in copyright notices for 2009. 2011-03-09 19:09:40 +01:00
Daniel Baumann 9ce762a502 Using common function file to source shell includes. 2011-03-09 19:09:40 +01:00
Antonio Terceiro 8a477ac3a9 Translating the description of the helpers 2011-03-09 19:09:39 +01:00
Daniel Baumann 4185bfed45 Moving removal of apt packages lists from minimal and stripped hook to lh_chroot_sources, thanks to Ben Armstrong <synrg@debian.org>. 2011-03-09 19:09:39 +01:00
Daniel Baumann 55254a01fd Applied patch from Maximilian Gass <mxey@cloudconnected.org> to fix typo in generation of release files in lh_chroot_sources. 2011-03-09 19:03:44 +01:00
Daniel Baumann 1c1e7db6c4 Generalizing internal Chroot(); by requiring its first argument to be the chroot directory. 2011-03-09 19:03:43 +01:00
Daniel Baumann 6696b019fe Renaming internal Read_conffile(); to Read_conffiles(); for consistency reasons. 2011-03-09 19:03:43 +01:00
Daniel Baumann 6204dc0e6d Enforcing lh_config to be run before lh_build, see also http://lists.debian.org/debian-live/2008/10/msg00102.html (Closes: #500740). 2011-03-09 19:03:42 +01:00
Daniel Baumann 817f3f8cf6 Improving indices workaround by checking LH_BOOTSTRAP_FLAVOUR rather than LH_PACKAGES_LISTS in order to handle chicken-egg problem for installing apt-utils when having bootstrapped a minimal chroot. 2011-03-09 19:03:42 +01:00
Daniel Baumann ed6d9e8c8c Adding explicit --yes to apt-get call when installing keyring packages (previously, this was inherited through Apt(); wrapper) (Closes: #499625). 2011-03-09 19:03:42 +01:00
Daniel Baumann 1102bca971 Always using apt to install keyring packages (Closes: #498531). 2011-03-09 19:03:41 +01:00
Daniel Baumann 3c48eb2a5a Fixing a chicken-egg problem with package indices when using minimal/stripped list *and* including local-packages. 2011-03-09 19:03:40 +01:00
Daniel Baumann fa8e9f9381 Renaming sections to categories in order to use the same names as Debian Policy does (Closes: #483777). 2011-03-09 19:03:40 +01:00
Chris Lamb 1010bcc390 Generate Release file for chroot_local-packages when APT_SECURE is disabled.
This was preventing the pinning mechanism to work when it security was
disabled.
2011-03-09 19:03:39 +01:00
Tiago Bortoletto Vaz 6205a24620 Adding last modifications in order to have localization fully working in live-helper. This commit goes with some pt_BR translations just for testing. Thanks to Antonio Terceiro for helping and coding in some shell stuff. 2011-03-09 19:03:38 +01:00
Antonio Terceiro 7f1a4e4fc5 Replacing file checking with ls by function calls
Instead of repeatedly doing "ls ... > /dev/null 2>&1", just use a
function that does exactly that.
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
Daniel Baumann b13a8381a4 Only using hardlinks for local-packages when hardlinks are possible. 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 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 0e0c22cb6f Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9) 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 a26d1c55e1 Ensure apt-utils is installed in the helpers it is required.
This allows us to remove a hacky test from hooks/minimal to see whether
we need the package.
2011-03-09 19:03:35 +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 7bcdcf7f05 Using hardlinks to copy local packages into chroot. 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
Daniel Baumann 26fc30d8eb Using new Read_conffile(); now. 2011-03-09 19:03:31 +01:00
Daniel Baumann c6b83b1fd3 Adding 'all' configuration file. 2011-03-09 19:03:31 +01:00
Daniel Baumann c5a91189a0 Updating copyright years to 2008. 2011-03-09 19:01:41 +01:00
Daniel Baumann 5ce2688675 Re-adding additional indices updated, otherwise we wouldn't honor thirdparty repositories (anymore). 2011-03-09 18:36:09 +01:00
Daniel Baumann b0c38d67e2 Renaming LH_MIRROR_BOOTSTRAP* to LH_MIRROR_CHROOT and introducing dedicated LH_MIRROR_BOOTSTRAP for debootstrap/cdebootstrap only. 2011-03-09 18:36:07 +01:00
Daniel Baumann 953a3d1af6 Renaming extra bootstrap indices to chroot. 2011-03-09 18:36:06 +01:00
Daniel Baumann 09f88a6e38 Adding apt/aptitude options.
By using APT_OPTIONS and APTITUDE_OPTIONS in config/common,
one can manipulate the default options wich is made to each
and every apt and aptitude call.
2011-03-09 18:36:05 +01:00
Daniel Baumann cd2618e5d5 Adding an upgrade and dist-upgrade to lh_chroot_sources, so that security updates gets pulled into the base system. Thanks to Kai Hendry <hendry@iki.fi>. 2011-03-09 18:22:29 +01:00
Alex Owen 2ea3db43de fix lh_chroot_sources to actually install *.deb from config/chroot_sources 2011-03-09 18:22:28 +01:00
Daniel Baumann 624fca8de5 Removing ubuntu support. 2011-03-09 18:22:27 +01:00
Daniel Baumann f2734daf0a Replacing backticks with POSIX expression. 2011-03-09 18:22:27 +01:00
Daniel Baumann 28dac4f438 Adding live-helper 1.0~a23-1. 2011-03-09 18:22:26 +01:00
Daniel Baumann 0d0de885e3 Adding live-helper 1.0~a22-1. 2011-03-09 18:22:26 +01:00