Commit Graph

226 Commits

Author SHA1 Message Date
Daniel Baumann 8a0da57266 Reverse keywords in suffix of the package list files for consistency.
Previously, config/package-lists/foo.{binary,chroot}.list was used,
now we use config/package-lists/foo.list.{binary,chroot}.

That way, we're using the same single suffix for all files to make
them specific for either binary and chroot, rather than having
an exception to the rule for package list files.
2011-08-05 08:40:03 +02:00
Daniel Baumann a51393f49b Reverse keywords in suffix of the archive definition files for consistency.
Previously, config/archives/foo.{binary,chroot}.{key,list} was used,
now we use config/archives/foo.{key,list}.{binary,chroot}.

That way, we're using the same single suffix for all files to make
them specific for either binary and chroot, rather than having
an exception to the rule for archive definitions.
2011-08-05 08:28:45 +02:00
Daniel Baumann a56cc98f12 Removing -r from short options in lb_config (Closes: #636208). 2011-08-04 21:32:02 +02:00
intrigeri d8ac62a9ec Cleaning up temporary directories at the same time as other cruft. 2011-08-04 19:46:35 +02:00
Daniel Baumann 17283e776f Correcting typo in lb_config for program variable, thanks to intrigeri <intrigeri@boum.org>. 2011-07-26 14:49:29 +02:00
Daniel Baumann cacf9b6e34 Simplify bind mounting of the config tree during local hooks are run by using read-only bind mounts. 2011-07-25 18:05:40 +02:00
Daniel Baumann 6b63effdff Using 'live' rather than 'incomplete' for cd_type in .disk on images that include debian-installer with live-installer udeb. 2011-07-25 17:15:17 +02:00
Daniel Baumann 2a5263cb39 Updating grub packages list in binary_debian-installer. 2011-07-25 17:13:32 +02:00
Daniel Baumann cfd7f3103b Adding mdadm manually to extra packages for binary pool for being used by debian-installer (Closes: #607225). 2011-07-24 09:19:42 +02:00
Cody A.W. Somerville 50816947a7 Making config tree available to chroot hooks. 2011-07-21 18:35:56 +02:00
Cody A.W. Somerville e01424a1f2 Adding paths for remote debian-installer images on armel. 2011-07-21 17:58:21 +02:00
Daniel Baumann 8316bd2d98 Correcting uuid extraction from initrds in ubuntu mode to work from within binary so that it is cleaned up by lb_clean on failed builds. 2011-07-21 17:24:08 +02:00
Daniel Baumann 0aab94aac9 Calling mkdir with -p to avoid build failures with multiple kernels on disk info in ubuntu mode, thanks to Cody A.W. Somerville <cody.somerville@canonical.com>. 2011-07-21 17:06:54 +02:00
Cody A.W. Somerville 0d2cc22efc Adding function for more resilient detachment of loopback devices. 2011-07-21 17:00:54 +02:00
Cody A.W. Somerville ebc7a72501 Setting partition flags in source_usb after creating the filesystem in order to avoid bug in parted that makes them forget the flags. 2011-07-20 18:39:09 +02:00
Daniel Baumann 346397d2e0 Adding a comment to the chroot calls in excludes handling of binary_chroot whey the chroot function is not used. 2011-07-20 18:24:32 +02:00
Cody A.W. Somerville 651c8aebd2 Updating lb_binary_linux-image to only copy over kernel and initrd if LB_LINUX_PACKAGES doesn't equal 'none'. 2011-07-20 08:48:07 +02:00
Cody A.W. Somerville 31445ed7be Fixing corruption of usb binary images caused by trying to modify flags in partition table when image is mounted with offset. 2011-07-20 08:46:11 +02:00
Daniel Baumann fb2bc99fd5 Reworking binary hooks helper. 2011-07-19 19:03:01 +02:00
Daniel Baumann b70ec215ab Correcting comments in chroot_hooks to match usage. 2011-07-19 16:45:36 +02:00
Daniel Baumann a90294ff53 Calling dpkg-divert with --quiet in chroot_dpkg. 2011-07-19 12:39:47 +02:00
Daniel Baumann e4793268a3 Enabling hooks based on the mode we're building for. 2011-07-19 11:57:21 +02:00
Daniel Baumann ac6147adb7 Consolidating local hooks for chroot and binary into config/hooks/*.{chroot,binary}. 2011-07-19 10:57:02 +02:00
Daniel Baumann ef2752faab Adding kubuntu mode in order to have different defadefault hooks enabled for ubuntu and kubuntu (needed for #630088). 2011-07-19 10:51:20 +02:00
Daniel Baumann b22984f698 Also unmounting /run in lb_clean eventhough it's not really needed anyway but let's be on the caucious side (Closes: #633052). 2011-07-19 10:19:18 +02:00
Daniel Baumann 57ab082265 Using --no-check-gpg option when using debootstrap >= 1.0.30 and apt secure is disabled, thanks to Eugenio Paolantonio <me@medesimo.eu> (Closes: #633356). 2011-07-19 10:13:10 +02:00
Daniel Baumann 330d06708d Skipping binary_linux-image if no kernel was choosen to be installed deliberately, thanks to Adam Conrad <adconrad@ubuntu.com>. 2011-07-16 10:08:42 +02:00
Daniel Baumann 3a44d9acbd Correct gdm/gdm3 handling, prefere gdm for squeeze as before and use gdm3 for everything else. 2011-07-08 18:41:54 +02:00
Richard Nelson ecd8dca2ba Remove lxde test on LB_TASKS for gdm so we now get gdm3. 2011-07-04 18:40:44 -05:00
Daniel Baumann 42cfa2bf03 Correcting wrong chroot call in chroot_archives, only affecting derivatives. 2011-06-29 07:51:41 +02:00
Daniel Baumann f68ecad438 Making copyright headers distribution neutral. 2011-06-21 09:11:49 +02:00
Daniel Baumann bfadca3225 Correct keyring packages temporary workaround to not fail when aptitude is selected (Closes: #630919). 2011-06-18 23:10:39 +02:00
Daniel Baumann 75f87204da Removing forgotten reference to chroot_packages in lb_chroot. 2011-06-17 12:03:33 +02:00
Daniel Baumann 63560ff0b0 Adjust name of archives directory in config tree. 2011-06-17 11:25:52 +02:00
Daniel Baumann b86f9c6380 Since we don't have global packages anymore, renaming lb_chroot_local-packages to lb_chroot_packages and config/chroot_local-packages to config/chroot_packages. 2011-06-15 22:08:44 +02:00
Daniel Baumann cfb6ecedfa Since we don't have global tasks anymore, renaming lb_chroot_local-tasklists to lb_chroot_task-lists. 2011-06-15 22:01:51 +02:00
Daniel Baumann e26d3be01a Moving config/chroot_local-tasklists/*.list to config/task-lists/*.chroot.list, analogue to config/package-lists. 2011-06-15 21:52:45 +02:00
Daniel Baumann 9d905734e5 Unifying config/chroot_local-packagelists and config/binary_local-packagelists.
Rather than using config/chroot_local-packagelists/*.list and
config/binary_local-packagelists/*.list, we're simply using
config/package-lists/*.chroot.list and
config/package-lists/*.binary.list.
2011-06-15 21:37:10 +02:00
Daniel Baumann 36ecab10d3 Using .list suffix in config/archives. 2011-06-15 21:27:29 +02:00
Daniel Baumann 2312f18ef1 Changing archives key suffix from .gpg to .key. 2011-06-15 21:25:14 +02:00
Daniel Baumann a2551605c0 Unifying config/chroot_archives and config/archives, now only using config/archives.
Previously, we had config/chroot_sources (or config/chroot_archives)
that allowed local configuration for third-party repositories but we
also had config/archives (or config/repositories) that did the very
same, but also alled to use 'variables' (e.g. @DISTRIBUTION@ or
@ARCHIVE_AREAS@ to be used) that got replaces automatically.

Now, we have only config/archives that can do both. This gets rid
of the unecessary double handling of the same thing in two places.
2011-06-15 21:05:09 +02:00
Daniel Baumann 2cf5daeaef Renaming chroot_sources script to chroot_archives for consistency with debian-policy terminology. 2011-06-15 20:48:56 +02:00
Daniel Baumann a6988b188f Renaming repositories option to archives for consistency with debian-policy terminology.
In order to be consistent with terminology used in debian-policy,
we've always tried to use the same names for the same things.

The repository option is one of the last things that were too
late in squeeze release cycle to be renamed in time.
2011-06-15 20:40:18 +02:00
Daniel Baumann 21dfadb622 Using -wildcards option when calling mksquashfs with an excludes file. 2011-06-13 21:05:05 +02:00
Colin Watson 5d228a8e3e Add --initramfs-compression option (Closes: #627677). 2011-06-13 20:38:44 +02:00
Colin Watson d5510c9910 Divert flash-kernel aside while building the chroot (Closes: #630350). 2011-06-13 20:33:28 +02:00
Colin Watson abcc4ca9bf Add --swap-file-path and --swap-file-size options (Closes: #629637). 2011-06-13 20:08:34 +02:00
Daniel Baumann f342cd85b8 Correct lb cleans source removals. 2011-06-12 09:21:28 +02:00
Daniel Baumann 5b4e20599d Removing now unecessary stagefile check in lb_source. 2011-06-11 20:19:57 +02:00
Daniel Baumann df7b3d934f Moving installation of live packages to second pass. 2011-06-11 19:36:46 +02:00