Commit Graph

2066 Commits

Author SHA1 Message Date
cd-builder user 677226f897 Tweak debootstrap handling:
The correct path for debootstrap code is /usr/share, not /usr/lib; use
that and assume it now.

Cope with the $(CODENAME) script not existing, and create a symlink to
sid where necessary. Just found in jessie - debootstrap needs
updating.
2013-05-07 00:29:55 +00:00
Steve McIntyre 5f0cdbd1ee * Start jessie work; copy things from the wheezy config for now.
* Remove older squeeze, lenny, etch dirs
2013-05-06 22:26:50 +00:00
Steve McIntyre 5b15d5ed2b Release 3.1.13 2013-04-30 21:55:51 +00:00
Steve McIntyre 89c274c415 debian-cd (3.1.13) unstable; urgency=medium
* The traditional "last upload before the stable release" upload...

  [ Robert Spencer ]
  * Use ARCHIVE_KEYRING_PACKAGE and ARCHIVE_KEYRING_FILE parameters to
    not hardcode debian-archive-keyring and let derivatives use their
    own keyring.
  * Add further support for missing win32-loader.ini. Closes: #705594
  * Allow for override of distro name etc. in grub.cfg for EFI boot too.
    Closes: #705610

  [ Steve McIntyre ]
  * Tweak handling of {udeb,base}_{include,exclude} files so multi-arch
    builds should work better. Closes: #703436
  * Remove the dpkg check for debootstrap version before passing the
    --no-check-gpg option; we're not going to support debootstrap versions
    so old that they don't support this flag, *and* the dpkg-query call
    doesn't give us the right version anyway - we're using an extracted
    copy from the archive, not the one that (might be) installed on our
    build machine.

# imported from the archive
2013-04-30 17:54:32 -04:00
Steve McIntyre c9aee5c3dd Sync up latest versions of scripts from the pettersson setup 2013-04-30 18:54:11 +00:00
cd-builder user 48f197d782 latest popcon data 2013-04-30 18:42:11 +00:00
Steve McIntyre 15f47873b4 Cosmetic tweaks to menu output 2013-04-23 17:33:03 +00:00
Steve McIntyre 9f329b5006 Check for DISKTYPE 2013-04-22 21:01:33 +00:00
cd-builder user 00295d5501 Latest popcon data 2013-04-19 17:23:41 +00:00
Steve McIntyre 038c7d9c04 Remove the dpkg check for debootstrap version before passing the
--no-check-gpg option; we're not going to support debootstrap versions
so old that they don't support this flag, *and* the dpkg-query call
doesn't give us the right version anyway - we're using an extracted
copy from the archive, not the one that (might be) installed on our
build machine.
2013-04-19 16:26:36 +00:00
Steve McIntyre b24595ba88 Tweak handling of {udeb,base}_{include,exclude} files so multi-arch
builds should work better. Closes: #703436
2013-04-19 16:07:58 +00:00
Steve McIntyre 497a82d798 Allow for override of distro name etc. in grub.cfg for EFI boot too.
Closes: #705610
2013-04-19 15:01:01 +00:00
Steve McIntyre 708240f580 Add further support for missing win32-loader.ini. Closes: #705594 2013-04-19 14:52:21 +00:00
Raphaël Hertzog 417d8fd591 Tweak logic to handle keyring for APT and debootstrap
Use ARCHIVE_KEYRING_PACKAGE and ARCHIVE_KEYRING_FILE parameters
and always use the unpacked keyring instead of the system-wide one.

