Commit Graph

1381 Commits

Author SHA1 Message Date
Steve McIntyre 8c52820262 Be more verbose when leaving packages out due to size limits 2022-10-07 15:55:12 +01:00
Raphaël Hertzog 805b36d16b Remove tools/sort_deps_edu
Its only purpose was to try to implement the recursive lookup that got
implemented in ca9ac8deac
2022-08-09 19:39:46 +02:00
Raphaël Hertzog e77ade6033 Remove dead code in sort_deps and improve log messages
The dependency tree created by parsing the output of "apt-cache depends" always
generates an array of array. The old representation of a simple dependency as
an hash is gone in favor of an OR with a single entry (so the hash is the only
element within the array).

So all the code in add_missing() that was dealing with the case of the hash
was never triggered.

I tweaked the OR case so that the generated log messages actually
mention "OR" only if it's a true OR dependency (i.e. with multiple
entries in the array).
2022-08-09 19:39:15 +02:00
Raphaël Hertzog ca9ac8deac Implement recursive lookup of Recommends and Suggests
Everywhere where we call add_missing() on Depends, we must do it also
on Recommends and Suggests based on $add_rec and $add_sug.

Tweak the code that is supposed to stop the recursion to use
the list that we have built but don't be strict about version
constraints on Recommends/Suggests since they can't always
be respected.

Closes: #601203
2022-08-09 19:37:48 +02:00
Steve McIntyre 3a13ddb48a Revert "Implement recursive lookup of Recommends and Suggests"
This reverts commit 8513b237af.

This change doesn't seem ready yet - running a weekly build failed
with massive memory usage.
2022-08-08 20:23:13 +01:00
Steve McIntyre 8c86a9b3ed Revert "Remove tools/sort_deps_edu"
This reverts commit cc4e1fa450.
2022-08-08 20:22:44 +01:00
Raphaël Hertzog cc4e1fa450
Remove tools/sort_deps_edu
Its only purpose was to try to implement the recursive lookup that got
implemented in 8513b237af.
2022-08-05 09:52:58 +02:00
Raphaël Hertzog 8513b237af
Implement recursive lookup of Recommends and Suggests
Everywhere where we call add_missing() on Depends, we must do it also
on Recommends and Suggests based on $add_rec and $add_sug.

Closes: #601203
2022-08-05 09:36:17 +02:00
Raphaël Hertzog c9489cd926
Turn $add_rec and $add_sug into globals
There's no point in passing them as parameters everywhere.

This changes the behaviour in some places:

1/ When we process the non-explicitly included packages (for COMPLETE=1),
we used to never take Recommends/Suggests into account, now we do. But
the only thing that will be changed is the ordering with some
Recommended packages being included before their depending package.

2/ When we process the EXTRANONFREE image, this one was always including
Recommends and Suggests, and it's now respecting the setting too.
2022-08-05 09:13:44 +02:00
Raphaël Hertzog bbeab52f9a
Fix install_firmwares_initrd to not fail when the firmware is not found. 2022-08-05 09:12:54 +02:00
Samuel Thibault daa1af93d0 On firmware images, include the sound firmwares
in the espeakup-enabled initrd itself. Closes: #992699
2022-02-14 18:31:18 +01:00
bauen1 465f9c335b pass --invariant and -i deb00001 to mkfs.msdos
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2022-02-14 11:34:32 +01:00
bauen1 65196d4dcf Avoid embedding timestamps into gzipped Packages and Translations files.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2022-02-14 11:34:13 +01:00
Steve McIntyre 6b61e01f15 Try to remove dirs when rolling back 2021-12-06 23:50:22 +00:00
Steve McIntyre cb14a9f29b Also update the code layout, sid->bookworm 2021-09-22 21:38:42 +01:00
Raphaël Hertzog 8d2bd4aa2e
Add cryptsetup-initramfs to tools/generate_di+k_list
It's required by debian-installer and cryptsetup >= 2.4.0 no longer
recommends it, so it ends up missing in the netinst image.

