Commit Graph

1222 Commits

Author SHA1 Message Date
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
Steve McIntyre 725add3c19 Prep 3.1.28 release 2020-01-28 12:52:46 +00:00
Raphaël Hertzog 9c1aab43d9
Add a default value to JIGDO_CHECKSUM 2020-01-10 14:43:11 +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
John Paul Adrian Glaubitz 7266d6ad27 Add missing export keyword for ARCHIVE_KEYRING_{FILE,PACKAGE} 2020-01-02 12:10:16 +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 2d48cfc8fa Add changelog entry 2019-11-08 14:45:18 +00:00
Holger Levsen afec3961d3 release as 3.1.27
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-10-23 18:06:52 +02:00
Holger Levsen 9281ab6f53 contrib: Updated from setup.git/bullseye/.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-10-23 18:05:48 +02:00
Holger Levsen ec0212c7b1 Bump standards version to 4.4.1, no changes needed.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-10-23 18:04:25 +02:00
Steve McIntyre 38cfe4d252 Add a changelog entry 2019-10-18 18:57:29 +01:00
Steve McIntyre f23094cdab Update arch lists in build_all.sh
Remove arches not in bullseye
2019-09-02 16:50:35 +01:00
Samuel Thibault d131685f64 Keep grub resolution in EFI boot, to avoid tiny fonts
(closes: #935546)
2019-08-23 22:02:17 +02:00
Holger Levsen 2dd3e8e8c0 release as 3.1.26
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-08-10 11:51:16 +02:00
Holger Levsen 8fa24d2916 fix version number
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-08-10 11:50:42 +02:00
Holger Levsen b0cc925a89 d/control: bump debhelper-compat to 12
(after having confirmed with diffoscope this is a no-op change)

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-08-10 11:47:47 +02:00
Steve McIntyre 41f1383b5c Stop producing MD5SUMS and SHA1SUMS files by default 2019-07-16 16:34:36 +01:00
Holger Levsen 23bdbedbb5 Bump standards version to 4.4.0, no changes needed.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-07-07 17:52:58 +02: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 d198fa0d20 Add changelog entry for the arm64 tweak 2019-07-07 01:19:38 +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 2d3038bff7 Fix for stupid bug in 3.1.24
Rebuild without my locally-hacked CONF.sh in the package build. :-(
2019-06-26 18:27:45 +01:00
Steve McIntyre 9914a71723 Release 3.1.24 2019-06-22 18:19:51 +01:00
Steve McIntyre 30031aef74 Copy in the updated buster cronjobs to match current state. 2019-06-22 18:14:37 +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 60e9fbfa36 Don't include -686-pae udebs on media
We may not have a kernel to use with them anyway
2019-05-20 12:01:56 +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
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 ab3cd32e27 Revert "Include debian-ports-archive-keyring-udeb in Debian Ports package list"
This reverts commit 91dc428ea9.
2019-04-25 01:02:55 +02:00
John Paul Adrian Glaubitz 91dc428ea9 Include debian-ports-archive-keyring-udeb in Debian Ports package list 2019-04-24 13:47:57 +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 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
Holger Levsen 95f79b7af9 contrib/cronjob.weekly: drop -usb from Debian Edu BD images names.
contrib/cronjob.weekly: drop -usb from CDNAME for Debian Edu BD images, as "usb" is both wrong as well as redundant as 'BD' is also part of the generated filenames.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-03-09 20:31:15 +01:00
Wolfgang Schweer f2c78677ab Extend the set of forced Edu BD packages
(This is a workaround for the effects of #601203)
2019-03-07 12:43:27 +01:00
Holger Levsen 2583350b8d add changelog entry for Wolfgang
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-20 14:16:28 +01:00
Holger Levsen 97f9c0fa21 release as 3.1.23
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-19 19:08:35 +01:00
Holger Levsen ee7441d449 contrib: updated from setup.git/buster/.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-19 19:08:16 +01:00
Holger Levsen c149517d7b add Closes: #769589
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-12 12:12:17 +01:00
Holger Levsen 4df2f3a4d5 add changelog entry for Wolfgang
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-12 11:57:30 +01: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
Holger Levsen c75a7b60a6 data/buster: update Debian Edu syslinux splash image
from src:debian-edu-artwork 2.10.5-1

(the logo hasn't changed.)

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-11 00:41:46 +01:00
Holger Levsen 97271053ac data/buster: update Debian Edu syslinux splash image from src:debian-edu-artwork 2.10.4-1.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-09 16:26:31 +01:00
Samuel Thibault 3a588e90a5 Support dark theme boot entries 2019-02-08 18:52:37 +01:00
Holger Levsen 6804716e8f contrib/HEADER.html.in: describe Edu netinst images for x86
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-07 16:02:58 +01:00
Holger Levsen 66e99198e2 data/buster: update Debian Edu installer logo from src:debian-edu-artwork 2.10.4-1.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-07 15:54:36 +01:00
Holger Levsen f8667458e1 release as 3.1.22
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-02-02 23:38:22 +01:00
John Paul Adrian Glaubitz 57cae18914 Makefile: Add ia64, powerpc, riscv64 and sparc to DEBIAN_PORTS_ARCHES 2019-01-27 19:45:33 +01:00
John Paul Adrian Glaubitz e49d1c1966 Makefile: Rephrase comment on package list for Debian Ports 2019-01-27 19:44:01 +01:00
John Paul Adrian Glaubitz 647b681a13 Makefile: Reorder architecture list in DEBIAN_PORTS_ARCHES 2019-01-27 19:42:23 +01:00
John Paul Adrian Glaubitz 4b541d8cba Makefile: Rename UNRELEASED_PORT_ARCHITECTURES to DEBIAN_PORTS_ARCHES 2019-01-27 19:38:01 +01:00
John Paul Adrian Glaubitz f4bcefa9dd Rename data/base_include_port_architectures to data/debian_ports 2019-01-27 19:32:40 +01:00
Steve McIntyre 1365f6dfc8 Add changelog entry for the jigdo compression ordering change 2019-01-26 21:45:50 +00:00
Holger Levsen f3d54b7fa3 add myself to uploaders.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-14 13:27:48 +01:00
Holger Levsen 2cdadab472 d/rules: use debian/debian-cd.links.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-14 13:23:22 +01:00
Holger Levsen 77bdc50109 d/rules: use debian/debian-cd.install.
also chmod +x contrib/testingcds in git to simplefy further.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-14 12:53:36 +01:00
Holger Levsen 91544c52e4 d/rules: add debian/debian-cd.docs and use that.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-14 11:51:51 +01:00
Holger Levsen e50b585f11 d/rules: use the awesome "dh $@" simplification.
I've confirmed with diffoscope that this only affects
comments/timestampes within images inside
./usr/share/debian-cd/data/cts_amiga_info.tar.gz
and that those are only set to the date defined by
SOURCE_DATE_EPOCH, thus the package still builds reproducibly, just the
timestamps are of todaz/SOURCE_DATE_EPOCH and not from 2007.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-14 00:22:59 +01:00
Holger Levsen 6fde9e853d d/control: add "Rules-Requires-Root: no".
d/control: add "Rules-Requires-Root: no" to support building as non-root
after confirming this is a no-diff change with diffoscope.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-13 23:50:12 +01:00
Holger Levsen 25f262bde6 bump standards version to 4.3.0, no changes needed.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-13 23:39:58 +01:00
Holger Levsen 4fa6f0e984 prepare d/changelog for 3.1.22 release
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-13 23:37:53 +01:00
Holger Levsen ec74fa8556 add closes for #821054
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-13 19:36:40 +01:00
Steve McIntyre a97cd46a24 Add more entries in the changelog 2019-01-13 17:06:18 +00:00
Holger Levsen 9555126454 d/copyright: explicitly refer to GPL-2.
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-13 17:38:35 +01:00
Holger Levsen 1ca683b723 Add lintian override for missing-depends-on-sensible-utils.
Add lintian override for missing-depends-on-sensible-utils as
sensible-editor is merely mentioned in the README.

Confirmed with diffoscope that this change does what it's supposed to do.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-13 17:38:35 +01:00
Holger Levsen f848c7f0c3 cleanup white spaces & empty lines, thanks lintian
d/changelog, d/control and d/rules

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-11 14:31:34 +01:00
Steve McIntyre abc2a7e74d Updates for update-cd
Grab checksums from the binary-all Packages.gz too when building
Generate checksums for torrents and jigdo files too if desired
2018-07-14 13:05:06 +01:00
John Paul Adrian Glaubitz c86bc763e3 Use compressed kernel image by default in boot-hppa 2018-05-08 11:25:31 +02:00
Steve McIntyre 901630fb47 Add changelog entry 2018-02-16 17:30:18 +00:00
Steve McIntyre fa2e4f0028 Tweak the date used for snapshot.d.o references
Use *tomorrow* rather than today, to allow time for the snapshot to be
updated.
2018-02-16 03:20:59 +00:00
Steve McIntyre 56695dd0f2 Update changelog entry for checksum changes 2018-02-15 16:23:55 +00:00
Steve McIntyre c92f55d2b4 Add changelog entry for SUMS change 2018-02-11 21:21:12 +00:00
Steve McIntyre b774eb3535 lose extra - on -joliet-long 2018-02-10 12:11:05 +00:00
Steve McIntyre 6112370e0a Ensure that in all places where we use -J we also use --joliet-long
Thanks to Thomas Schmitt again for a clear bug report!
2018-02-10 00:29:15 +00:00
Steve McIntyre 4200913c82 Start 3.1.22 development 2018-02-10 00:26:52 +00:00
Steve McIntyre c3a33b2732 Update Standards-Version to 4.1.3 2018-02-04 01:00:28 +00:00
Steve McIntyre 9c0f0c6ef1 Switch Priority: extra to optional 2018-02-04 00:59:12 +00:00
Steve McIntyre 18ae25c2aa Stop using dh_clean -k 2018-02-04 00:57:26 +00:00
Steve McIntyre 0aff91de8b Update the debhelper dependency to version 10 2018-02-04 00:55:32 +00:00
Steve McIntyre 915ea96579 Remove the executable bit from various shell function files 2018-02-04 00:53:48 +00:00
Steve McIntyre a14a8c04b5 Preparing to release 3.1.21 2018-02-04 00:44:59 +00:00
Vagrant Cascadian aca40b24ec Support KERNEL_PARAMS in arm64 (Closes: #884552) 2018-02-04 00:37:35 +00:00
Steve McIntyre 8714e849ad Fix isolinux config parsing. Thanks to Philipp Hahn for the patch.
Closes: #886655
2018-02-04 00:30:08 +00:00
Steve McIntyre 55b6fd357f Update references to point to salsa.d.o for git repo 2018-01-29 00:05:10 +00:00
Marcin Kulisz 50fe60acbe Removing lynx-cur as binary dependency (package removed from Debian) 2018-01-23 18:57:58 +00:00
Steve McIntyre 986c690b67 Depend on wget instead of just Recommending it 2018-01-19 17:00:16 +00:00
Steve McIntyre 013d09f686 Make update_popcon cope with https on popcon.d.o
Tell curl to follow redirects
Add explicit capath argument if needed, as on debian.org machines
2017-11-20 21:27:25 +00:00
John Paul Adrian Glaubitz 995a8198b9 Add initial set of packages to tools/generate_di+k_list on ppc64 2017-10-08 20:18:06 +02:00
John Paul Adrian Glaubitz 0127a8c580 Clone powerpc udeb lists for ppc64 2017-10-08 19:57:09 +02:00
John Paul Adrian Glaubitz 90d2b27cc0 Fix install location of amiga.info icon file 2017-10-05 23:56:26 +02:00
John Paul Adrian Glaubitz c11f01d765 Add grub-ieee1275 to tools/generate_di+k_list on sparc and sparc64 2017-09-29 14:22:24 +02:00