lp://staging/ubuntu/trusty-proposed/debian-cd
- Get this branch:
- bzr branch lp://staging/ubuntu/trusty-proposed/debian-cd
Branch merges
Branch information
Recent revisions
- 20. By Steve McIntyre
-
[ Steve McIntyre ]
* Start jessie work; copy things from the wheezy config for now.
* Remove older squeeze, lenny, etch dirs
* Move code hosting from svn to git.
* Make sure that when we call apt, we tell it to *not* use localised
package descriptions; this causes issues during build. See #712435 in
apt.
* List Translation files in dists/$dist/Release too - apt looks there
now instead of in Index, apparently.
* Remove mention/support of the s390(x) tape options; not created by d-i
any more, and this is causing build failures.
* Remove mention/support of old kfreebsd 8 kernels - they are not
created any more, and this is causing build failures.
* Remove s390 from the arch lists in various scripts, as it's going
away. Support remains if specifically configured yet.
* tools/update_tasks: don't hard-code the default desktop to use,
instead work it out directly from the dependencies of the task-desktop
package.
* tools/boot/jessie/ *: Pull out some more common code into common.sh to
simplify the various boot-$arch scripts. Warn about potentially
insecure download locations.[ Robert Spencer ]
* Build without isolinux/desktop. Closes: #706150
* Don't assume loadlin.exe exists. Closes: #706156[ Joey Hess ]
* Add make and gcc back to forcecd1, to allow building out of tree
kernel wifi modules. I removed this and more earlier while cleaning
out undocuented cruft.
(I have not added back module-assistant so far,
since it needs build-essential which would pull in additional
dependencies.) - 19. By Steve McIntyre
-
* 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. - 18. By Steve McIntyre
-
[ Steve McIntyre ]
* 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.
* 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)
* Update Vcs-Browser
* 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
* Deal with syslinux version 5.x needing to install more files for
bootable x86 media. Thanks to Daniel Baumann for the path.
Closes: #699884[ Raphaël Hertzog ]
* 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.
* Update tools/boot/wheezy/ boot-x86 to not look for syslinux's source
if $ARCHIVE_EXTRACTED_ SOURCES is not set and modify CONF.sh
to not set it by default. That option is only meaningful for
official builds that result in a copy of the sources on the given URL.
* 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.
* Use debootstrap --no-check-gpg by default since many local mirrors
are not signed (such as temporary mirrors created by simple-cdd).[ Steve McIntyre ]
* 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
* 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.[ Robert Spencer ]
* Extract debian-archive- keyring when setting up apt to avoid error
messages about missing keys. Closes: #703431
* Fix cpp warning in Makefile. Closes: #704342
* Correct usage of dpkg-architecture to fix errors. Closes: #703487[ Steve McIntyre ]
* Allow for override of DISKINFO base text; Closes: #695080 - 17. By Steve McIntyre
-
[ Steve McIntyre ]
* 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)
- 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.
- depending more and more on xorriso rather than genisoimage...
* 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.
* 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.
* Switch boot-x86 to depend on xorriso totally rather than genisoimage
now; working UEFI support needs it. We also need very recent (1.2.6)
xorriso for various bugfixes, ideally. - 16. By Steve McIntyre
-
[ Steve McIntyre ]
* Don't exclude all the udebs for s390. Some users really do need them
(loading from a CD/DVD used over the network). Closes: Bug #673576
* Explicitly add s390-tools and sysconfig-hardware for s390.
* 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.
* Tweak powerpc boot options, using 32/64 bit detection in yaboot at
boot time. Thanks to Milan Kupcevic for the patch. Closes: #678066
* Tweak boot-load-size for ia64 to make CDs boot again. Closes: #678883.
Thanks to Stephan Schreiber for the patch. Tweak all the other
ElTorito-booting arches in a similar fashion.[ Joey Hess ]
* Clean up forcd1, removing twm, wmaker, wmakerconf, pump,
menu (pulled in by desktop tasks),
aptitude (pulled in by debootstap, and may be demoted to optional),
alsa-utils, alsa-base (pulled in by task-desktop),
mdetect, read-edid (no longer used by xorg),
grub (handed by generate_di+k_list) ,
deborphan, debfoster, localepurge (expert user stuff),
chdrvfont (no such package any more),
discover, popularity-contest, wpasupplicant, openssh-server
(in generate_di+k_list) ,
gnupg (pulled in by debootstrap)
* Updated generate_di+k_list to match more closely the current
packages d-i apt-installs.
* Further trim forcd1, removing lots of historical cruft, and adding
comments explaining the rationalle for the remaining packages. - 15. By Steve McIntyre
-
[ Steve McIntyre ]
* Add s390x as a known architecture, merging common s390/s390x boot
setup scripts.
* Add dependency on xorriso. Closes: #673656
* Describe discs appropriately depending on the kernel used.
Closes: #673975
* Clean up handling of environment variable handling in perl tools.
* Switch over to working with new task-* metapackages. Closes: #672941
* Add espeakup to forcd1, so we get speech synthesis for a11y early on full
CD/DVD sets. Closes: #678064
* Fix installer priority handling on pegasos. Closes: #679798.
Thanks to Milan Kupcevic for the patch.
* Add gtk initrd to hurd-i386 images. Closes: #635260
Thanks to Samuel Thibault for the patch.
* Updated all the latest in-use scripts and config in the contrib dir. - 14. By Steve McIntyre
-
[ Steve McIntyre ]
* Switch i386 kernel flavours again on advice from Ben:
+ Removed all mention of 686-bigmem as it's now gone
+ Added 686-pae onto CD#1 in place of 686
+ Leave the 486 kernel on CD#1 still, for people who can't use 686-pae
+ Add zfsutils into the generate_d-i+k_list for kfreebsd users.
* Add support for translated package description files. Closes: #495102
+ Add needed dependency on bzip2
+ Other minor cleanups in tools/make_disc_trees. pl
* Fix "expert" mode in yaboot for powerpc. Closes: #636265. Thanks to
Milan Kupcevic for the patch.
* Update list of Linux kernel packages. Closes: #648690. Thanks to Ben
Hutchings for the patch.
* Remove lots of old stuff neither needed nor supported any more:
+ removed architectures: alpha arm hppa
+ removed releases: etch lenny
+ removed unversioned data/sparc and data/yaboot, versioned
equivalents are in place already.
* tools/generate_firmware_ task: Add LOCALDEBS support
* Add more armel kernel flavours
* Add armhf as a known architecture, merging common armel/armhf boot
setup scripts.
* Remove hppa boot script, unsupported now.
* Tweak command line options for creating source images: add -joliet-long[ Joey Hess ]
* Read tasksel's debian-tasks.desc from its new location.[ Ian Campbell ]
* Rename "xm-debian.cfg" to just "debian.cfg" for Xen config.[ Raphaël Hertzog ]
* Changes triggered by various lintian warnings:
+ Switch to “3.0 (native)” source format to get rid of .svn
directories in the source package (when built from the svn checkout
directly)
+ Support build-arch/build-indep targets in debian/rules.
+ Drop executable rights from tools/boot/wheezy/ boot-hurd
(and fix debian/rules to not re-add it).
+ Bump Standards-Version to 3.9.2 (no change required).[ Philipp Kern ]
* Add an extra tweaked version of d390.ins for s390 booting. The
Hardware Management Console needs the file to be in the root
directory.[ Robert Millan ]
* Add kfreebsd 9. Closes: #650926
* Add graphical installer image for kfreebsd-amd64. Closes: #651530
* generate_d-i+k_list: Add ufutils. Closes: #662234 - 13. By Steve McIntyre
-
[ Ben Hutchings ]
* In the boot prompt for powerpc, make install64 more prominent.
Closes: #614583[ Steve McIntyre ]
* Merge update-cd changes back from the squeeze branch:
+ Remove the old non-US stuff from it, it's not been needed in years.
+ Cope with .bz2 source files too.
+ Merged and simplified the old functionality from scansources.old
and scanpackages.old into the new script create_control.
+ Run the mkisofs step *outside* of "set -e" so that we can actually
report errors instead of silently failing.
+ Split out the code for starting a new disc into a function.
+ Pick up on a potential bug: if we finish the last (expected) disc with
a backed-out file, make sure we create another image to include that
file too.
* Update make_disc_trees.pl and which_deb to cope with different
types of source file, and clean up the code in that area.
* tools/make_image: generate list files while we have the CD trees
available
* update the URL for downloading s390 d-i dailies.
* Add linux-image-2.6-686- bigmem to tasks/< release> /interesting- fromcd23
to try and put that on i386 image sets before linux-image-amd64.
Closes: #622622
* update the URL for downloading i386 d-i dailies.
* update the URL for downloading armel d-i dailies.
* tools/grab_md5:
+ Improve Packages and Sources file parsing;
+ Cope with differently-formed files that are still valid
(don't assume field ordering).
+ Switch from awk to perl makes things much faster too!
+ Make arch handling more generic - instead of having to list all
arches, allow a wildcard and then check for lack of Packages.gz files
* tools/make-firmware- image: Rather than use the firmware task which
gets out of date, look for firmware/microcode files directly in the
Packages file. Check for things installing in /lib/firmware, and add
those packages.
* Remove the checked-in firmware task altogether, as it's not
useful. Generate it when needed using the new script
tools/generate_ firmware_ task.
* Add apt-offline to tasks/wheezy/forcd1 to bring it onto CD#1.
Closes: #630805
* Add links to snapshot.debian.org into jigdo files.[ Aurelien Jarno ]
* Add support for hurd-i386. Closes: #619211 - 12. By Steve McIntyre
-
[ Raphaël Hertzog ]
* Add the missing accent in my family name in Uploaders.
* Drop Frans Pop from Uploaders, RIP.[ Steve McIntyre ]
* Start wheezy development, doing "svn cp squeeze wheezy" and
"s/squeeze/wheezy/ " in various places.
* Add support for over-riding disc size on demand, used for some of the
squeeze release builds.
* Add disk size definitions for 1/2/4/8 GB USB sticks.
* Extend the size-override code to allow to override an individual disc
in the set (e.g. to make the first DVD fit on a 4GB USB
stick). Closes: #612074
* Special-case builds of source-only discs: if we think we've
overflowed the disc size, try to carry on for a few more packages
to get closer to actually filling the disc. Closes: #613751.
* Path to sparc daily builds has changed.
* armel hasn't booted off CD in ages for us; comment out the DI_WWW_HOME
definition to stop the mirror script complaining.
* Add more checksum types to generated Release files; go from md5 only
to md5, sha1, sha256 and sha512.
* tools/start_new_disc: tone down messages about missing
{BASE,UDEB}_{ INCLUDE, EXCLUDE} files from ERROR to WARNING.
Closes: #615043[ Otavio Salvador ]
* Add btrfs-tools on required packages by installer. Closes: #612007.[ Didier Raboud ]
* Remove win32-loader standalone flavours from the tools/ directory on
x86. Closes: #612224 - 11. By Steve McIntyre
-
[ Steve McIntyre ]
* Final upload for squeeze.
* Pass the base mkisofs options into make_disc_trees too.
* Switch to --iso-level 4 for powerpc images to make them work better
with POWER machines. Thanks to Milan Kupcevic for the patch.
Closes: #603536
* Add code to make isohybrid images for i386/amd64:
+ Makefile: Add support for overriding the MKISOFS and MKISOFS_OPTS
variables on a per-arch basis
+ CONF.sh: add working examples for this
+ CONF.sh: fix up the -jigdo-min-file- size option to use 1024 instead
of 0; genisoimage used to fix this up, but xorriso doesn't.
+ tools/boot/squeeze/ boot-x86: if configured to use xorriso, add the
extra command line options to add the isohybrid MBR. Also work
around a difference in ISO directory naming between genisoimage and
xorriso.
+ Closes: #551951
* Drop the recommended size for BD-ROMs slightly, on the recommendation
of Thomas Schmitt. This will make it more likely that we'll fit on
all media.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/utopic/debian-cd