Commit Graph

2076 Commits

Author SHA1 Message Date
Steve McIntyre 183ce1c83f Fix minor logic hole in source matching 2013-02-01 03:49:49 +00:00
Steve McIntyre 9d50fdb6f1 Fix up logic again for udebs without findable source 2013-01-30 19:40:01 +00:00
Steve McIntyre 4b512541d8 Make sure the DEBIAN_KERNEL placeholder in README.* is replaced;
switch from cpp to sed for that so it works inside quoted
text. Closes: #699198
2013-01-29 18:22:44 +00:00
Steve McIntyre 7a57363472 Update Vcs-Browser 2013-01-24 22:57:20 +00:00
Steve McIntyre 252013342e * Add support for Built-Using:
+ tools/sort_deps: parse out Built-Using from Packages files too and
      pass any such data on to tools/merge_package_lists
    + tools/merge_package_lists: if we have any built-using source
      packages listed when doing a combined binary/source set, add them in
      the same way as existing listed sources.
  * Other bug fixes in tools/merge_package_lists:
    + Fix handling of multi-line Binary: fields
    + Print out the accumulated size of source packages in output also
      (fix to printf format string)
2013-01-24 10:26:30 +00:00
Steve McIntyre e9ad5c11a4 Re-indent for sanity 2013-01-23 02:21:07 +00:00
cd-builder user 6406136673 Latest popcon data 2013-01-22 23:49:23 +00:00
Steve McIntyre f7269f8b4f Fix up xdigit regex to cope with new match code 2013-01-22 23:45:23 +00:00
Steve McIntyre 513f8c1191 When building source-only discs, cope with having multiple different
versions of a source package:

+ make_disc_trees.pl now tracks arrays of packages when parsing
  apt-cache output
+ We'll now pull in all the extra packages included in Sources.gz
  because of Built-Using.
2013-01-22 23:32:54 +00:00
Steve McIntyre 9b0889a250 Open for 3.1.12 after 3.1.11 release 2013-01-22 23:22:20 +00:00
Steve McIntyre cf9da2bcb8 Fix indentation 2013-01-20 01:18:52 +00:00
Steve McIntyre 35be7cbd78 Preparing 3.1.11 release 2013-01-20 01:10:37 +00:00
Steve McIntyre 0dc48d660e Commit latest build scripts into debian-cd contrib ready for a release 2013-01-20 01:03:24 +00:00
cd-builder user 0d6c4ad905 latest popcon data 2013-01-20 00:56:15 +00:00
Steve McIntyre 4e7009403e Rearrange xorriso dependency 2013-01-15 02:09:36 +00:00
Steve McIntyre 1ed76605db document boot-x86 xorriso updates 2013-01-15 02:07:47 +00:00
Steve McIntyre 28dba2b777 Gah, undo broken commit 2013-01-15 01:56:42 +00:00
Steve McIntyre 5d2db49de9 Depending on the version of xorriso we have, use different EFI command line options 2013-01-15 01:51:51 +00:00
Steve McIntyre f299e200d7 only add a partition offset if we don't have grub files 2013-01-15 01:32:39 +00:00
Steve McIntyre 5cb7afe1f2 add code to grab the version of xorriso 2013-01-15 01:14:22 +00:00
Steve McIntyre 75053f33dc shuffle code a little 2013-01-15 01:09:52 +00:00
Steve McIntyre fdc90e1e3a Switch boot-x86 to always depend on xorriso now 2013-01-15 01:05:18 +00:00
cd-builder user 57a7129b8b Fix accidental commit 2012-12-29 03:54:26 +00:00
Steve McIntyre d51ba39a32 Also print out any trailing kernel entries 2012-12-29 03:52:48 +00:00
cd-builder user d658a59cc1 latest popcon data 2012-12-29 03:37:18 +00:00
Steve McIntyre 17f65ab8e2 Provide a better set of boot menus when booting via EFI. Previously
had a limited set of hard-coded menu entries - this was buggy and
didn't take into account all the possible boot variations. Now parse
the isolinux menus already provided in the d-i build and generate
equivalent grub menus, complete with themes for a reasonable layout
with graphics and titles.
2012-12-10 01:12:44 +00:00
cd-builder user 42395e37dc latest popcon data 2012-12-10 00:16:59 +00:00
cd-builder user 23b814b5bc silly thinko 2012-12-06 17:39:34 +00:00
Steve McIntyre 3e98cc6044 * Improve architecture support in which_deb. Closes: #695244
+ Check all the architectures available in the archive if we're not
    specifically told which to use (e.g. on source builds)
  + If we fail to find packages/sources for the specified package, say
    so and bail out properly.
