Blends websites [Was: Re: Blend Homepage Debian Edu]
On Mon, Apr 08, 2019 at 11:39:01AM +0200, Wolfgang Schweer wrote: > The config file used by jekyll: www-src/_config.yml I've now changed the jekyll config file, now a sandbox directory is used as target instead of the www/ folder. It's one step more if the build envirenment is used, OTOH it should avoid accidentally removing existing sites. README-www.txt updated accordingly. Wolfgang signature.asc Description: PGP signature
Re: Blend Homepage Debian Edu
Hi Andreas, On Mon, Apr 08, 2019 at 10:13:41AM +0200, Andreas Tille wrote: > I have no idea what `jekyll build` is doing. I never touched jekyll > (neither in this context or somewhere else) so probably somebody else > has added that feature and the mailing list is the place to discuss > this. :-) It's about generating/maintaining Blend wesite pages, see: https://salsa.debian.org/blends-team/website and these instructions: https://salsa.debian.org/blends-team/website/blob/master/README-www.txt This file has been added 2015-05-15 by Iain R. Learmonth. The config file used by jekyll: www-src/_config.yml About jekyll: https://packages.debian.org/en/buster/jekyll 'man jekyll': Jekyll - is a blogaware, static site generator. The man page online (Ubuntu, older version, but no difference to 'man jekyll' on Debian Buster): http://manpages.ubuntu.com/manpages/cosmic/man1/jekyll.1.html As far as I can tell, the save way would be to keep www/ and www-src/ in sync to avoid accidentally removing existing Blends pages if someone uses 'jekyll build' according to the README file. (I noticed this while working on the Debian Edu Blend pages; for those I kept www/ and www-src in sync.) The Edu pages are now showing more information then just links to 'tasks' and 'mailing list stats', see: https://blends.debian.org/edu/ Wolfgang (Please don't Cc me.) signature.asc Description: PGP signature
Re: Bug#903593: python3-blends: shouldn't write Packages: list in case the udeb option is set
On Thu, Jul 12, 2018 at 12:09:24PM +0200, Ole Streicher wrote: > far as I looked into, the test calles > > /usr/share/debian-edu-config/tools/debian-edu-bless > > and this script seems to be unable to handle alternatives. The script 'debian-edu-bless' uses tasksel to install packages, so debian-edu-tasks.desc is involved as well: Both the meta-package listed as Key and all packages in the Packages list are installed. The meta-package handles alternatives as usual (these are taken from the tasks file as is). Only if _all_ alternatives are installed because they belong to the Packages list and if there are conflicting ones among them, the installation breaks. We decided to drop the conflicting atftpd package to get feedback if the installation would be successful. > IMO it would not be a good solution to just limit the packages to the > first alternative, since that would break the idea of alternatives. Sure, but see above. I'm pretty sure once the Packages list has been dropped, re-adding Recommends: tfptd-hpa | atftpd to tasks/main-server would do no harm. Thanks for taking your time, Wolfgang signature.asc Description: PGP signature
Re: Bug#903593: python3-blends: shouldn't write Packages: list in case the udeb option is set
On Thu, Jul 12, 2018 at 08:45:46AM +0200, Ole Streicher wrote: > Wolfgang Schweer writes: > > Generated with blends-dev 0.7.1 the list contains tftpd-hpa as well. As > > both packages conflict, the installation breaks, see: > > https://ci.debian.net/data/autopkgtest/testing/amd64/d/debian-edu/591122/log.gz > > > > This also may be a bug in the handling of the "Packages" field during > udeb installation, which was just not exposed until now. I guess the only problem has been that both conflicting alternatives showed up in the 'Packages: list'. With atftpd removed from tasks/main-server, things are ok again, see: https://ci.debian.net/packages/d/debian-edu/testing/amd64/ This removal has been the only change between versions 2.30 and 2.31, see: https://salsa.debian.org/debian-edu/debian-edu/commits/master Wolfgang signature.asc Description: PGP signature
Re: Bug#903593: python3-blends: shouldn't write Packages: list in case the udeb option is set
Hi Ole, On Wed, Jul 11, 2018 at 09:41:05PM +0200, Ole Streicher wrote: > However, I am not sure about the required format to udeb .desc files. As > you describe it, the situation is: > > * the Package: field is not needed for udebs > * but if it is there and contains alternatives, the installation breaks. > > Do I understand you correctly? Yes, if there are conflicting packages among the listed alternatives. But please note that I am no expert. To my understandig (after reading /usr/share/doc/tasksel/README.gz) all packages listed below 'Packages: list' are installed plus the packages pulled in via the meta-package in the Key: field. So the Key: field seems to be enough. If you take a look at /usr/share/tasksel/descs/debian-tasks.desc it's only Key: fields. Generated with blends-dev 0.6.100, debian-edu-tasks.desc had the 'Packages: list' with only one package of alternatives, the first one. Example: tasks/main-server with Recommends: atftpd | tftpd-hpa ended up in debian-edu-tasks.desc with only atftpd listed below 'Packages: list'. Generated with blends-dev 0.7.1 the list contains tftpd-hpa as well. As both packages conflict, the installation breaks, see: https://ci.debian.net/data/autopkgtest/testing/amd64/d/debian-edu/591122/log.gz (search for the 4th occurence of 'command2'). Thanks for caring, Wolfgang signature.asc Description: PGP signature
Bug#903593: python3-blends: shouldn't write Packages: list in case the udeb option is set
Package: python3-blends
Version: 0.7.1
Severity: wishlist
Hi,
while testing Debian Edu I noticed that installations fail due to
an incorrect debian-edu-tasks.desc file.
The Packages: list now contains all alternative packages instead of only
the first one, e.g. tftpd-hpa | atftpd lists both packages which breaks
installation. I guess the fix for #785678 caused this.
The Packages: field doesn't seem to be needed for a valid desc file.
Please consider to think about the alternatives again or maybe apply
this change:
--- a/blends.py 2018-07-11 18:05:17.147774296 +0200
+++ b/blends.py 2018-07-11 18:04:46.795867954 +0200
@@ -438,10 +438,6 @@
for key, value in self.tests.items():
d['Test-' + key] = value
d['Key'] = '\n {}'.format(self.package_name)
-if udeb:
-d['Packages'] = 'list\n ' + \
- '\n '.join(sorted(d.name for d in itertools.chain(
- *(self.recommends + self.dependencies
return d
def update(self, cache):
Wolfgang
signature.asc
Description: PGP signature
Re: Processing of blends_0.7.0_amd64.changes
On Fri, Apr 13, 2018 at 07:01:43PM +, Debian FTP Masters wrote: > blends_0.7.0_amd64.changes uploaded successfully to localhost As far as I can tell, this blends-dev version seems to work out of the box for Debian Edu. Running 'make dist': [..] /usr/share/blends-dev/blend-gen-control -r "unstable" -S -c -m Downgraded 12 missing packages to Suggests: childsplay chromium-ublock-origin debian-installer-10-netboot-amd64 debian-installer-10-netboot-i386 eclipse-cdt gambas3 gtk-recordmydesktop libav-tools oregano pinta planner xul-ext-ublock-origin Generated debian/control for unstable with apt using 573 Depends+Recommends [..] While missing packages had been reported, downgrading them had not been the case with blends-dev version 0.6.100… Also, the debian-edu-tasks.desc file seems to be ok and the metapackages appear to be built like expected. Wolfgang signature.asc Description: PGP signature
Re: New feature for 0.6.103
On Tue, Apr 10, 2018 at 11:30:07AM +0200, Ole Streicher wrote: > BTW, are you happy with the UDD support? IMO blends-dev should depend on python3-psycopg2 because otherwise the '-U' flag doesn't seem to work... Wolfgang P.S. I can confirm that own sources.list.* take precedence like expected, thanks. signature.asc Description: PGP signature
Re: New feature for 0.6.103
On Mon, Apr 09, 2018 at 02:02:12PM +0200, Ole Streicher wrote: > since there seem to be no problems with the current 0.6.103 release, I > would rename it to 0.7.0 and upload to unstable. Any doubts? It would be nice to have this: ---8> Wolfgang Schweer <w.schw...@gmx.de> writes: > Debian Edu has own sources.list.* files. These used to take precedence > over those with the same name found in /etc/blends/, but as far as I can > tell the related code seems to have gone since version 0.6.101; could > you please check it? That is not implemented yet; I'll do it for the next release. --->8 Thanks ahead, Wolfgang signature.asc Description: PGP signature
Re: Accepted blends 0.6.102 (source) into experimental
Hi Ole, On Wed, Mar 28, 2018 at 07:19:39AM +, Ole Streicher wrote: > blends (0.6.102) experimental; urgency=low The issues in version 0.6.101 seem to be fixed. One other issue: Debian Edu has own sources.list.* files. These used to take precedence over those with the same name found in /etc/blends/, but as far as I can tell the related code seems to have gone since version 0.6.101; could you please check it? Wolfgang signature.asc Description: PGP signature
Re: Bug#891188: blends-dev: created d/control recommends packages not in main
Hi Ole, On Sat, Mar 24, 2018 at 09:28:32PM +0100, Ole Streicher wrote: > I just uploaded 0.6.101 to experimental (code is in the "experimental > branch); could everyone please have a look. UDD is not implemented yet. [..] > Debian Astro and Debian Edu (both without the Depends->Recommends > lowering) work, when the line > > Format: https://blends.debian.org/blends/1.1 > > was inserted as the first line in each task with > > $ sed -i '1i Format: https://blends.debian.org/blends/1.1' tasks/* > > In Debian Edu, the generated dependcy lists differ significantly from > what is checked in, but I have no idea why this is. Looking into the > tasks lists, they look fine. The education-* Buster meta-packages differ a lot from the Stretch ones. - A lot of superfluous Depends. (Only one additionally needed in Jessie: gosa-plugin-netgroups via some hackish trick.) - No evaluation of the missinglist packages. (Packages kept as recommended dispite beeing unavailable.) Just for testing I reworked the Debian Edu tasks files (basically s/Depends/Recommends/g). Using these files, this seem to work: - Using added (forced) depends. - Dropping the education-all package. - Correctly de-promoting non-available packages from Recommends to Suggests. - Correctly de-promoting contrib and non-free packages (only added for testing purposes) from Recommends to Suggests. I don't have more time atm (and the results should be confirmed by others). Thanks for your work. Wolfgang signature.asc Description: PGP signature
Re: Bug#891188: blends-dev: created d/control recommends packages not in main
On Thu, Mar 15, 2018 at 07:41:30PM +0100, Andreas Tille wrote: > I've commited a fix to Git which for me creates now sensible Debian > Astro metapackages. I've checked how this fix would concern Debian Edu: (1) The Debian Edu Makefile has to be adjusted: s/GENCONTROL_DEPENDS = true/#GENCONTROL_DEPENDS = true/ (2) Packages not available (any more) in testing are then correctly demoted from Recommends to Suggests due to the $missinglist fix. (It seems those have been wrongly kept as Recommends since the August 2017 changes.) (3) The strong depends on gosa-plugin-netgroups needed due to Bug #793667¹ (IMO cause for 'GENCONTROL_DEPENDS = true') are a non issue since ages. I figure in a similar case adding information to the Debian Edu upgrade chapter seems to be sufficient (if a smarter solution isn't easy). Wolfgang ¹ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=793667 signature.asc Description: PGP signature
Re: Bug#883297: "Packages: list" field removed from tasksel control file
On Tue, Jan 16, 2018 at 10:50:17PM +0100, Wolfgang Schweer wrote: > But, with the exception of the existing (with unexplicable content) > debian-med-tasks.desc file, things are IMO fine. One more thing: I ran 'git log --follow debian-med-tasks.desc' debian-med-tasks.desc with 'Packages: list' content is due to your commit 2c219f08e54: 'Render dependency relations using UDD based blends-dev' Don't know what this actually means, but maybe the reason is a different blends-dev? Wolfgang signature.asc Description: PGP signature
Re: Bug#883297: "Packages: list" field removed from tasksel control file
Hi Andreas, On Tue, Jan 16, 2018 at 10:06:26PM +0100, Andreas Tille wrote: > On Tue, Jan 16, 2018 at 05:46:34PM +0100, Wolfgang Schweer wrote: > > > > After having cloned the debian-med repo: > > The generated debian-med-tasks.desc file seems to be ok. Further, the > > content is similar to the one available here: > > https://sources.debian.org/src/debian-med/3.0.1/debian-med-tasks.desc/ > > (which contained neither a 'Packages: list'). > > > > Also, the generated .deb packages seem to be ok. > > Good. Now try > > make dist > > and check the diff. That's my point. I have not commited what > I consider broken. I guess I should have been more verbose: What I ment with 'generated' was the output of 'make dist' for the tasks desc file; I ran 'git status' and 'git diff' as well. Afterwards I ran 'debuild -- binary'. The Debian packages seem to be ok. > > Like suspected: if 'TASKSELOPT = -u' is added to the debian-med > > Makefile, the generated debian-med-tasks.desc file has a content like > > the one contained in git. What I meant and did is: Change the Makefile like stated above and run 'make dist' again. (I just wanted to understand what's going on.) This time the generated debian-med-tasks.desc file is similar to the one in git as shown by 'git diff'. > The Makefile is not changed since years. Strange, indeed. I'm at a loss here… But, with the exception of the existing (with unexplicable content) debian-med-tasks.desc file, things are IMO fine. I also did an 'apt source debian-astro' on sid and compared. Their tasks.desc file, too, has no 'Packages: list' section. So I guess you can use everything as is and this bug could be closed. Wolfgang signature.asc Description: PGP signature
Re: Bug#883297: "Packages: list" field removed from tasksel control file
On Tue, Jan 16, 2018 at 04:12:48PM +0100, Andreas Tille wrote: > H, may be we should not ask how it looked before but rather what > should be the content of the tasksel file we *want* to create. After having cloned the debian-med repo: The generated debian-med-tasks.desc file seems to be ok. Further, the content is similar to the one available here: https://sources.debian.org/src/debian-med/3.0.1/debian-med-tasks.desc/ (which contained neither a 'Packages: list'). Also, the generated .deb packages seem to be ok. Wolfgang P.S. Like suspected: if 'TASKSELOPT = -u' is added to the debian-med Makefile, the generated debian-med-tasks.desc file has a content like the one contained in git. signature.asc Description: PGP signature
Re: Bug#883297: "Packages: list" field removed from tasksel control file
Hi Andreas,
On Mon, Jan 15, 2018 at 09:44:31PM +0100, Andreas Tille wrote:
> On Mon, Jan 15, 2018 at 08:05:56PM +, Mike Gabriel wrote:
> > I have looked at the blend-gen-control script. The passages you are missing
> > are if'ed out by
> >
> > ```
> > if ($opts{'u'}) {
> >
> > ...
> >
> > }
> > ```
>
> Strange.
The above code had been added to re-enable a Debian Edu suited task
desc file, i.e. 'Packages: list' is IMO written only in case the stanza
'TASKSELOPT = -u' is contained in the debian-med Makefile.
> > Are you possibly missing a command line option? Or are we missing it? See
> > commit 20c7815702a7ded5749071dbf8d59d057959ef35.
>
> Seems such kind of udeb support could be responsible. However, I've build
> the previous metapackage with the very same options - just `make dist`
> with the blends-dev delivered makefile.
Could it be you generated the previous metapackage with a different
debian-med Makefile?
Maybe test if setting 'TASKSELOPT = -u' in debian-med's Makefile
generates the metapackages you had before?
Wolfgang
signature.asc
Description: PGP signature
Re: Bug#840094: blends-dev: Does not recognize multiline dependencies
On Thu, Nov 24, 2016 at 08:39:54PM +0100, Petter Reinholdtsen wrote: > [Andreas Tille] > > I just want to hear confirmation from some Debian Edu developer > > whether the upload of blends-dev 0.6.95 is OK. > > As far as I can tell, these changes are intended and reflect changes > done to the source code. But I have not tracked the Debian Edu > development closely for a while. And debdiff seems to show no differences between the packages built with blend-gen-control version 0.6.95 vs. those built using version 0.6.94. Wolfgang
Bug#835528: blends-dev: please support option for udeb using blends
Package: blends-dev
Version: 0.6.93
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: debian-edu
X-Debbugs-Cc: debian-...@lists.debian.org
Hi,
while testing Debian Edu Stretch I noticed that the tasks desc file
generated by blend-gen-control doesn't work with the Debian Edu udeb
approach; see #834719.
IMO blends-dev should provide the possibility to generate a task desc
file that is compliant with the case that udebs are used to modify the
installer.
It would be good for a blend if just adding a line containing
"TASKSELOPTS = -u" to their own Makefile would generate a compliant
desc file. Without this line the desc file should be generated as is.
Please check if the modifications below are acceptable:
diff -u a/blends-dev/blend-gen-control b/blends-dev/blend-gen-control
--- a/blends-dev/blend-gen-control 2016-04-09 20:42:00.0 +0200
+++ b/blends-dev/blend-gen-control 2016-08-26 17:32:38.818075961 +0200
@@ -60,12 +60,13 @@
-s : specify which sources.list file to use
-S : suppress tasks without any recommended package
-t : print task descriptions and package list for task
+ -u : modify tasks desc file in case the blend uses udebs
example: $0 -s sources.list.etch -D -c -m -i
EOF
}
-getopts("cdaemis:StDhA", \%opts);
+getopts("cdaemis:StuDhA", \%opts);
usage() and exit if $opts{'h'};
@@ -281,15 +282,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 (! $opts{'u'} ) {
+ 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 +315,22 @@
}
}
print "Task: $task\n";
-print "Parent: $blendname\n";
-print "Section: $blendname\n";
+if (! $opts{'u'}) {
+ print "Parent: $blendname\n";
+};
+ print "Section: $blendname\n";
print "Description: $taskinfo{$task}{Description}\n";
print "$taskinfo{$task}{'Description-long'}"; # Already
contain newline
+if ($opts{'u'}) {
+ 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') {
- print "Test-new-install: mark show\n";
+if (! $opts{'u'}) {
+ print "Test-new-install: mark show\n";
+ }
}
for $header (keys %{$taskinfo{$task}}) {
if ($header =~ m/test-.+/i) {
@@ -343,6 +352,15 @@
}
}
+if ($opts{'u'}) {
+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";
}
}
diff -u a/blends-dev/Makefile b/blends-dev/Makefile
--- a/blends-dev/Makefile 2016-03-31 20:31:00.0 +0200
+++ b/blends-dev/Makefile 2016-08-26 15:33:38.0 +0200
@@ -11,6 +11,7 @@
TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
GENCONTROL := /usr/share/blends-dev/blend-gen-control
+TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2)
# Verify whether config/control exists, if yes, add it to the depends of
debian/control
CONFIGCONTROL := $(shell if [ -d config -a -e config/control ] ; then echo
config/control; fi)
@@ -26,7 +27,7 @@
tasksel: $(BLEND)-tasks.desc
$(BLEND)-tasks.desc: tasks/* debian/changelog
- LC_ALL=C $(GENCONTROL) -s $(TARGET_DIST) -S -t -A >
$(BLEND)-tasks.desc.new && mv $(BLEND)-tasks.desc.new $(BLEND)-tasks.desc
+ LC_ALL=C $(GENCONTROL) -s $(TARGET_DIST) $(TASKSELOPTS) -S -t
Re: Bug#758116: Allow to select Blends selection during installation - just "DE", "Web server", "Mail server" is NOT enough
On Tue, May 17, 2016 at 08:52:32AM +0200, Ole Streicher wrote: > On 17.05.2016 02:13, Cyril Brulebois wrote: > > I'm not sure how reasonable it is to have such a long list of meta > > packages in the installer. See attached tasksel-gtk-greyscale.png for > > the initial display with the graphical installer, and attached > > tasksel-text-greyscale.png for the text mode installer. > > I don't see it problematic as it is in the moment: The list is not too > long: Even if it does not fit on one screen, the rest is visible with > just one scroll, and this is indicated by the scroollbar. And I don't > think that the number of options is too much (it shouldn't be much more, > however). I'm just wondering if the blend install could be implemented one level higher using the ISO image isolinux menu structure. As an example: It is pretty much possible to install the Debian Edu blend using the stock Debian mini.iso image (works, cause all udebs are fetched from the net in this case): wget https://d-i.debian.org/daily-images/amd64/daily/netboot/mini.iso On the kernel command line add: anna/choose_modules=debian-edu-install-udeb (the additionally needed debian-edu-profile-udeb will be pulled in as a dependency). To get it working w/o touching the kernel command line, modify the ISO image (btxt.cfg is the blends text install config file): modified menu.cfg - menu hshift 7 menu width 61 menu title _Debian GNU/Linux installer boot menu include stdmenu.cfg include gtk.cfg include txt.cfg menu begin advanced menu label ^Advanced options menu title Advanced options include stdmenu.cfg label mainmenu menu label ^Back.. menu exit include adgtk.cfg include adtxt.cfg menu end menu begin blends menu label ^Blend options menu title Blend options include stdmenu.cfg label mainmenu menu label ^Back.. menu exit include btxt.cfg menu end include x86menu.cfg label help menu label ^Help text help Display help screens; type 'menu' at boot prompt to return to this menu endtext config prompt.cfg include spkgtk.cfg include spk.cfg added btxt.cfg (with debian-astro just as an example showing up in the menu) label edu blend menu label Edu Blend install kernel linux append vga=788 initrd=initrd.gz anna/choose_modules=debian-edu-install-udeb --- label astro blend menu label Astro Blend install kernel linux append vga=788 initrd=initrd.gz anna/choose_modules=debian-astro-install-udeb --- All blends would need their own debian--install-udeb and debian--profile-udeb; these need to be on all official Debian installation media if these should work like the mini.iso image. The Debian Edu udebs could be used as examples to create blend specific ones: git clone git+ssh://git.debian.org/git/debian-edu/debian-edu-install Wolfgang signature.asc Description: Digital signature
