Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,289 Commits 28 Branches 111 Tags 33 MiB
Commit Graph

2289 Commits

Author SHA1 Message Date
Steve McIntyre dc48123273 Revert "start_new_disc: correct disk/cd-type for all types" 
This reverts commit 15b482d49e.

Undo this change for now, as it's causing unexpected issues in
d-i. Changes here need to match up with the code in apt-setup to make
sure we get sensible behaviour all round.

Revisit this after the d-i alpha 5 relese.
 2019-01-25 23:58:47 +00:00
Steve McIntyre a7328f65da Merge branch 'system' into 'master' 
make_disc_trees: don't use system() for trivial things

See merge request images-team/debian-cd!2
 2019-01-23 23:04:57 +00:00
Steve McIntyre 79dd5aeeb5 Merge branch 'log_opened' into 'master' 
make_disc_trees: don't reopen the log over and over

See merge request images-team/debian-cd!1
 2019-01-23 23:03:04 +00:00
Julien Cristau c68062b624 make_disc_trees: don't use system() for trivial things 
Fair warning: completely untested and I don't know perl.
 2019-01-23 23:50:36 +01:00
Julien Cristau 97dbce1c22 make_disc_trees: don't reopen the log over and over 2019-01-23 23:34:01 +01:00
Holger Levsen 6114c16dfc include/exclude more packages for Edu BD image 
Thanks to Wolfgang Schweer for the patch.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-15 18:45:31 +01:00
Steve McIntyre 3e0615992c Tweak the EFI dir naming 2019-01-15 12:59:13 +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 0d55285ba6 d/rules: drop code which is a no-op 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-14 13:01:48 +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 b508b3b474 d/rules: drop manual svn cleanup, dh does that for us. 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-14 11:40:15 +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 6fb5c246d8 Make mcopy calls less verbose 
Turned on when debugging, not needed now
 2019-01-13 18:25:42 +00:00
Steve McIntyre a97cd46a24 Add more entries in the changelog 2019-01-13 17:06:18 +00:00
Steve McIntyre 3951953f90 Update the default version 
Buster is coming!
 2019-01-13 17:01:18 +00:00
Steve McIntyre bda51b7d31 Drop grub-legacy from the core package list 
For real, this time :-(
 2019-01-13 16:59:31 +00:00
Steve McIntyre dbcca61569 Revert "Drop grub-legacy from the core package list" 
This reverts commit 9f834744a6.
 2019-01-13 16:58:42 +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 15b482d49e start_new_disc: correct disk/cd-type for all types 
Thanks to Wolfgang Schweer for the patch. See/Closes: #846006

Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-11 14:54:51 +01:00
Holger Levsen 93f26da4d9 drop ancient version-req on dependency on apt 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-11 14:52:29 +01:00
Holger Levsen afb13375e6 upgrade to use debhelper-compat(=11) 
Bump debian/compat to 11 and build-depend on debhelper >= 11.
Use the new debhelper-compat(=11) notation and drop d/compat.

I've confirmed with diffoscope that this is noop-change.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-11 14:50:30 +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
Holger Levsen 39a36ef8ca don't recommend syslinux-utils twice, thanks lintian 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-11 14:28:16 +01:00
Holger Levsen a2cb10c915 Edu installer logo from debian-edu-artwork 2.10.2-1 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2019-01-11 14:01:55 +01:00
Steve McIntyre 9f834744a6 Drop grub-legacy from the core package list 
Let's save some space
 2019-01-10 21:42:06 +00:00
Steve McIntyre 10f26b6523 Explicitly bring in the signed shim and grub bootloaders 
Let's make UEFI Secure Boot work well
 2019-01-10 21:40:00 +00:00
Steve McIntyre f0375b21ea Munge the EFI boot support code to make Secure Boot work 
We don't need to do much here, just pass on what the d-i build already
set up for us. Previously, we assumed too much knowledge about the
contents of the efi.img we were given. Now simply copy all of it.

(This is only really necessary due to us wanting to merge the efi.img
 for multiple architectures. This is likely to get harder with
 clashing files... :-/)
 2019-01-10 21:31:19 +00:00
Steve McIntyre bd0a1107c7 For now, hard-code linux-image=* in backports support 
Keep the normal kernel on media *as well as* a backports kernel. d-i
will install the normal one first, then later upgrade it.
 2018-08-14 00:35:53 +01:00
Steve McIntyre 31ec2cb178 Fix typo in comment 2018-08-13 15:26:54 +01:00
Steve McIntyre 5710321f9e Add proper backports support in generate_firmware_task 
When BACKPORTS is defined, look for firmware in $codename-backports
first, then in $codename
 2018-08-13 14:36:36 +01:00
Steve McIntyre 5dd0d5cc2a Fix silly typo 2018-08-13 14:07:51 +01:00
Holger Levsen 7bcfbfa23b try to keep all the desktops on the BD image, which was down to 3GB already 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-08-09 00:22:09 +02:00
Holger Levsen 99349235dc Wolfgang said in 846006#222 this might work (for netinst) and I believe for the BD image it also needs those packages added via tools/generate_debian-edu_task 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-08-09 00:20:52 +02:00
Holger Levsen d455bdc470 not needed since debian-edu-install 2.10.11 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-08-09 00:17:23 +02:00
Steve McIntyre 814b0dd97c Fix generate_debian-edu_task again 
Fix syntax errors
Switch the ignore code to walking a list instead
 2018-08-01 11:01:33 +01:00
Holger Levsen 1d955ed12c education-desktop-other is needed for the full edu image 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-07-31 22:44:23 +08:00
Holger Levsen e263d9fe54 don't put Debian-all on the full edu image 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-07-31 20:11:10 +08:00
Holger Levsen fa9bf61204 exclude a bunch of desktops from the full edu image 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-07-31 15:50:42 +08:00
Steve McIntyre f78c2e9d49 Spell Debian-all right... 2018-07-31 03:58:38 +01:00
Steve McIntyre 6ebb77f469 Add a fuller set of tasks to Debian-edu-full 
Make sure we get all the desktop etc. bits by including debian-all to
start with.
 2018-07-31 03:54:14 +01:00
Steve McIntyre 60f1e082d8 Replace generate_debian-edu_task with a perl script parsing Packages 
Apt setup hasn't happened yet, so we can't use the apt
wrapper. Instead, use simple perl code derived from
generate_firmware_task.
 2018-07-31 03:33:33 +01:00
Steve McIntyre adb7d349b8 Fix up shell errors in generate_debian-edu_task 2018-07-31 01:24:32 +01:00
Holger Levsen 29b3203512 drop unused script edu-build.sh 
Signed-off-by: Holger Levsen <holger@layer-acht.org>
 2018-07-30 17:06:24 +08:00