2012-12-06 17:36:28 +00:00
cd-builder user 44907c0720 latest popcon data 2012-09-28 09:44:41 +00:00
Steve McIntyre ca4ae110df Bugfix for new sort_deps code:
Old code used to add the various options in the special case for
"pacakges providing not truly virtual pacakges", which amounted to an
OR dep on the whole set. I missed that in the re-implementation with
version tracking.

Now explicitly switched to adding an OR dep for *all* cases here -
other code will deal with that already. Tweak the logging code to make
things clearer too...
2012-09-27 18:26:19 +00:00
Steve McIntyre b435f7b341 Make the dump of dependencies more verbose at parse time 2012-09-27 16:52:00 +00:00
Steve McIntyre 6230392432 Fix scoping bug when parsing dependencies
The %elt hash needs to be a new one each time we push to the
dependency lists, otherwise we'll just be updating the existing one
each time we push().
2012-09-27 16:49:26 +00:00
Steve McIntyre c46f7c0cf6 * Add version-tracking into dependency sorting. Closes: #687949)
+ Use/parse output from a newer version of apt so that "apt-cache
      depends" will include version information on dependencies.
    + All tracking of packages now include versions, so we pass around
      hashes of {package name, comparison op, version} everywhere instead
      of simply passing package names as strings.
    + Add the APT::Cache::ShowVersion=1 option to apt-cache calls to
      turn on version reporting. Needs a locally-patched version of apt
      *for now*, but expecting that to be fixed for the Wheezy
      release. The new code degrades gracefully if version info is not
      available.
    + Add a dependency on libdpkg-perl for version comparison code.
2012-09-26 18:18:47 +00:00
Steve McIntyre 7072e8b02c Add /sbin and /usr/sbin to PATH, needed for mkfs.msdos and maybe other tools 2012-09-26 09:45:05 +00:00
Steve McIntyre b3436176c2 Add Recommends:mtools for EFI use 2012-09-26 09:27:53 +00:00
Steve McIntyre 579e443ca5 * Merge x86 EFI support from the EFI_support branch (Closes: #658352)
+ Pull in grub-efi for amd64 and i386
    + Lots of extra code in boot-x86:
      - pull grub EFI pieces out of the latest debian-cd_info.tar.gz
    	blobs in d-i, if they're there. If so, use them to make x86 images
	    bootable via EFI (both via CD and USB)
      - generate boot entries for grub on the fly; temporary code for now,
	    will switch to parsing the isolinux entries shortly instead.
      - depending more and more on xorriso rather than genisoimage...
2012-09-26 00:17:27 +00:00
Steve McIntyre f92b41bb54 BLS=4 for BIOS boot 2012-09-20 11:46:46 +00:00
cd-builder user a2e6782770 Remove -e bashisms from Makefile 2012-09-17 00:49:36 +00:00
Steve McIntyre 4ba7173970 Remove redundant mouseemu entry 2012-09-04 16:56:11 +00:00
Steve McIntyre 77a1ae8db1 Prepare 3.1.10 release 2012-08-24 13:50:35 +00:00
Steve McIntyre 50cd4d3e86 Prepare 3.1.10 release 2012-08-24 13:48:25 +00:00
cd-builder user 675df91d31 latest popcon data 2012-08-24 13:41:27 +00:00
Steve McIntyre c7a51f405f Move the mkisofs_opts calls until after we've copied the isolinux.bin file into place 2012-08-13 13:22:13 +00:00
Steve McIntyre a37770b429 Update the boot-load-size parameter for all ElTorito booting arches 2012-08-13 13:06:04 +00:00
Steve McIntyre 4d8a88e5da * Tweak boot-load-size for ia64 to make CDs boot again. Closes: #678883.
Thanks to Stephan Schreiber for the patch.
2012-08-07 20:48:16 +00:00
Steve McIntyre ca7d9c00f5 Add extra files, forgot to commit yet 2012-08-05 15:38:55 +00:00
Steve McIntyre 747c65e354 * Tweak powerpc boot options, using 32/64 bit detection in yaboot at
boot time. Thanks to Milan Kupcevic for the patch. Closes: #678066
2012-08-04 17:47:47 +00:00
Steve McIntyre c245a5c696 Tweak sort_deps:
+ Track whether a dependency chain is caused by a hard dependency
  (Depends) or soft (Recommends/Suggests). If we fail to add a package
  down the chain on a *soft* dependency, don't invalidate the entire
  chain.
+ When checking OR dependencies, *first* check to see if any of the
  options are already installed *before* trying to install the first
  option. Helps a lot with circular deps such as task-lxde-desktop ->
  task-desktop -> (task-gnome-desktop | task-lxde-desktop | etc.); in
  this case, of course task-lxde-desktop should satisfy the OR dep.
2012-08-02 23:57:40 +00:00
cd-builder user f6d4aa77a7 latest popcon data 2012-08-02 23:44:28 +00:00