Thanks to Robert Spencer <rspencer@lbsd.net> for the patch.
2013-04-19 13:03:59 +00:00
Raphaël Hertzog ef1e317123 Use ARCHIVE_KEYRING parameter to not hardcode debian-archive-keyring and let derivatives use their own keyring package. 2013-04-12 08:43:07 +00:00
cd-builder user 81267447ee Force network-manager packages onto CD1 for Gnome builds 2013-04-09 10:55:19 +00:00
Steve McIntyre 1b7e1c31a6 Fix typo in bug number 2013-04-01 13:44:00 +00:00
Steve McIntyre 0127c9c170 Ready for 3.1.12 release 2013-04-01 01:38:25 +00:00
cd-builder user 974c3b9a8c latest popcon data 2013-04-01 01:29:37 +00:00
Steve McIntyre 75007ece98 * Allow for override of DISKINFO base text; Closes: #695080 2013-04-01 01:26:54 +00:00
Steve McIntyre ea5ff2d358 Remove now-redundant add_grub_entry function 2013-03-24 20:13:25 +00:00
Steve McIntyre 2ab852fe07 Correct usage of dpkg-architecture to fix errors. Closes: 703487 2013-03-20 13:32:16 +00:00
Steve McIntyre b7ea5d5530 Fix cpp warning in Makefile. Closes: #704342 2013-03-19 15:41:47 +00:00
Steve McIntyre 7bccd7b9ca * Extract debian-archive-keyring when setting up apt to avoid error
messages about missing keys. Closes: #703431
2013-03-19 15:33:53 +00:00
Steve McIntyre 6cdcedd924 Slightly tweak the desktop wording 2013-03-07 07:57:54 +00:00
cd-builder user eff0131281 latest popcon data 2013-03-07 07:48:26 +00:00
Steve McIntyre a63e6a8de1 Don't use DISKTYPE, revert to CDROM for media type 2013-03-07 07:47:29 +00:00
Steve McIntyre f41da39ead Add missing 'fi' 2013-03-07 07:45:28 +00:00
Steve McIntyre e0ac5cf3cf Tweak layout of code 2013-03-07 07:33:58 +00:00
Steve McIntyre 075a74d33a Add missing 'cache' command 2013-03-07 07:29:59 +00:00
Steve McIntyre 38ec979060 * Add extra text to boot messages on powerpc to tell people about how to
select a different desktop. Thanks to Rick Thomas for the
    text. Tweaked slightly to list the default on the current disc too.
2013-03-07 07:21:09 +00:00
Steve McIntyre 82f8590462 Work out the default desktop for generic/all discs 2013-03-07 06:47:49 +00:00
Steve McIntyre 7ef1b0a5c8 * Update boot-mipsel and boot-hppa to use the which_deb script for
better safety when extracting boot loader files.
  * Update all the relevant boot-* scripts to do the right thing when
    extracting packages and sources, depending on
    $ARCHIVE_EXTRACTED_SOURCES as above
2013-03-07 06:34:07 +00:00
Raphaël Hertzog 4d8f781235 Update logic protecting lookup of syslinux's source in tools/boot/wheezy/boot-x86
Steve pointed out that this lookup is only here so that helper scripts
can grab those sources and make them available in a public location
such as http://cdimage.debian.org/cdimage/cd-sources/. The sources are
not embedded in the generated ISO and are thus not strictly needed
for building the ISO image.

This should happen even when we're not building source ISOs but it's
not needed if we don't have any similar policy in place. Thus CONF.sh
is now leaving $ARCHIVE_EXTRACTED_SOURCES unset by default and the
source will only be looked up if that value is set.
2013-03-01 13:22:22 +00:00
Raphaël Hertzog 1c4f1894cf Use debootstrap --no-check-gpg by default since many local mirrors
are not signed (such as temporary mirrors created by simple-cdd).
2013-03-01 11:00:36 +00:00
Raphaël Hertzog d07434cef1 Add dosfstools to Recommends since it's required by
tools/boot/wheezy/boot-x86 for EFI support. It can't be added to Depends
because it's not available on non-Linux systems.
2013-03-01 08:55:54 +00:00
Raphaël Hertzog d79ac8335d Update tools/boot/wheezy/boot-x86 to not look for syslinux's source
package if we're not including sources.
2013-03-01 08:50:34 +00:00
Raphaël Hertzog b77a268aa2 Update Makefile to set MKISOFS to xorriso by default when building
images for i386/amd64. Otherwise a build that doesn't set MKISOFS
and MKISOFS_OPTS fails.
2013-03-01 08:00:03 +00:00
Steve McIntyre bd8597feaa Deal with syslinux version 5.x needing to install more files for
bootable x86 media. Thanks to Daniel Baumann for the path.
Closes: #699884
2013-02-12 13:43:29 +00:00
cd-builder user 21785c08e5 Fix typo that broke source builds 2013-02-05 10:34:29 +00:00
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