Merge ~slyon/ubuntu-seeds/+git/platform:inetutils-telnet-MIR into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:lunar

Proposed by Lukas Märdian
Status: Merged
Merged at revision: c61b9dafb1769a7c35a7014586b09c675075da9e
Proposed branch: ~slyon/ubuntu-seeds/+git/platform:inetutils-telnet-MIR
Merge into: ~ubuntu-core-dev/ubuntu-seeds/+git/platform:lunar
Diff against target: 54 lines (+38/-0)
2 files modified
desktop-common (+19/-0)
standard (+19/-0)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+440372@code.launchpad.net

Description of the change

inetutils-telnet was introduced through MIR (LP: #2008789), but only the
-telnet package got reviewed and the other binaries from src:inetutils should
stay out of main. Related to:
https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/platform/commit/?h=lunar&id=349619d

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

After looking up the details here, I think the best way to do this is in fact the '!' support, added in germinate 0.27:

  * Add support for prefixing seed entries with "!" to enforce blacklisting
    packages from the containing seed and any of its inner seeds. For
    example, this allows a package to be in Ubuntu main but blacklisted from
    being shipped on CDs.

You can find examples of its usage in ubuntu ship-live and a number of other ubuntu seeds. It's also used in the desktop-platform seed. To keep these packages from being accidentally seeded in main might require them to be added to each of the standard seed, the desktop-common seed, and the server and server-minimal seeds (which hopefully will see refactoring soon to eliminate the need for duplication here).

review: Needs Fixing
Revision history for this message
Lukas Märdian (slyon) wrote :

Thanks a lot for your input, Steve!

That's (kind of) what I tried in https://bugs.launchpad.net/ubuntu/+source/inetutils/+bug/2008789/comments/19 (in the platform.lunar minimal seed), hoping the other seeds would inherit the blocked packages automatically – which didn't work.

I didn't consider duplicating the blacklist into multiple seeds, as that didn't feel "clean enough". But it seems to be the only viable option for now. I've updated this MP accordingly to copy the inetutils-* blacklist into the standard & desktop-common and created [0] to do the same for the server & server-minimal seeds.

My testing [1] shows that if a package (e.g. inetutils-ftpd) would be seeded in ubuntu.lunar/desktop-minimal, it would still end up in "main", even though being blocked in platform.lunar/desktop-common ... Not sure if this is a problem? It seems to block only packages which are defined in the very same seed file which also contains the blacklist. I guess we don't want to copy the inetutils-* blacklist into all the seeds?

[0] https://code.launchpad.net/~slyon/ubuntu-seeds/+git/ubuntu/+merge/440761
[1] germinate -v -S file:///home/lukas/canonical/distrowork/seeds/ -s ubuntu.lunar -d lunar -a amd64 -c main,restricted,universe,multiverse

Revision history for this message
Steve Langasek (vorlon) wrote :

> My testing [1] shows that if a package (e.g. inetutils-ftpd) would
> be seeded in ubuntu.lunar/desktop-minimal, it would still end up in
> "main", even though being blocked in platform.lunar/desktop-common
> ... Not sure if this is a problem?

Well, it's not optimal! But this seems to be the closest we're going to get with the existing tooling, and is better than nothing. The worst case is that someone (inappropriately) seeds it, it gets promoted via component-mismatches (because the context is not local), then someone tries to regenerate the metapackages and notices it hasn't been pulled in and/or there is an error from germinate, and discussion ensues.

Feel free to file a bug on germinate as well about the limitations of the blacklist implementation.

review: Approve
Revision history for this message
Lukas Märdian (slyon) wrote :

ACK, thanks!

I've created a bug report here: https://bugs.launchpad.net/ubuntu/+source/germinate/+bug/2015966

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/desktop-common b/desktop-common
2index befb5c2..e0aa765 100644
3--- a/desktop-common
4+++ b/desktop-common
5@@ -125,3 +125,22 @@ Fonts:
6 * (kerneloops-daemon) # watch for and allow reporting of kernel problems
7 * (policykit-desktop-privileges) # passwordless disk/CPU speed/time operations for admins
8 * language-selector-common # helps installer to work out which language-support packages to install
9+
10+== Blacklist ==
11+
12+inetutils-telnet was introduced through MIR (LP: #2008789), but only the
13+-telnet package got reviewed and the other binaries from src:inetutils should
14+stay out of main. Related to:
15+https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/platform/commit/?h=lunar&id=349619d
16+
17+ * !inetutils-ftp
18+ * !inetutils-ftpd
19+ * !inetutils-inetd
20+ * !inetutils-ping
21+ * !inetutils-syslogd
22+ * !inetutils-talk
23+ * !inetutils-talkd
24+ * !inetutils-telnetd
25+ * !inetutils-tools
26+ * !inetutils-traceroute
27+ * !telnetd
28diff --git a/standard b/standard
29index 5cf9495..e6ccc4d 100644
30--- a/standard
31+++ b/standard
32@@ -85,3 +85,22 @@ These are used for debugging problems or examining the system.
33
34 * ubuntu-standard # metapackage for everything here
35 * (apt) # James Westby, enables access to private PPAs among other things
36+
37+== Blacklist ==
38+
39+inetutils-telnet was introduced through MIR (LP: #2008789), but only the
40+-telnet package got reviewed and the other binaries from src:inetutils should
41+stay out of main. Related to:
42+https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/platform/commit/?h=lunar&id=349619d
43+
44+ * !inetutils-ftp
45+ * !inetutils-ftpd
46+ * !inetutils-inetd
47+ * !inetutils-ping
48+ * !inetutils-syslogd
49+ * !inetutils-talk
50+ * !inetutils-talkd
51+ * !inetutils-telnetd
52+ * !inetutils-tools
53+ * !inetutils-traceroute
54+ * !telnetd

Subscribers

People subscribed via source and target branches