On Wed, Aug 24, 2016 at 12:00:54PM +0000, Holger Levsen wrote:
> On Thu, Aug 18, 2016 at 11:43:27AM +0200, Wolfgang Schweer wrote:
> > I figure the debian-edu-tasks desc file for stretch must be generated
> > using the jessie blends-dev version if the new approach with blends
> > install options in the Debian Installer stays as it is.
>
> that's the wrong conclusion and a clear no-go. We must use blends-dev
> from unstable to build for unstable and if this doesn't work, either
> our package or blends-dev is seriously broken and needs to be fixed
> before the Stretch release.
Maybe for Debian Edu (as an example for a blend using udebs to modify
the installer) the generation could be different.
Just wondering if this (or a more general) workaround would be
acceptable for blends-dev:
--- /usr/share/blends-dev/blend-gen-control 2016-04-09 20:42:00.000000000 +0200
+++ blend-gen-control 2016-08-25 18:29:15.691010691 +0200
@@ -281,15 +281,16 @@
# Enable to list all dependencies as key packages
my $task_depends_are_keys = 0;
sub print_task_desc {
- print "Task: $blendname\n";
- print "Relevance: 7\n";
- print "Section: $blendname\n";
+ if ($blendname != 'debian-edu') {
+ print "Task: $blendname\n";
+ print "Relevance: 7\n";
+ print "Section: $blendname\n";
# print "Key: \n";
# print " $blendshortname-tasks\n";
- print "Description: $blendtitle Pure Blend\n";
- print " .\n"; # no long description available
- print "\n";
-
+ print "Description: $blendtitle Pure Blend\n";
+ print " .\n"; # no long description available
+ print "\n";
+ }
foreach my $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Leaf'} &&
$taskinfo{$task}{'Leaf'} eq 'false');
@@ -313,15 +314,22 @@
}
}
print "Task: $task\n";
- print "Parent: $blendname\n";
- print "Section: $blendname\n";
+ if ($blendname != 'debian-edu') {
+ print "Parent: $blendname\n";
+ };
+ print "Section: $blendname\n";
print "Description: $taskinfo{$task}{Description}\n";
print "$taskinfo{$task}{'Description-long'}"; # Already contain newline
+ if ($blendname == 'debian-edu') {
+ print "Relevance: 10\n";
+ }
print "Enhances: $taskinfo{$task}{Enhances}\n"
if exists $taskinfo{$task}{Enhances};
if (!exists $taskinfo{$task}{'Install'} ||
$taskinfo{$task}{'Install'} ne 'false') {
+ if ($blendname != 'debian-edu') {
print "Test-new-install: mark show\n";
+ }
}
for $header (keys %{$taskinfo{$task}}) {
if ($header =~ m/test-.+/i) {
@@ -343,6 +351,15 @@
}
}
+ if ($blendname == 'debian-edu') {
+ print "Packages: list\n";
+ for my $header (qw(Depends Recommends)) {
+ foreach my $package (task_packages($task, $header, 1)) {
+ print " $package\n" unless $seen{$package};
+ $seen{$package} = 1;
+ }
+ }
+ }
print "\n";
}
}
Might be smarter; but with blend-gen-control changed like this, the
resulting Debian Edu tasks desc file works for me.
Wolfgang
Attachment:
signature.asc
Description: Digital signature