base-installer then fails to honor the apt-setup request and the
resulting system is unbootable because the initramfs doesn't contain
anything to unlock the encrypted partitions. :-(
2021-08-27 19:12:02 +02:00
Cyril Brulebois 897bf4754d generate_firmware_patterns: Drop support for the temporary --test option. 2021-08-22 16:17:41 +02:00
Steve McIntyre 5e3dec1796 Use $CODENAME/updates for security pre-bullseye
or $CODENAME-security for bullseye onwards.
2021-08-15 11:48:46 +01:00
Steve McIntyre 8ff621fcb6 Start bookworm development
Copy the bullseye dirs to bookworm as a start
2021-08-14 22:45:15 +01:00
Cyril Brulebois a80f013b57 Include more modules, under kernel/sound/soc/intel/boards
As suggested by Ben Hutchings in:
  https://salsa.debian.org/kernel-team/firmware-nonfree/-/merge_requests/19

[ Best viewed with -b due to initial indentation inconsistency before
reimporting the updated list of aliases. ]
2021-07-25 23:06:47 +02:00
Steve McIntyre 4d4399012d Add support for creating firmware patterns at build time
Using the new generate_firmware_patterns script, generate a patterns
file in /firmware/dep11/<package>.patterns as we add a firmware
package onto media.

Deal with size changes as these are added/removed, and add them to the
md5sum.txt file on media too.
2021-07-25 18:26:15 +01:00
Steve McIntyre f7e973a181 Add a --package option to limit output to one specified package name 2021-07-25 18:26:11 +01:00
Steve McIntyre 047ec2b360 Fix up firmware package rollback
If we removed a firmware package, also remove the link in /firmware
2021-07-25 18:26:08 +01:00
Cyril Brulebois 235ffb75c9 Add a note regarding other intel sof modules. 2021-07-25 08:46:32 +02:00
Cyril Brulebois 8e4fa300d8 Add a reminder about firmware-sof-signed (if --verbose was passed). 2021-07-25 08:40:49 +02:00
Cyril Brulebois 27f8524d0a Hardcode aliases from firmware-sof-signed.
The source code doesn't use the MODULE_FIRMWARE() macro so the machinery
implemented in src:firmware-nonfree wouldn't help. Extract alias info
manually once, and make note to keep an eye on further updates (e.g. via
a crontab on d-i.debian.org).
2021-07-25 08:40:43 +02:00
Cyril Brulebois c980454172 Extract alias formatting for later reuse. 2021-07-25 08:36:28 +02:00
Cyril Brulebois 91508a24c9 Keep track of all firmware packages found. 2021-07-25 08:16:44 +02:00
Cyril Brulebois c9f7df2963 Move main part to the bottom, it's getting extended. 2021-07-25 08:11:58 +02:00
Cyril Brulebois dae7be7662 Add small README.txt alongside .patterns files. 2021-07-25 07:32:30 +02:00
Cyril Brulebois a726d0df83 Update comments. 2021-07-25 07:20:53 +02:00
Cyril Brulebois 76fc95f307 Generate .patterns (plural) files. 2021-07-25 07:20:53 +02:00
Cyril Brulebois 9d570ad032 Implement support for --test option.
At the moment, there's no package with Type == firmware in the archive,
so --test lets us toy without that filter, finding a bunch of packages.
2021-07-25 07:20:53 +02:00
Cyril Brulebois 18e27f6e08 Implement support for --output-dir 2021-07-25 07:20:53 +02:00
Cyril Brulebois 21509942d1 Prepare support for command line options.
Implement --verbose directly.
2021-07-25 07:20:53 +02:00
Cyril Brulebois ff8ef160ea Add generate_firmware_patterns script and dependencies (see: #989863). 2021-07-25 07:20:30 +02:00
Steve McIntyre 221d702284 Add brltty and espeakup to all images from netinst up 2021-05-16 15:37:38 +01:00
Steve McIntyre da120b29d9 Shorten "ppc64el" to "p64el" in the volume ID
The bullseye d-i RC1 build failed as the volume ID was too long
2021-04-15 21:14:09 +01:00
Wolfgang Schweer 5abcc48f75 tools/boot/*/boot-x86: Prevent custom splash images from being modified
The related code seems to have been useful a long time ago (the need to use
  an RLE file and to reduce the number of colours to 16 has been dropped as of
  syslinux version 3.62). So replace obsolete code with a simple cp command.

Signed-off-by: Wolfgang Schweer <wschweer@arcor.de>
2021-02-24 16:51:54 +00:00
Samuel Thibault 5e606aa1ed Allow archive tree to contain symlinks
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
2021-02-20 01:31:15 +01:00
Samuel Thibault 7da3ab7110 Add missing checksum grab for unreleased
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
2021-02-19 23:57:16 +01:00
Samuel Thibault 49d60b38b4 Allow archive tree to contain symlinks
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
2021-02-19 20:33:55 +01:00
Holger Levsen 9c8fc62807 make_disc_trees: create Packages files for local/debian-installer. Closes: #523017
tools/make_disc_trees.pl: Apply patch by Daniel Dickinson to create Packages
files for local/debian-installer. Closes: #523017

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2021-02-03 17:36:13 +01:00
Holger Levsen 0985d5342b start_new_disc: include local Release file for debian-installer. Closes: #968671
tools/start_new_disc: Apply patch by JH Chatenet to include local Release file
for debian-installer. Closes: #968671

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2021-02-03 17:26:54 +01:00
Holger Levsen 21d6617f0f which_deb: fix typo breaking local Packages.xz Closes: #968668
tools/which_deb: Apply patch by JH Chatenet to fix problems with local
xz compressed Packages files. Closes: #968668

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2021-02-03 17:13:18 +01:00
Samuel Thibault d21568c454 Make tools/start_new_disc also cleanup SHA512 checksums. 2021-01-18 14:25:36 +00:00
Steve McIntyre 966016c495 Be more explicit if DISKTYPE is not specified, or unrecognised 2021-01-16 22:32:48 +00:00
Steve McIntyre 34b8379db4 Fix sed delimiters in various scripts
Found by Steev - "," is not a safe delimiter to use in various
places. Switch to "|" instead.
2021-01-16 15:27:03 +00:00
Steve McIntyre c7dcd37aec When compressing translations, remove the uncompressed version
It may cause build problems later if we keep it around
2020-12-15 11:44:56 +00:00
Steve McIntyre a3b79dbe84 Cope with different issues found in testing the code for ABI udebs
Deal with various edge cases
2020-09-27 02:14:05 +01:00
Steve McIntyre c0634821b1 Only include kernel udebs for the highest ABI we know about
Don't waste space on installation media with older udebs from the
archive that have been kept around for other users.
2020-09-27 01:14:46 +01:00
Steve McIntyre a5f0edc39d Make update_popcon deal with lower-case http headers too 2020-08-01 12:43:25 +01:00
Steve McIntyre fdf9f6739f Enable graphical installer for arm64
Shift the extra_image helper function from boot-x86 to common.sh to
help.
Call extra_image with || true for now on boot-arm64 so we don't fail
builds straight away. Remove that || true later once we're happy
things work.
2020-04-20 18:23:45 +01:00
Wolfgang Schweer 772a0df3ea Adjust Debian Edu list of packages.
tasks/bullseye/Debian-edu-full: Add LTSP setup related dnsmasq package.
tools/generate_debian-edu_task: No longer exclude Cinnamon desktop environment.

Signed-off-by: Wolfgang Schweer <wschweer@arcor.de>
2020-04-08 01:35:59 +02:00
Raphaël Hertzog 7ea13858fb Don't allow udebs to satisfy dependencies of regular debs
I was just bitten by this problem in Kali where the ISO was not
containing the expected packages because tools/sort_deps was accepting
"xserver-xorg-input-libinput-udeb" as a solution to
"xserver-xorg-input-all | xserver-xorg-input-driver" and the
udeb was among the package already selected for inclusion on the
ISO.

With this change, tools/sort_deps will look for udeb to solve
udeb dependencies and it will look for non-udeb to solve non-udeb
dependencies.

FTR, here's the sort_deps.log extract proving my assertion:

    xserver-xorg Dep: (OR xserver-xorg-input-all xorgxrdp xserver-xorg-input-aiptek xserver-xorg-input-elographics xserver-xorg-input-evdev xserver-xorg-input-evdev-udeb xserver-xorg-input-joystick xserver-xorg-input-kbd xserver-xorg-input-libinput xserver-xorg-input-libinput-udeb xserver-xorg-input-mouse xserver-xorg-input-mtrack xserver-xorg-input-multitouch xserver-xorg-input-mutouch xserver-xorg-input-synaptics xserver-xorg-input-void xserver-xorg-input-wacom xserver-xorg-input-xwiimote ) soft_depend 1
    xserver-xorg-input-all not included in a useful version, check_backports 0
    xorgxrdp not included in a useful version, check_backports 0
    xserver-xorg-input-aiptek not included in a useful version, check_backports 0
    xserver-xorg-input-elographics not included in a useful version, check_backports 0
    xserver-xorg-input-evdev not included in a useful version, check_backports 0
    xserver-xorg-input-evdev-udeb not included in a useful version, check_backports 0
    xserver-xorg-input-joystick not included in a useful version, check_backports 0
    xserver-xorg-input-kbd not included in a useful version, check_backports 0
    xserver-xorg-input-libinput not included in a useful version, check_backports 0
      xserver-xorg-input-libinput-udeb is included already, acceptable version 0.29.0-1
2020-02-13 15:21:10 +01:00
Raphaël Hertzog 031fd46b40 Fix some inconsistent indenting 2020-02-13 15:07:00 +01:00
Raphaël Hertzog ef9a3146cd Add symlinks for kali-last-snapshot in data/, tasks/ and tools/boot/ 2020-01-10 12:14:23 +01:00
Raphaël Hertzog 6fb756b288
start_new_disc: fix a quoting bug
That bug led to a failure when CODENAME is kali-last-snapshot.
2020-01-10 12:04:12 +01:00
Steve McIntyre 0dd4219af4 Add initial support for jigdo v2 format
Add the option to switch to format v2 which uses sha256 everywhere
instead of md5. We can't actually turn this on yet, need to wait for
users to upgrade a bit and get new v2-aware jigdo clients.

But this works as-is for generating v1 until we hit that switch - see
the new JIGOO_CHECKSUM option in CONF.sh
2019-11-21 19:10:19 +00:00
Samuel Thibault d29c2db629 Add hurd-i386 EFI support. 2019-11-17 19:10:37 +01:00
Samuel Thibault 6ea92b0aed Drop support for xorriso versions before 1.2.2 2019-11-17 19:10:27 +01:00
Steve McIntyre 06e72ad16a Also add the firmware message for m-a disks 2019-11-08 15:00:48 +00:00
Steve McIntyre c4497191a1 Add a "with firmware" text to the DISKINFO string when appropriate 2019-11-08 14:42:44 +00:00
Steve McIntyre e72ad31bc3 Fix up ordering in imagesums
"find" doesn't care about ordering in the way I thought, so use
separate find calls instead
2019-10-18 18:56:00 +01:00
Samuel Thibault a20ba31742 Add missing newlines 2019-09-06 04:18:17 +02:00
Samuel Thibault d131685f64 Keep grub resolution in EFI boot, to avoid tiny fonts
(closes: #935546)
2019-08-23 22:02:17 +02:00
Steve McIntyre 9acb8c5796 More tweaks for Translation files 2019-08-13 07:54:51 +01:00
Steve McIntyre 41f1383b5c Stop producing MD5SUMS and SHA1SUMS files by default 2019-07-16 16:34:36 +01:00
Steve McIntyre db1a62f8ac Start bullseye development
Copy the buster dirs to bullseye as a start
2019-07-07 01:22:46 +01:00
Steve McIntyre e06965f2d6 Add shim-signed and grub-efi-arm64-signed to the arm64 pkg list 2019-07-06 19:16:33 +01:00
Steve McIntyre 330c63e67d Tweak recompress code 2019-07-06 11:19:02 +01:00
Steve McIntyre 6ae364773a Tweak logging again 2019-07-06 10:53:40 +01:00
Steve McIntyre a06b008b2f Add more logging around the recompress() step 2019-07-06 10:42:27 +01:00
Steve McIntyre 389917c003 Change a load of http URLs to use https instead 2019-07-05 18:26:43 +01:00
Steve McIntyre 890ab6645a Add support for USB sticks any integer multiple of 1GB in size.
Factor out the common code, support anything called STICKnnnGB where
nnn is any integer
2019-06-18 23:59:01 +01:00
Steve McIntyre 114e8a3e55 Add explicit support got 16G USB images 2019-06-17 01:40:25 +01:00
Steve McIntyre 5ef7fc71db Drop lilo and elilo 2019-05-20 12:51:45 +01:00
Steve McIntyre 20ea646b16 Force shim-signed to be on CD#1 for i386 2019-05-20 12:45:46 +01:00
Steve McIntyre 0d3a0dbb66 Make the 686-pae kernels optional on media
So we can drop them for multi-arch netinst images - need to define
ARCH_i386_EXCLUDE_686_PAE_KERNEL
2019-05-20 12:44:54 +01:00
Steve McIntyre 9fa12704bf Tweak ordering of snapshot URLs
Put snapshot.d.o last in the list in jigdo files, to reduce load on
the service.
2019-05-14 14:30:47 +01:00
Steve McIntyre 20b544918d Tweak grub menu theming
Add a png to use as highlighting for the selected menu item, and play
with colours a little
2019-05-12 02:13:47 +01:00
John Paul Adrian Glaubitz 3d736a5810 Switch bootloader from silo to grub-ieee1275 on sparc64 2019-05-09 16:43:26 +02:00
John Paul Adrian Glaubitz a364f3b9d5 Switch bootloader from silo to grub-ieee1275 on sparc 2019-05-09 16:41:09 +02:00
John Paul Adrian Glaubitz 1e09a3153f Switch bootloader from yaboot to grub-ieee1275 on ppc64 2019-05-09 16:37:43 +02:00
John Paul Adrian Glaubitz 4940b6b64d Switch bootloader from yaboot to grub-ieee1275 on powerpc 2019-05-09 16:34:23 +02:00
John Paul Adrian Glaubitz 6544f2d076 Switch bootloader from elilo to grub-efi-ia64 on ia64 2019-04-30 23:10:14 +02:00
John Paul Adrian Glaubitz 070d2bea52 Remove elilo from tools/generate_di+k_list on {i386,ia64} 2019-04-24 12:58:30 +02:00
John Paul Adrian Glaubitz b937afe501 Add grub-efi{,{-ia64,{-bin}}} to tools/generate_di+k_list on ia64 2019-04-24 12:57:29 +02:00
Steve McIntyre 94df26ad06 More logging cosmetic tweaks 2019-03-21 14:34:22 +00:00
Steve McIntyre d80cd0b990 Exit on errors in boot-armhf 2019-03-21 14:34:22 +00:00
Steve McIntyre 2baefff77e Tweak EFI common code setup some more 2019-03-21 14:34:22 +00:00
Steve McIntyre 5ebd3a8a95 Cosmetic tweaks to logging 2019-03-21 14:34:22 +00:00
Steve McIntyre bb7e7bf9b9 Remove massively obsolete disks-$ARCH stuff
That went away with boot floppies!
2019-03-21 14:34:22 +00:00
Steve McIntyre 53cfc9f3f5 Tweak logging for release notes 2019-03-21 14:34:22 +00:00
Steve McIntyre 4fdd13cc0c Add more info when removing old dedications 2019-03-21 14:34:22 +00:00
Steve McIntyre 0f8a2f2387 Enable EFI boot support for armhf
Mostly copied from the arm64 support, but also copy in the images like
previously for non-efi platforms.

Move the old boot-arm-common code back into boot-armel now it's no
longer common.
2019-03-21 14:34:22 +00:00
Steve McIntyre 15ab1a98d2 Factor out common code for calculating ESP size
Use it for both x86 and arm64
2019-03-21 14:32:54 +00:00
Wolfgang Schweer f1adacb899 Set adjusted cd_type for incomplete BD image
If COMPLETE=0 is set, the content should rather be
"bluray/not_complete" instead of just "not_complete". This would allow
one to build offline usable Edu BDs.
2019-02-11 17:03:26 +00:00
Steve McIntyre dca9045c6d Merge branch 'sthibault/debian-cd-master' 2019-02-11 16:50:01 +00:00
Steve McIntyre 44ea4bc0e3 Add grub-efi packages to armhf media 2019-02-11 16:37:39 +00:00