Merge ~paelzer/ubuntu-seeds/+git/platform:drop-ibmasm-utils into ~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu:focal

Proposed by Christian Ehrhardt  on 2019-12-04
Status: Superseded
Proposed branch: ~paelzer/ubuntu-seeds/+git/platform:drop-ibmasm-utils
Merge into: ~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu:focal
Diff against target: 1738 lines (+1343/-14) (has conflicts)
47 files modified
STRUCTURE (+31/-0)
SUPPORTED_HINTS (+0/-0)
SUPPORTED_HINTS.LTS (+74/-0)
boot (+56/-0)
build-essential (+15/-0)
d-i-requirements (+41/-0)
desktop (+3/-0)
desktop-common (+131/-0)
dev/null (+0/-14)
development (+3/-0)
doc/langpacks.txt (+15/-0)
installer (+210/-0)
lamp-server (+3/-0)
language-packs (+5/-0)
live (+3/-0)
live-common (+23/-0)
mail-server (+3/-0)
minimal (+66/-0)
openssh-server (+3/-0)
print-server (+3/-0)
required (+53/-0)
samba-server (+3/-0)
server-ship (+3/-0)
ship (+3/-0)
ship-live (+3/-0)
standard (+91/-0)
supported (+3/-0)
supported-cloud (+46/-0)
supported-common (+2/-0)
supported-desktop (+1/-0)
supported-development-common (+91/-0)
supported-development-desktop (+28/-0)
supported-hardware (+1/-0)
supported-hardware-common (+13/-0)
supported-hardware-desktop (+9/-0)
supported-installer (+1/-0)
supported-installer-common (+32/-0)
supported-installer-desktop (+8/-0)
supported-kernel-common (+17/-0)
supported-kernel-desktop (+10/-0)
supported-misc-servers (+191/-0)
supported-network (+1/-0)
supported-network-client (+9/-0)
supported-network-common (+5/-0)
supported-server (+1/-0)
supported-sysadmin (+1/-0)
supported-sysadmin-common (+29/-0)
Conflict in STRUCTURE
Conflict in boot
Conflict in build-essential
Conflict in desktop
Conflict in development
Conflict in doc/langpacks.txt
Conflict in installer
Conflict in lamp-server
Conflict in live
Conflict in mail-server
Conflict in minimal
Conflict in openssh-server
Conflict in print-server
Conflict in required
Conflict in samba-server
Conflict in server-ship
Conflict in ship
Conflict in ship-live
Conflict in standard
Conflict in supported
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2019-12-04 Pending
Review via email: mp+376334@code.launchpad.net

This proposal has been superseded by a proposal from 2019-12-04.

To post a comment you must log in.

Unmerged commits

fbc460b... by Christian Ehrhardt  on 2019-12-04

remove outdated ibmasm-utils (LP: #1853003)

This package is no more maintained and the HW it supports is no more
sold for quite some time.

Signed-off-by: Christian Ehrhardt <email address hidden>

3622ef4... by Iain Lane on 2019-11-14

Drop emacs and tools from supported-development-desktop

This is currently dragging more dependencies into main; we think it'd be
better to not support these and instead allow emacs to be maintained in
universe.

e87f71f... by Steve Langasek on 2019-10-29

Drop unused ubuntu-core-libs from the seed

ubuntu-core-meta has been removed from the archive in focal because there
appear to be no actual consumers of it. The actual contents of
ubuntu-core-libs, by definition, must be things that are already part of the
base Ubuntu system without being seeded via this indirection.

a80e1e6... by Adam Conrad on 2019-10-11

Remove obsolete reference to linux-gke.

8e512b3... by Adam Conrad on 2019-10-11

Seed linux-restricted-modules for cloud kernel variants.

ebaa592... by Adam Conrad on 2019-10-04

Unseed linux-oem-osp1 per IRC discussion and LP: #1846213

a155c3c... by Adam Conrad on 2019-10-03

Add missing linux-snapdragon to supported-kernel-common.

af3ab25... by Adam Conrad on 2019-10-03

Move non-cloud kernels from supported-cloud to supported-kernel-common.

09fdf7a... by Dimitri John Ledkov on 2019-10-02

Seed OEM linux kernel flavour, with the others

5a3de01... by Dimitri John Ledkov on 2019-09-19

Seed cloud-initramfs-rooturl for maas

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/STRUCTURE b/STRUCTURE
2index 0852b67..6ef075f 100644
3--- a/STRUCTURE
4+++ b/STRUCTURE
5@@ -1,3 +1,4 @@
6+<<<<<<< STRUCTURE
7 include platform.focal
8 include ubuntu.focal/languages
9 desktop: desktop-minimal desktop-common
10@@ -26,3 +27,33 @@ desktop-default-languages: desktop-minimal-default-languages desktop-en desktop-
11 desktop-minimal-default-languages: desktop-minimal-en desktop-minimal-es desktop-minimal-de desktop-minimal-fr desktop-minimal-it desktop-minimal-pt desktop-minimal-ru desktop-minimal-zh
12 supported: supported-common server-ship server-ship-live cloud-image ship ship-live development language-packs supported-desktop-extra supported-kiosk
13 # make sure supported remains the last entry
14+=======
15+feature follow-recommends
16+feature no-follow-build-depends
17+required:
18+minimal: required
19+boot:
20+standard: minimal
21+desktop-common: standard
22+d-i-requirements: minimal
23+installer:
24+build-essential: required
25+language-packs: desktop-common
26+live-common: standard
27+supported-cloud: standard
28+supported-development-common: standard
29+supported-development-desktop: standard
30+supported-kernel-common: standard
31+supported-kernel-desktop: standard
32+supported-misc-servers: standard
33+supported-hardware-common: standard
34+supported-hardware-desktop: standard
35+supported-installer-common: standard installer
36+supported-installer-desktop: standard
37+supported-network-common: standard
38+supported-network-client: standard
39+supported-sysadmin-common: standard
40+supported-server: supported-misc-servers supported-hardware-common supported-installer-common supported-network-common supported-sysadmin-common build-essential supported-development-common supported-kernel-common supported-cloud
41+supported-desktop: supported-hardware-desktop supported-installer-desktop supported-hardware-common supported-installer-common supported-network-common supported-network-client supported-sysadmin-common build-essential supported-development-common supported-development-desktop supported-kernel-common supported-kernel-desktop
42+supported-common: supported-server supported-desktop
43+>>>>>>> STRUCTURE
44diff --git a/SUPPORTED_HINTS b/SUPPORTED_HINTS
45new file mode 100644
46index 0000000..e69de29
47--- /dev/null
48+++ b/SUPPORTED_HINTS
49diff --git a/SUPPORTED_HINTS.LTS b/SUPPORTED_HINTS.LTS
50new file mode 100644
51index 0000000..e10774c
52--- /dev/null
53+++ b/SUPPORTED_HINTS.LTS
54@@ -0,0 +1,74 @@
55+# this file can be used to fine tune the support times and is used
56+# by launchpad via cron.germinate and maintenance-check.py
57+#
58+# It supports the following format:
59+# src:srcpkgname support-time
60+# binary-pkg-name support-time
61+# binary-pkg-name/arch support-time
62+#
63+# Examples:
64+# src:xorg unsupported
65+# zsh/armel 3y
66+# hal 18m
67+#
68+# we don't use src: currently as it will also upgrade support
69+# for some packages (like libogg-dev from 18m to 3y)
70+#
71+#src:xorg 3y
72+x11-common 3y
73+#
74+#
75+# virt-host pulls in sound bits which are not considered LTS. If only
76+# virt-host is using these things, they should remain demoted.
77+#
78+#src:libsdl1.2 3y
79+libsdl1.2debian 3y
80+#src:pulseaudio 3y
81+libpulse0 3y
82+#src:libsndfile 3y
83+libsndfile1 3y
84+#src:libogg 3y
85+libogg0 3y
86+#src:libvorbis 3y
87+libvorbis0a 3y
88+libvorbisenc2 3y
89+#src:hal 3y
90+libhal-storage1 3y
91+libhal1 3y
92+hal 3y
93+#src:hal-info 3y
94+hal-info 3y
95+#src:alsa-lib 3y
96+libasound2 3y
97+#src:flac 3y
98+libflac8 3y
99+#
100+#
101+# checkbox pulls in gstreamer which should not be considered server-supported.
102+# LP: #568712
103+#
104+#src:gstreamer0.10 3y
105+libgstreamer0.10-0 3y
106+#src:gst0.10-python 3y
107+python-gst0.10 3y
108+#src:gst-plugins-base0.10 3y
109+libgstreamer-plugins-base0.10-0 3y
110+#
111+# upraded support for selected server packages that are not
112+# part of any seed, there should be a supported-server-extra
113+# seed in the future and/or put into the appropriate existing
114+# seeds
115+#
116+linux-backports-modules-alsa-2.6.32-21-server 5y
117+linux-backports-modules-alsa-lucid-server 5y
118+linux-backports-modules-headers-lucid-server 5y
119+linux-backports-modules-wireless-2.6.32-21-server 5y
120+linux-backports-modules-wireless-lucid-server 5y
121+linux-headers-2.6.32-21-preempt 5y
122+linux-headers-2.6.32-21-server 5y
123+linux-headers-lbm-2.6.32-21-server 5y
124+linux-image-2.6.32-21-server 5y
125+linux-image-server 5y
126+lynx 5y
127+netpbm 5y
128+pdksh 5y
129diff --git a/boot b/boot
130new file mode 100644
131index 0000000..ae62e85
132--- /dev/null
133+++ b/boot
134@@ -0,0 +1,56 @@
135+<<<<<<< boot
136+=======
137+= Kernels and Bootloaders =
138+
139+The default kernels and bootloaders are not to be installed by debootstrap,
140+and *-minimal metapackages should not depend on them; however, they do need
141+to end up on CD images and in live filesystems. We therefore put them in a
142+separate seed.
143+
144+We seed both linux-* and linux-image-* so that it's easier to build CD
145+images without the restricted component. The linux-* kernels include
146+restricted modules.
147+
148+ * Kernel-Stem: linux linux-image
149+
150+== i386 ==
151+
152+ * grub-pc [amd64 i386]
153+ * ${Kernel-Stem}-generic [i386] # our chosen default install kernel
154+
155+== powerpc ==
156+
157+ * yaboot [powerpc]
158+ * ${Kernel-Stem}-powerpc-smp [powerpc] # powerpc kernel, 32-bit machines
159+ * ${Kernel-Stem}-generic [powerpc] # powerpc kernel, 64-bit machines
160+
161+== ppc64el ==
162+
163+ * grub-ieee1275 [ppc64el]
164+ * ${Kernel-Stem}-generic [ppc64el] # default install kernel for ppc64el
165+
166+== amd64 ==
167+
168+ * ${Kernel-Stem}-generic [amd64] # amd64 kernel, works on all machines though not optimised
169+
170+== armel / armhf ==
171+
172+ * ${Kernel-Stem}-generic [armhf] # multiplatform kernel, will eventually replace others
173+
174+== arm64 ==
175+
176+ * grub-efi-arm64 [arm64]
177+ * ${Kernel-Stem}-generic [arm64]
178+
179+== s390x ==
180+
181+ * ${Kernel-Stem}-generic [s390x]
182+ * s390-tools [s390x]
183+ * sysconfig-hardware [s390x]
184+
185+== Germinate workarounds ==
186+
187+Stop grub-common -> base-files -> awk from selecting mawk. (Since the boot seed doesn't inherit from required for arcane reasons, this is the only way we can make this work reliably ...)
188+
189+ * mawk
190+>>>>>>> boot
191diff --git a/build-essential b/build-essential
192new file mode 100644
193index 0000000..f68ea64
194--- /dev/null
195+++ b/build-essential
196@@ -0,0 +1,15 @@
197+<<<<<<< build-essential
198+=======
199+ * Feature: no-follow-recommends
200+
201+This seed is used to implement the debootstrap buildd variant.
202+
203+ * build-essential
204+ * apt
205+ * dpkg-dev
206+ * gcc
207+ * g++
208+ * libc6-dev [!alpha !ia64]
209+ * libc6.1-dev [alpha ia64]
210+ * make
211+>>>>>>> build-essential
212diff --git a/d-i-requirements b/d-i-requirements
213new file mode 100644
214index 0000000..969156a
215--- /dev/null
216+++ b/d-i-requirements
217@@ -0,0 +1,41 @@
218+These packages may be installed dynamically by d-i based on installation
219+parameters. They should generally be made available on CDs.
220+
221+== Package management ==
222+
223+ * tasksel # used by installer to install desktop etc.
224+
225+== Filesystems ==
226+
227+ * xfsprogs
228+ * jfsutils
229+ * hfsplus [powerpc] # ColinWatson
230+ * reiserfsprogs
231+ * btrfs-tools
232+ * lvm2
233+ * mdadm
234+ * dmsetup
235+ * dmraid
236+ * cryptsetup
237+
238+== For language support in the installer ==
239+
240+ * console-terminus
241+ * unifont
242+
243+== Hardware & Network Access ==
244+
245+ * mouseemu # needed on Macs with single-button mice
246+
247+== Installer ==
248+
249+ * grub-efi [amd64]
250+ * grub-efi-amd64-signed [amd64]
251+ * shim-signed [amd64]
252+ * mkvmlinuz [powerpc] # for nobootloader
253+ * lupin-support [amd64 i386] # installer-for-windows
254+ * uboot-mkimage [armel armhf] # needed on dove and omap for uboot
255+ * uboot-envtools [armel armhf] # needed on omap for uboot
256+ * installation-report
257+ * fwupd-signed
258+ * opal-prd [ppc64el]
259diff --git a/desktop b/desktop
260index 195e094..46df1c0 100644
261--- a/desktop
262+++ b/desktop
263@@ -1,3 +1,4 @@
264+<<<<<<< desktop
265 Task-Per-Derivative: 1
266 Task-Section: user
267 Task-Description: Ubuntu desktop
268@@ -55,3 +56,5 @@ Custom launchers to be displayed on the Dash by default
269
270 * ubuntu-desktop-minimal # we are a superset of minimal
271 * ubuntu-desktop # metapackage for everything here
272+=======
273+>>>>>>> desktop
274diff --git a/desktop-common b/desktop-common
275new file mode 100644
276index 0000000..2c08927
277--- /dev/null
278+++ b/desktop-common
279@@ -0,0 +1,131 @@
280+This seed provides the basic components that should be installed on an
281+Ubuntu-family desktop system. It is expected to be supplemented with a
282+particular flavour of desktop environment (e.g. GNOME, KDE, or XFCE).
283+
284+Before packages are added here, they must follow the procedure to
285+ensure that all parties are aware of the addition:
286+https://wiki.ubuntu.com/SeedManagement/AddingPackagesToDesktopCommon
287+
288+= Hardware and Architecture Support =
289+
290+== Architecture-independent ==
291+
292+ * alsa-base # needed for proper hardware detection (hotplug/blacklist.d, modprobe.d)
293+ * alsa-utils # basic audio support and mixer level handling
294+ * (pcmciautils) # PCMCIA support for >= 2.6.13-rc1 kernels
295+ * inputattach # needed for serial mice
296+ * ubuntu-drivers-common # Make it harder to remove detection support, LP#704597
297+ * libu2f-udev # needed to get U2F and yubikeys to work properly
298+
299+Power management:
300+
301+ * (acpi-support)
302+
303+Bluetooth:
304+TODO not for Xubuntu
305+
306+ * (bluez) # base for bluetooth support
307+ * (bluez-cups) # allow connecting to bluetooth printers from CUPS
308+
309+== armel ==
310+
311+ * apmd [armel]
312+
313+== ppc32, ppc64 ==
314+
315+ * pbbuttonsd [powerpc]
316+
317+= Console-Based Tools =
318+
319+These tools are very commonly used by people who drop into a console shell to do some work.
320+
321+ * bc
322+ * genisoimage
323+ * zip
324+ * unzip # also used for .zip support in file-roller
325+
326+= Network Services =
327+
328+Basic network services and Windows integration.
329+
330+ * wireless-tools
331+ * rfkill # No longer using the copy from wireless-tools (LP: #715309)
332+ * wpasupplicant # ScottJamesRemnant
333+ * (libnss-mdns) # IPv4 link-local DNS support
334+ * ca-certificates # common SSL certificates
335+
336+These packages help with system integration
337+
338+ * libsasl2-modules # allows integration with MTA and login system
339+ * (avahi-daemon) # some people do not like it, and it is not essential
340+
341+= Printing =
342+
343+Printing and printer configuration is a real weak spot in Debian, and in Linux in general. We will need to stay at the front of the curve here.
344+
345+ * (cups) # our preferred printer management infrastructure
346+ * (cups-bsd) # gives us lpc, lpq, lpr, lprm
347+ * (cups-client) # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
348+ * foomatic-db-compressed-ppds # the foomatic printer driver database
349+ * (cups-filters)
350+ * openprinting-ppds # Most common drivers we want in desktop; less common are in o-p-extra
351+ * printer-driver-pnm2ppa # several ppds require this
352+ * ghostscript-x
353+ * (hplip) # support for HP all-in-one printers
354+ * (printer-driver-min12xxw) # support for KonicaMinolta PagePro 1200W, 1300W printers
355+ * (printer-driver-foo2zjs) # support for printing to ZjStream-based printers
356+ * (printer-driver-splix) # support for Samsung lasers
357+ * (printer-driver-pxljr) # support for HP Color lasers
358+ * (printer-driver-c2esp) # support for Kodak injket printers
359+ * (printer-driver-ptouch) # support for Brother P-touch printers
360+ * (printer-driver-sag-gdi) # support for Rico Aficio SPxxxx printers
361+ * (printer-driver-brlaser) # support for some Brother laser printers
362+ * (printer-driver-m2300w) # support for the Minolta magicolor 2300W/24000W color laser printers
363+
364+= GUI infrastructure =
365+
366+Packages used for X preconfiguration are just Recommends; removing them after initial installation should be relatively safe.
367+
368+ * (laptop-detect)
369+
370+ * xorg # this includes xserver-xorg->xserver-xorg-{input|video}-* (no need to add specific drivers manually)
371+ * !linux-image-* # xorg transitively depends on this, but this would pull in grub-pc; we handle that separately
372+ * xkb-data # XKB data now lives here
373+ * spice-vdagent # Better when run as a Spice VM, like with GNOME Boxes LP: #1200296
374+
375+Fonts:
376+
377+ * fonts-dejavu-core
378+ * fonts-freefont-ttf
379+ * (fonts-kacst-one)
380+ * (fonts-khmeros-core)
381+ * (fonts-thai-tlwg)
382+ * (fonts-lao)
383+ * (fonts-sil-padauk)
384+ * (fonts-tibetan-machine)
385+ * (fonts-sil-abyssinica)
386+ * (fonts-lklug-sinhala)
387+ * (fonts-indic)
388+ * (fonts-liberation)
389+ * (fonts-noto-cjk)
390+ * (fonts-ubuntu)
391+
392+= Debugging and Diagnostics =
393+
394+ * (memtest86+)
395+
396+= Common Packaging Framework Stuff =
397+
398+ * (packagekit)
399+ * (snapd)
400+
401+= Firmware updating support =
402+
403+ * (fwupd)
404+ * (fwupd-signed)
405+
406+= Other =
407+
408+ * anacron # generally appropriate for desktops
409+ * (kerneloops-daemon) # watch for and allow reporting of kernel problems
410+ * (policykit-desktop-privileges) # passwordless disk/CPU speed/time operations for admins
411diff --git a/development b/development
412index 5e14239..1ce0b50 100644
413--- a/development
414+++ b/development
415@@ -1,3 +1,4 @@
416+<<<<<<< development
417 Moved from desktop:
418
419 * python3-apt # MRS, we need to be able to interact with APT
420@@ -80,3 +81,5 @@ Additional supported languages
421 # 'Built-Using' due to code copied into target objects at build time.
422 = Built-using workarounds =
423 * drac-dev
424+=======
425+>>>>>>> development
426diff --git a/dns-server b/dns-server
427deleted file mode 100644
428index cea27cf..0000000
429--- a/dns-server
430+++ /dev/null
431@@ -1,7 +0,0 @@
432-Task-Section: server
433-Task-Description: DNS server
434-Task-Extended-Description: Selects the BIND DNS server and its documentation.
435-Task-Key: bind9
436-
437- * bind9
438- * bind9-doc
439diff --git a/doc/langpacks.txt b/doc/langpacks.txt
440index 777419a..d69a5fe 100644
441--- a/doc/langpacks.txt
442+++ b/doc/langpacks.txt
443@@ -27,6 +27,7 @@ language and all languages above it.
444 The list is vertically ordered by the priority, i. e. they should be
445 added from top to down.
446
447+<<<<<<< doc/langpacks.txt
448 Language support on DVDs
449 ========================
450
451@@ -41,3 +42,17 @@ system ("dvd-live-langsupport"). Generate these with this command:
452 for l in en es xh pt de fr; do echo "= Language support for $l ="; check-language-support --show-installed -l $l | xargs -n1 | sed 's/^/ * /'; echo; done > dvd-langsupport
453
454 Update the list of languages accordingly.
455+=======
456+Input support packages
457+======================
458+
459+When shipping a language on a CD, the required input support packages
460+should be shipped as well.
461+
462+To find out the necessary packages, run this command for the particular
463+language code:
464+
465+ check-language-support -l ja --show-installed -p ibus
466+
467+This displays the input methods for Japanese ("ja").
468+>>>>>>> doc/langpacks.txt
469diff --git a/installer b/installer
470new file mode 100644
471index 0000000..a46b2de
472--- /dev/null
473+++ b/installer
474@@ -0,0 +1,210 @@
475+<<<<<<< installer
476+=======
477+This list was originally constructed based on a [http://people.debian.org/~cjwatson/d-i/ list of packages in the current d-i netinst images], and from initrd.list files in d-i daily builds.
478+
479+= Common Packages =
480+
481+ * anna
482+ * apt-cdrom-setup
483+ * apt-mirror-setup
484+ * apt-setup-udeb # first-stage apt configuration question
485+ * archdetect
486+ * base-installer
487+ * bogl-bterm-udeb
488+ * brltty-udeb
489+ * bterm-unifont
490+ * busybox-udeb
491+ * cdebconf-newt-entropy
492+ * cdebconf-newt-terminal
493+ * cdebconf-newt-udeb
494+ * cdebconf-priority
495+ * cdebconf-text-entropy
496+ * cdebconf-text-udeb
497+ * cdebconf-udeb
498+ * cdrom-checker
499+ * cdrom-detect
500+ * cdrom-retriever
501+ * choose-mirror
502+ * clock-setup
503+ * debootstrap-udeb
504+ * di-utils
505+ * di-utils-mapdevfs
506+ * di-utils-reboot
507+ * di-utils-shell
508+ * di-utils-terminfo
509+ * disk-detect
510+ * dmraid-udeb
511+ * download-installer
512+ * driver-injection-disk-detect
513+ * e2fsprogs-udeb
514+ * eject-udeb
515+ * env-preseed
516+ * ethdetect
517+ * fbset-udeb
518+ * file-preseed
519+ * finish-install
520+ * hdparm-udeb # not currently used, but may be used by cdrom-detect in the future
521+ * hw-detect
522+ * initrd-preseed
523+ * installation-locale
524+ * isc-dhcp-client-udeb
525+ * iso-3166-udeb
526+ * iso-scan # for USB boot
527+ * jfsutils-udeb
528+ * console-setup-linux-charmaps-udeb
529+ * console-setup-linux-fonts-udeb
530+ * console-setup-pc-ekbd
531+ * libdevmapper1.02-udeb
532+ * libfribidi0-udeb
533+ * libkmod2-udeb
534+ * load-cdrom
535+ * load-iso # for USB boot
536+ * localechooser # replaces languagechooser and countrychooser
537+ * lowmem
538+ * lowmemcheck
539+ * lsb-release-udeb
540+ * lvm2-udeb
541+ * main-menu
542+ * mdadm-udeb
543+ * mii-diag-udeb
544+ * mkreiserfs-udeb
545+ * nano-udeb
546+ * net-retriever
547+ * netcfg
548+ * network-preseed
549+ * nobootloader
550+ * oem-config-udeb # first-stage component of OEM installer
551+ * openssh-client-udeb
552+ * os-prober-udeb
553+ * partconf-find-partitions
554+ * partconf-mkfstab
555+ * parted-udeb
556+ * partman-auto
557+ * partman-auto-crypto
558+ * partman-auto-loop
559+ * partman-auto-lvm
560+ * partman-auto-raid
561+ * partman-base
562+ * partman-basicfilesystems
563+ * partman-basicmethods
564+ * partman-btrfs
565+ * partman-crypto-dm
566+ * partman-ext3
567+ * partman-jfs
568+ * partman-lvm
569+ * partman-md
570+ * partman-multipath
571+ * partman-partitioning
572+ * partman-reiserfs
573+ * partman-swapfile # LP: #1645289
574+ * partman-target
575+ * partman-xfs
576+ * pciutils-udeb # for lspci, so we can show descriptive names for devices
577+ * pcmciautils-udeb
578+ * pkgsel # after installing the base system, install everything else
579+ * preseed-common
580+ * reiserfsprogs-udeb
581+ * rescue-check # initrd part of rescue mode
582+ * rescue-mode # main part of rescue mode, installed if rescue/enable=true
583+ * rootskel
584+ * save-logs
585+ * strace-udeb # handy for debugging
586+ * tzsetup-udeb # first-stage timezone question
587+ * udev-udeb
588+ * udpkg
589+ * usb-discover
590+ * usbutils-udeb # for lsusb, so we can show descriptive names for devices
591+ * user-setup-udeb # first-stage username/password question
592+ * util-linux-udeb
593+ * wget-udeb # HTTPS support
594+ * wireless-tools-udeb
595+ * xfsprogs-udeb
596+
597+= Floppy Support =
598+
599+ * media-retriever
600+ * load-media
601+
602+= Release File Authentication =
603+
604+ * gpgv-udeb
605+ * ubuntu-keyring-udeb
606+
607+= Kickstart Compatibility =
608+
609+ * initrd-kickseed
610+
611+= Partition Management (architecture-specific) =
612+
613+ * fdisk-udeb
614+ * gptsync-udeb [amd64 arm64 i386]
615+ * partman-efi [amd64 arm64 i386]
616+ * partman-newworld [powerpc]
617+ * partman-prep [powerpc ppc64el]
618+ * partman-uboot [armel armhf]
619+ * s390-sysconfig-writer [s390x]
620+ * s390-dasd [s390x]
621+ * s390-netdevice [s390x]
622+ * s390-zfcp [s390x]
623+ * s390-tools-udeb [s390x]
624+ * s390-tools-zkey-udeb [s390x]
625+
626+= Bootloader Installers =
627+
628+ * devio-udeb [armel]
629+ * elilo-installer [i386]
630+ * flash-kernel-installer [armel armhf arm64]
631+ * grub-installer [amd64 arm64 i386 ppc64el]
632+ * zipl-installer [s390x]
633+ * kboot-installer [powerpc]
634+ * yaboot-installer [powerpc]
635+
636+= Experimental stuff =
637+
638+ * network-console
639+
640+= Specialised hardware =
641+
642+ * beep-udeb [armel]
643+ * oldsys-preseed [armel armhf]
644+
645+= Kernel Modules =
646+
647+ * nic-firmware
648+ * scsi-firmware
649+
650+== amd64 ==
651+
652+ * linux-udebs-generic [amd64]
653+
654+== arm64 ==
655+
656+ * linux-udebs-generic [arm64]
657+ * linux-udebs-snapdragon [arm64]
658+
659+== armel ==
660+
661+ * linux-udebs-generic [armel]
662+
663+== armhf ==
664+
665+ * linux-udebs-generic [armhf]
666+ * linux-udebs-generic-lpae [armhf]
667+
668+== i386 ==
669+
670+ * linux-udebs-generic [i386]
671+
672+== powerpc ==
673+
674+ * linux-udebs-powerpc-smp [powerpc]
675+ * linux-udebs-generic [powerpc]
676+
677+== ppc64el ==
678+
679+ * linux-udebs-generic [ppc64el]
680+
681+== s390x ==
682+
683+ * linux-udebs-generic [s390x]
684+>>>>>>> installer
685diff --git a/lamp-server b/lamp-server
686index 07d19f5..b0d37aa 100644
687--- a/lamp-server
688+++ b/lamp-server
689@@ -1,3 +1,4 @@
690+<<<<<<< lamp-server
691 Task-Section: server
692 Task-Description: LAMP server
693 Task-Extended-Description: Selects a ready-made Linux/Apache/MySQL/PHP server.
694@@ -8,3 +9,5 @@ Task-Key: apache2 mysql-server
695 * php-mysql
696 * libapache2-mod-php
697 * mysql-server
698+=======
699+>>>>>>> lamp-server
700diff --git a/language-packs b/language-packs
701new file mode 100644
702index 0000000..b833a78
703--- /dev/null
704+++ b/language-packs
705@@ -0,0 +1,5 @@
706+= Language packs =
707+
708+Language packs are used to deliver translations and other language-specific facilities. They're seeded elsewhere to get them onto CD images, but this seed collects the basic ones together so that we can easily identify them for the purposes of constructing package sets.
709+
710+ * /^language-pack-[^-]+$/
711diff --git a/live b/live
712index 0a1e030..4d908ec 100644
713--- a/live
714+++ b/live
715@@ -1,3 +1,4 @@
716+<<<<<<< live
717 Task-Per-Derivative: 1
718 Task-Section: user
719 Task-Description: Ubuntu live CD
720@@ -35,3 +36,5 @@ These packages make up the Ubiquity live installer.
721 * gparted
722 * cifs-utils # Needed by casper for CIFS root=
723
724+=======
725+>>>>>>> live
726diff --git a/live-common b/live-common
727new file mode 100644
728index 0000000..74e69e4
729--- /dev/null
730+++ b/live-common
731@@ -0,0 +1,23 @@
732+Ubiquity needs full filesystem support for the partitioner.
733+
734+ * xfsprogs
735+ * jfsutils
736+ * hfsplus [powerpc] # ColinWatson
737+ * reiserfsprogs
738+ * btrfs-tools
739+ * ntfs-3g
740+ * lvm2
741+ * dmraid
742+
743+# workaround for a broken aufs/overlayfs (e. g. LP #587888); also needs
744+# cdimage change to use union=unionfs-fuse kernel parameter
745+# * unionfs-fuse
746+
747+# * (bootchart) [!armel] # scheduled for removal before maverick beta
748+
749+ * mokutil [amd64] # Needed for EFI install with third-party drivers
750+
751+== Germinate workarounds ==
752+
753+ * wamerican # iamerican Depends: ispell Recommends: wordlist, but wamerican isn't spotted in time so germinate arbitrarily picks miscfiles instead
754+
755diff --git a/mail-server b/mail-server
756index 83eccda..504e3ae 100644
757--- a/mail-server
758+++ b/mail-server
759@@ -1,3 +1,4 @@
760+<<<<<<< mail-server
761 Task-Section: server
762 Task-Description: Mail server
763 Task-Extended-Description: This task selects a variety of package useful for a general purpose mail
764@@ -12,3 +13,5 @@ Task-Key: postfix
765 * procmail
766
767 Additionally, Debian has mailagent, but that's in universe and not an option.
768+=======
769+>>>>>>> mail-server
770diff --git a/minimal b/minimal
771new file mode 100644
772index 0000000..88715d8
773--- /dev/null
774+++ b/minimal
775@@ -0,0 +1,66 @@
776+<<<<<<< minimal
777+=======
778+Task-Section: user
779+Task-Relevance: 9
780+Task-Description: Minimal base system
781+Task-Extended-Description: This task installs the core of an Ubuntu-based system.
782+Task-Test-new-install: install skip
783+Task-Seeds: required
784+
785+Note that some packages that form the core of an Ubuntu-based system are in the required seed, from which this seed inherits. The minimal seed describes those packages at Priority: important.
786+
787+Recommends are followed when processing this seed even though debootstrap doesn't do that. This may occasionally produce confusing results; however, it should be correct at release time, since the results of processing the seed are synced to Priority: important overrides.
788+
789+= Hardware and Architecture Support =
790+
791+== Generic ==
792+
793+== ppc32, ppc64 ==
794+
795+ * powerpc-utils [powerpc ppc64el] # ColinWatson
796+
797+== Comfortable Unix System ==
798+
799+Programs and packages necessary for both the proper functionality of the system and that any user would expect to find on a modern Unix-like system.
800+
801+ * adduser
802+ * apt
803+ * apt-utils # apt-extracttemplates is required for debconf preconfiguration
804+ * bzip2
805+ * console-setup # https://blueprints.launchpad.net/ubuntu/+spec/sane-installer-keyboard
806+ * debconf-i18n # buildd chroots don't need this, but other systems generally do
807+ * kbd
808+ * eject # very popular, useful, small
809+ * less
810+ * locales
811+ * lsb-release
812+ * kmod
813+ * netbase
814+ * python3 # explicitly seeded, despite lsb-release also pulling it it
815+ * (rsyslog)
816+ * sudo # LaMontJones
817+ * sysvinit-utils # until "pidof" moves into procps, Debian #810018
818+ * tzdata
819+ * ubuntu-advantage-tools # needs to be on the system by default for ESM
820+ * ubuntu-keyring # for authenticated package downloads
821+ * udev
822+ * vim-tiny
823+ * whiptail # for debconf's Dialog frontend
824+
825+== Networking ==
826+
827+These provide various networking services, all should be configured in a client-only state with the server de-activated unless the user requires it.
828+
829+ * isc-dhcp-client # LaMontJones
830+ * iproute2
831+ * netplan.io # foundations-aa-migrating-to-neplan (replaces ifupdown)
832+
833+ * iputils-ping
834+ * netcat-openbsd # FabioMassimoDiNitto
835+
836+= Meta =
837+
838+ * init # ensure we have an init system (but minimal chroots)
839+ * ubuntu-minimal # Ubuntu-specific bits we want on every Ubuntu system
840+
841+>>>>>>> minimal
842diff --git a/openssh-server b/openssh-server
843index cfd287b..3b167c5 100644
844--- a/openssh-server
845+++ b/openssh-server
846@@ -1,3 +1,4 @@
847+<<<<<<< openssh-server
848 Task-Section: server
849 Task-Description: OpenSSH server
850 Task-Extended-Description: Selects packages needed for an OpenSSH server.
851@@ -5,3 +6,5 @@ Task-Relevance: 7
852 Task-Key: openssh-server
853
854 * openssh-server
855+=======
856+>>>>>>> openssh-server
857diff --git a/postgresql-server b/postgresql-server
858deleted file mode 100644
859index 6339f96..0000000
860--- a/postgresql-server
861+++ /dev/null
862@@ -1,14 +0,0 @@
863-Task-Section: server
864-Task-Description: PostgreSQL database
865-Task-Extended-Description: This task selects client and server packages for the PostgreSQL database.
866-Task-Extended-Description: .
867-Task-Extended-Description: PostgreSQL is an SQL relational database, offering increasing SQL92
868-Task-Extended-Description: compliance and some SQL3 features. It is suitable for use with multi-user
869-Task-Extended-Description: database access, through its facilities for transactions and fine-grained
870-Task-Extended-Description: locking.
871-Task-Key: postgresql
872-
873- * postgresql
874- * postgresql-client
875- * postgresql-doc
876- * postgresql-contrib
877diff --git a/print-server b/print-server
878index 99a7da2..f3b9b08 100644
879--- a/print-server
880+++ b/print-server
881@@ -1,3 +1,4 @@
882+<<<<<<< print-server
883 Task-Section: server
884 Task-Description: Print server
885 Task-Extended-Description: This task sets up your system to be a print server.
886@@ -10,3 +11,5 @@ Task-Key: cups cups-bsd cups-client
887 * foomatic-db-compressed-ppds
888 * printer-driver-hpijs
889 * openprinting-ppds
890+=======
891+>>>>>>> print-server
892diff --git a/required b/required
893new file mode 100644
894index 0000000..109d647
895--- /dev/null
896+++ b/required
897@@ -0,0 +1,53 @@
898+<<<<<<< required
899+=======
900+This seed describes the packages at Priority: required. These packages are installed by the first pass of debootstrap, which extracts them (dpkg -x, without running maintainer scripts) in order to construct a basic environment into which it can chroot and install them properly.
901+
902+A system containing only required packages is not a supported Ubuntu system; you need to install at least the packages from minimal as well.
903+
904+We avoid following Recommends for this seed because it is processed by debootstrap, not apt, and debootstrap only does the minimum necessary.
905+
906+ * Feature: no-follow-recommends
907+
908+= UNIX =
909+
910+== Essential ==
911+
912+These are packages which have "Essential: yes" in their control file.
913+
914+ * base-files
915+ * base-passwd # ColinWatson
916+ * bash
917+ * bsdutils # LaMontJones
918+ * coreutils
919+ * dash # Much faster default shell
920+ * debianutils
921+ * diffutils
922+ * dpkg
923+ * e2fsprogs
924+ * findutils
925+ * grep
926+ * gzip
927+ * hostname
928+ * init-system-helpers
929+ * libc-bin
930+ * login
931+ * mount # LaMontJones
932+ * ncurses-base
933+ * ncurses-bin
934+ * perl-base
935+ * sed
936+ * tar # LaMontJones
937+ * util-linux # LaMontJones
938+
939+In some sense, debconf isn't truly required, but it makes our life a lot easier to have it installed in the first pass.
940+
941+ * debconf
942+
943+Other packages necessary to get started:
944+
945+ * mawk
946+ * passwd
947+ * procps
948+ * sensible-utils # used to be pulled in by debianutils, tons of undeclared deps
949+ * sysvinit-utils # pidof tool (Debian #810018) and init-d-script for SysV init scripts
950+>>>>>>> required
951diff --git a/samba-server b/samba-server
952index d5c6700..af18d0f 100644
953--- a/samba-server
954+++ b/samba-server
955@@ -1,3 +1,4 @@
956+<<<<<<< samba-server
957 Task-Section: server
958 Task-Description: Samba file server
959 Task-Extended-Description: This task sets up your system to be a Samba file server, which is
960@@ -12,3 +13,5 @@ Task-Key: samba
961 * cifs-utils
962 * winbind
963
964+=======
965+>>>>>>> samba-server
966diff --git a/server-ship b/server-ship
967index 2e762a0..9b9c775 100644
968--- a/server-ship
969+++ b/server-ship
970@@ -1,3 +1,4 @@
971+<<<<<<< server-ship
972 = Kernel =
973
974 We seed both linux-* and linux-image-* so that it's easier to build CD
975@@ -270,3 +271,5 @@ Security:
976 libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
977
978 * !libavcodec*
979+=======
980+>>>>>>> server-ship
981diff --git a/ship b/ship
982index dee0fd6..7ec503e 100644
983--- a/ship
984+++ b/ship
985@@ -1,3 +1,4 @@
986+<<<<<<< ship
987 == Kernel ==
988
989 * linux-generic [amd64 i386 ppc64el arm64 s390x]
990@@ -64,3 +65,5 @@
991 libavcodec cannot be shipped on CDs (cf. Ubuntu technical board resolution 2007-01-02).
992
993 * !libavcodec*
994+=======
995+>>>>>>> ship
996diff --git a/ship-live b/ship-live
997index 4189af8..f6d1acc 100644
998--- a/ship-live
999+++ b/ship-live
1000@@ -1,3 +1,4 @@
1001+<<<<<<< ship-live
1002 The ship-live seed will be added to the live CD as an ordinary package
1003 archive. Here belongs anything that somebody might need to install after
1004 installing the contents of the live CD in order to get online and fetch more
1005@@ -33,3 +34,5 @@ packages.
1006 libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
1007
1008 * !libavcodec*
1009+=======
1010+>>>>>>> ship-live
1011diff --git a/standard b/standard
1012new file mode 100644
1013index 0000000..cef6250
1014--- /dev/null
1015+++ b/standard
1016@@ -0,0 +1,91 @@
1017+<<<<<<< standard
1018+=======
1019+Task-Section: user
1020+Task-Relevance: 8
1021+Task-Description: Standard system
1022+Task-Extended-Description: This task installs a reasonably small character-mode system.
1023+Task-Key: ubuntu-standard
1024+Task-Test-new-install: install skip
1025+
1026+= UNIX =
1027+
1028+== Comfortable Unix System ==
1029+
1030+ * busybox-static # https://blueprints.launchpad.net/ubuntu/+spec/foundations-lucid-boot-recovery
1031+ * cpio
1032+ * cron
1033+ * ed
1034+ * file
1035+ * hdparm # speed up CD-ROM and disk access, used by installer
1036+ * info
1037+ * (irqbalance) # optimize IRQ:CPU affinities on multicore systems
1038+ * libpam-systemd # proper logind sessions, LP: #1561658
1039+ * logrotate
1040+ * man-db # ColinWatson
1041+ * (manpages) # ColinWatson
1042+ * mime-support # establishes framework for dealing with MIME
1043+ * (nano) # we need a text editor less scary than vi
1044+ * parted
1045+ * psmisc # utilities for /proc such as killall, pstree, fuser
1046+ * pciutils
1047+ * usbutils
1048+ * time
1049+ * (bash-completion)
1050+
1051+== Filesystems ==
1052+
1053+These are commonly used filesystem support packages, here because someone setting up a server would begin with standard, configure filesystems and network and then add other services. NFS is explicitly not here, because it brings in nasties like portmap, and because the network will need to be running before it can be used, so we may as well put that in Supported.
1054+
1055+ * dosfstools
1056+ * hfsutils [powerpc]
1057+ * (ntfs-3g)
1058+ * (uuid-runtime) # we use UUIDs by default, so make it easy to generate them
1059+
1060+== Networking ==
1061+
1062+These provide various networking services, all should be configured in a client-only state with the server de-activated unless the user requires it.
1063+
1064+ * dnsutils # LaMontJones
1065+ * ftp
1066+ * iptables # FabioMassimoDiNitto
1067+ * (telnet)
1068+ * (openssh-client) # ColinWatson
1069+ * rsync # would be just client but they are the same binary apparently
1070+ * wget # FabioMassimoDiNitto
1071+
1072+= Debugging and Diagnostics =
1073+
1074+A base system should be a good platform for diagnostics about the hardware and network. In other words, after installing just the Base system one should have everything one might need to get the rest of the system up and running the way you want it.
1075+
1076+These are used for debugging problems or examining the system.
1077+
1078+ * strace
1079+ * dmidecode
1080+ * ppc64-diag [powerpc ppc64el] # LP: #1417608
1081+ * lshw
1082+ * lsof
1083+ * ltrace
1084+
1085+= Helpful Tools =
1086+
1087+ * (friendly-recovery) # give a nice menu in recovery mode
1088+ * (command-not-found)
1089+ * (update-manager-core) # needed for server based release upgrades
1090+ * (apparmor) # load AppArmor policies
1091+ * (plymouth) # splash screen, and boot-time questions
1092+ * (plymouth-theme-ubuntu-text)
1093+
1094+== Network ==
1095+
1096+ * (iputils-tracepath) # more secure sort of traceroute, will put compatibility symblink in for traceroute users
1097+ * (mtr-tiny) # LaMontJones
1098+ * (tcpdump)
1099+ * (ufw) # Jamie Strandboge
1100+
1101+= Other =
1102+
1103+ * popularity-contest
1104+ * ubuntu-standard # metapackage for everything here
1105+ * (apt) # James Westby, enables access to private PPAs among other things
1106+ * language-selector-common # helps installer to work out which language-support packages to install
1107+>>>>>>> standard
1108diff --git a/supported b/supported
1109index 6007416..a6c5d01 100644
1110--- a/supported
1111+++ b/supported
1112@@ -1,3 +1,4 @@
1113+<<<<<<< supported
1114 This seed includes some things that are too big for a DVD, and of course also
1115 inherits from everything else.
1116
1117@@ -226,3 +227,5 @@ included due to matching Extra-Include patterns, and has no other effect):
1118 * openjdk-11-jdk
1119 * openjdk-11-doc
1120 * openjdk-11-source
1121+=======
1122+>>>>>>> supported
1123diff --git a/supported-cloud b/supported-cloud
1124new file mode 100644
1125index 0000000..47de5e4
1126--- /dev/null
1127+++ b/supported-cloud
1128@@ -0,0 +1,46 @@
1129+= Per-cloud-image packages =
1130+
1131+ * cifs-utils
1132+ * cloud-guest-utils
1133+ * hibagent
1134+ * %linux-aws
1135+ * %linux-restricted-modules-aws
1136+ * %linux-meta-aws
1137+ * %linux-azure
1138+ * %linux-signed-azure
1139+ * %linux-restricted-modules-azure
1140+ * %linux-meta-azure
1141+ * %linux-kvm
1142+ * %linux-meta-kvm
1143+ * %linux-gcp
1144+ * %linux-restricted-modules-gcp
1145+ * %linux-meta-gcp
1146+ * %linux-oracle
1147+ * %linux-signed-oracle
1148+ * %linux-restricted-modules-oracle
1149+ * %linux-meta-oracle
1150+ * chrony # ntpd replaced by chrony >=18.04 (LP: #1744072)
1151+ * ec2-hibinit-agent # EC2
1152+ * gce-compute-image-packages # Google Compute Engine
1153+ * walinuxagent
1154+ * xe-guest-utilities # for XEN-virt-like cloud images, examples in the wild are Rackspace and Softlayer. LP: #1746680
1155+ * rax-nova-agent
1156+ * socat # LP: #1756870
1157+ * pv # LP: #1746891
1158+ * lxd-installer # installed by livecd-rootfs in minimized cloud images
1159+ * sysfsutils
1160+ * cloud-initramfs-rooturl # maas images initrd uses this
1161+
1162+= Architecture specific packages =
1163+
1164+ * grub-efi-amd64-signed [amd64]
1165+ * grub-efi-amd64 [amd64]
1166+ * shim-signed [amd64]
1167+
1168+ * grub-efi-arm64 [arm64]
1169+ * grub-efi-arm64-bin [arm64]
1170+
1171+ * s390-tools [s390x]
1172+ * sysconfig-hardware [s390x]
1173+
1174+ * grub-legacy-ec2
1175diff --git a/supported-common b/supported-common
1176new file mode 100644
1177index 0000000..b683678
1178--- /dev/null
1179+++ b/supported-common
1180@@ -0,0 +1,2 @@
1181+This seed exists only to gather together all the other common supported-*
1182+seeds.
1183diff --git a/supported-desktop b/supported-desktop
1184new file mode 100644
1185index 0000000..636cf52
1186--- /dev/null
1187+++ b/supported-desktop
1188@@ -0,0 +1 @@
1189+This seed exists only to gather together all the other common supported-*-desktop seeds
1190diff --git a/supported-development-common b/supported-development-common
1191new file mode 100644
1192index 0000000..4196767
1193--- /dev/null
1194+++ b/supported-development-common
1195@@ -0,0 +1,91 @@
1196+= Development =
1197+
1198+== Development Tools ==
1199+
1200+ * bison
1201+ * bison-doc
1202+ * debconf-english # for minimal buildd chroots, without i18n cruft
1203+ * flex
1204+ * patchutils
1205+ * gdb
1206+ * gdb-doc
1207+ * autoconf
1208+ * autoconf-doc
1209+ * automake
1210+ * autotools-dev
1211+ * libtool
1212+ * pkg-config
1213+ * ccache # C/C++ development, package development
1214+ * exuberant-ctags # ColinWatson
1215+ * linux32 # without it, biarch buildds can go wonky
1216+ * autopkgtest
1217+ * apport-retrace
1218+ * apport-cli
1219+ * libc6-prof [amd64 i386 powerpc sparc]
1220+ * libc6.1-prof [ia64]
1221+ * gfortran-multilib
1222+ * libstdc++-9-pic
1223+ * texinfo-doc-nonfree # GFDL'd documentation for texinfo
1224+ * make-doc
1225+ * cmake
1226+ * device-tree-compiler
1227+ * default-jdk
1228+
1229+== Revision Control ==
1230+
1231+ * git
1232+
1233+== Package Maintainance ==
1234+
1235+ * debhelper # ColinWatson
1236+ * devscripts
1237+ * dh-make
1238+ * dupload # ColinWatson
1239+ * lintian
1240+ * apt-listchanges
1241+ * dput
1242+ * pkgstriptranslations # for removing gettext data on the buildds
1243+ * pkg-create-dbgsym # automatic creation of debug symbols
1244+ * hello
1245+ * hello-debhelper
1246+ * dselect # old-school package management
1247+ * dh-autoreconf
1248+ * dh-exec
1249+ * dh-di
1250+ * dh-golang
1251+
1252+== Seed Management ==
1253+
1254+ * germinate # quis custodiet ipsos custodes?
1255+
1256+= Shells =
1257+
1258+ * zsh
1259+
1260+= Libraries =
1261+
1262+ * libdate-manip-perl
1263+ * libnet-ldap-perl
1264+ * libfile-rsyncp-perl
1265+ * libnss-db
1266+ * tdsodbc
1267+ * libdbd-sqlite3
1268+ * libdbd-mysql
1269+ * libdbd-pgsql
1270+ * libdbd-freetds
1271+ * python3-launchpadlib
1272+
1273+= Misc =
1274+
1275+ * util-linux-locales # contents provided in langpacks, just needs to be held in main
1276+ * ubuntu-dbgsym-keyring # keyring for the ddebs
1277+
1278+= Germinate workarounds =
1279+
1280+# Packages should be recorded in their reverse-built-dependencies using
1281+# 'Built-Using' due to code copied into target objects at build time.
1282+= Built-using workarounds =
1283+
1284+ * gnu-efi
1285+ * libatomic-ops-dev
1286+ * libiberty-dev
1287diff --git a/supported-development-desktop b/supported-development-desktop
1288new file mode 100644
1289index 0000000..16f735c
1290--- /dev/null
1291+++ b/supported-development-desktop
1292@@ -0,0 +1,28 @@
1293+= Development =
1294+
1295+== Development Tools ==
1296+
1297+ * valgrind
1298+ * indent
1299+
1300+== Advanced editors ==
1301+
1302+ * vim # Needs to stay off server CDs because it pulls in Gnome
1303+
1304+= Libraries =
1305+
1306+ * libchart-perl
1307+ * libgd-graph-perl
1308+ * libtemplate-perl
1309+
1310+= Python3 =
1311+
1312+ * python3-doc
1313+ * python3-all-dev
1314+ * python3-all-dbg
1315+ * python3-examples
1316+ * python3-setuptools
1317+ * python3-bsddb3-dbg
1318+ * python-bsddb3-doc
1319+ * python3-gi-cairo
1320+ * libpython3.6-testsuite
1321diff --git a/supported-hardware b/supported-hardware
1322new file mode 100644
1323index 0000000..bf640d7
1324--- /dev/null
1325+++ b/supported-hardware
1326@@ -0,0 +1 @@
1327+# this has been split into supported-hardware-[common|desktop|server]
1328diff --git a/supported-hardware-common b/supported-hardware-common
1329new file mode 100644
1330index 0000000..94dde53
1331--- /dev/null
1332+++ b/supported-hardware-common
1333@@ -0,0 +1,13 @@
1334+= Hardware =
1335+
1336+ * powertop
1337+ * ethtool
1338+ * efivar # Tools to manage UEFI variables
1339+
1340+== Filesystems ==
1341+
1342+ * xfsdump # only useful when machine is setup and working, and only for xfs people
1343+ * hfsutils
1344+ * squashfs-tools
1345+ * reiser4progs
1346+ * zfsutils-linux # currently no support in the installer; move to appropriate seed if this changes
1347diff --git a/supported-hardware-desktop b/supported-hardware-desktop
1348new file mode 100644
1349index 0000000..f950724
1350--- /dev/null
1351+++ b/supported-hardware-desktop
1352@@ -0,0 +1,9 @@
1353+= Hardware =
1354+
1355+ * irda-utils
1356+ * wacom-tools
1357+ * gobi-loader
1358+
1359+== Filesystems ==
1360+
1361+ * hfsplus
1362diff --git a/supported-installer b/supported-installer
1363new file mode 100644
1364index 0000000..8e56873
1365--- /dev/null
1366+++ b/supported-installer
1367@@ -0,0 +1 @@
1368+# Replaced by supported-installer-[common|desktop|server]
1369diff --git a/supported-installer-common b/supported-installer-common
1370new file mode 100644
1371index 0000000..4a7f158
1372--- /dev/null
1373+++ b/supported-installer-common
1374@@ -0,0 +1,32 @@
1375+= Installer =
1376+
1377+ * debian-installer # also has side-effect of pulling in installer image build system
1378+ * debian-installer-udebs
1379+ * gfxboot
1380+ * gfxboot-theme-ubuntu
1381+
1382+ * ppp-udeb # experimental
1383+
1384+ * installation-guide-amd64 [amd64]
1385+ * installation-guide-armhf [armhf]
1386+ * installation-guide-i386 [i386]
1387+ * installation-guide-powerpc [powerpc]
1388+ * installation-guide-arm64 [arm64]
1389+ * installation-guide-ppc64el [ppc64el]
1390+ * installation-guide-s390x [s390x]
1391+
1392+ * isolinux [amd64 i386]
1393+ * lilo
1394+ * lilo-installer [amd64 i386]
1395+ * grub-efi [amd64 i386]
1396+ * grub-efi-amd64 [amd64 i386]
1397+ * grub-efi-ia32 [amd64 i386]
1398+ * grub-efi-amd64-signed [amd64]
1399+ * grub-efi-arm64-signed [arm64]
1400+ * grub-efi-arm [armhf]
1401+ * grub-uboot [armhf]
1402+ * grub-xen [amd64 i386]
1403+ * sbsigntool
1404+
1405+ * live-installer
1406+
1407diff --git a/supported-installer-desktop b/supported-installer-desktop
1408new file mode 100644
1409index 0000000..175c720
1410--- /dev/null
1411+++ b/supported-installer-desktop
1412@@ -0,0 +1,8 @@
1413+= Installer =
1414+
1415+ * casper # needed by live CD build system
1416+ * lupin-casper [amd64 i386] # ditto, installer-for-windows
1417+ * livecd-rootfs # live CD build script
1418+ * live-build # new live CD build scripts
1419+ * cdebconf # useful for testing, but not used by default yet
1420+ * jasper # used instead of casper for preinstalled armel images
1421diff --git a/supported-kernel-common b/supported-kernel-common
1422new file mode 100644
1423index 0000000..43c48ab
1424--- /dev/null
1425+++ b/supported-kernel-common
1426@@ -0,0 +1,17 @@
1427+== Kernel ==
1428+
1429+ * %linux
1430+ * %linux-meta
1431+ * %linux-signed
1432+ * %linux-restricted-modules
1433+ * %linux-hwe
1434+ * %linux-meta-hwe
1435+ * %linux-signed-hwe
1436+ * %linux-oem
1437+ * %linux-meta-oem
1438+ * %linux-signed-oem
1439+ * %linux-snapdragon
1440+ * %linux-meta-snapdragon
1441+ * kexec-tools
1442+ * thermald
1443+ * kernel-wedge
1444diff --git a/supported-kernel-desktop b/supported-kernel-desktop
1445new file mode 100644
1446index 0000000..6694c2e
1447--- /dev/null
1448+++ b/supported-kernel-desktop
1449@@ -0,0 +1,10 @@
1450+== Kernel ==
1451+
1452+== Restricted Drivers ==
1453+ * fglrx
1454+ * fglrx-dev
1455+ * fglrx-amdcccle
1456+ * nvidia-current
1457+ * nvidia-current-dev
1458+ * nvidia-settings
1459+
1460diff --git a/supported-misc-servers b/supported-misc-servers
1461new file mode 100644
1462index 0000000..cbe3688
1463--- /dev/null
1464+++ b/supported-misc-servers
1465@@ -0,0 +1,191 @@
1466+= Servers and Daemons =
1467+
1468+Database:
1469+
1470+ * postgresql-plperl-10
1471+ * postgresql-plpython3-10
1472+ * postgresql-pltcl-10
1473+
1474+Email:
1475+
1476+ * fetchmail
1477+ * procmail
1478+ * exim4
1479+ * exim4-daemon-heavy
1480+ * exim4-daemon-light
1481+ * exim4-doc-html
1482+ * dovecot-core
1483+
1484+Must also consider webmail and so on...
1485+
1486+VPN:
1487+
1488+ * strongswan # ipsec vpn - jpds/14.04 (LP: #1266066)
1489+
1490+Web servers:
1491+
1492+ * nginx
1493+
1494+Web applications:
1495+
1496+ * zope3-sandbox
1497+ * memcached #ClintByrum - server-maverick-uds-web20-workloads
1498+ * libmemcached-dev #ClintByrum - server-maverick-uds-web20-workloads
1499+ * rabbitmq-server
1500+
1501+Utilities:
1502+
1503+ * htop # used quite often in favor of top
1504+ * logcheck # great security tool for any server
1505+ * logcheck-database # useful for above
1506+ * rrdtool
1507+ * iotop
1508+ * john
1509+ * libmemcached-tools #ClintByrum - server-maverick-uds-web20-workloads
1510+ * nicstat
1511+ * nut # UPS management
1512+ * nut-cgi
1513+ * nut-snmp
1514+
1515+Radius server:
1516+
1517+ * freeradius
1518+
1519+Authentication:
1520+
1521+ * sssd
1522+ * sssd-tools
1523+
1524+Backup:
1525+
1526+ * mtx
1527+
1528+Proxy:
1529+
1530+ * haproxy #ClintByrum server-maverick-uds-cloud-loadbalancing
1531+
1532+Configuration Management:
1533+
1534+ * etckeeper
1535+
1536+Storage:
1537+
1538+ * ceph
1539+ * radosgw
1540+
1541+Other:
1542+
1543+ * anope # requested by Canonical IS (LP: #1459692)
1544+ * samba-doc-pdf
1545+ * rabbitmq-server
1546+ * unzip
1547+ * openvswitch
1548+ * openvswitch-switch-dpdk
1549+
1550+OpenStack:
1551+
1552+ * ubuntu-cloud-keyring # keyring for the Ubuntu Cloud Archive
1553+
1554+ * nova-api
1555+ * nova-network
1556+ * nova-objectstore
1557+ * nova-scheduler
1558+ * nova-volume
1559+ * nova-compute
1560+ * nova-compute-kvm
1561+ * nova-compute-lxc
1562+ * nova-compute-lxd # James Page LP: #1540597
1563+ * nova-vncproxy
1564+ * nova-cert
1565+ * nova-scheduler # James Page LP: #1180084
1566+ * nova-conductor
1567+
1568+ * swift
1569+ * swift-account
1570+ * swift-container
1571+ * swift-doc
1572+ * swift-object
1573+ * swift-object-expirer
1574+ * swift-proxy
1575+
1576+ * glance
1577+
1578+ * keystone
1579+
1580+ * python3-openstackclient
1581+ * python3-keystoneclient
1582+ * python3-cinderclient
1583+ * python3-swiftclient
1584+ * python3-glanceclient
1585+ * python3-neutronclient
1586+ * python3-osc-placement # https://bugs.launchpad.net/bugs/1790921
1587+
1588+ * ceilometer-collector
1589+ * ceilometer-api
1590+ * ceilometer-agent-compute
1591+ * ceilometer-agent-central
1592+
1593+ * openstack-dashboard
1594+
1595+ * cinder-volume
1596+ * cinder-api
1597+ * cinder-scheduler
1598+ * cinder-backup
1599+
1600+ * neutron-server
1601+ * neutron-l3-agent
1602+ * neutron-dhcp-agent
1603+ * neutron-openvswitch-agent
1604+ * neutron-linuxbridge-agent
1605+ * neutron-lbaas-agent
1606+ * neutron-metadata-agent
1607+
1608+ * python3-neutron-vpnaas # https://bugs.launchpad.net/bugs/1482765
1609+
1610+ * heat-engine
1611+ * heat-api
1612+ * heat-api-cfn
1613+ * heat-api-cloudwatch
1614+
1615+ * aodh-api # https://bugs.launchpad.net/bugs/1546728
1616+ * aodh-evaluator
1617+ * aodh-notifier
1618+ * aodh-listener
1619+ * aodh-expirer
1620+
1621+ * barbican-api # https://bugs.launchpad.net/bugs/1543754
1622+ * barbican-worker
1623+ * barbican-keystone-listener
1624+
1625+ * designate # https://bugs.launchpad.net/bugs/1543748
1626+ * designate-zone-manager
1627+ * designate-sink
1628+ * designate-pool-manager
1629+ * designate-mdns
1630+ * designate-producer
1631+ * designate-worker
1632+
1633+ * libapache2-mod-auth-mellon # https://bugs.launchpad.net/bugs/1610286
1634+
1635+KVM Virtualization Stack:
1636+# held via virt-host tasks before
1637+
1638+ * qemu-system-x86 [i386 amd64]
1639+ * qemu-system-ppc [powerpc ppc64el]
1640+ * qemu-system-aarch64 [arm64]
1641+ * qemu-system-s390x [s390x]
1642+ * qemu-kvm
1643+ * libvirt-daemon-system
1644+
1645+Cloud:
1646+
1647+ * cloud-utils
1648+ * joyent-mdata-client
1649+
1650+IPv6 tools:
1651+
1652+ * quagga # RobertCollins
1653+
1654+Language Interpreters:
1655+
1656+ * ruby
1657diff --git a/supported-network b/supported-network
1658new file mode 100644
1659index 0000000..79358fc
1660--- /dev/null
1661+++ b/supported-network
1662@@ -0,0 +1 @@
1663+# Replaced by supported-[common|client]
1664diff --git a/supported-network-client b/supported-network-client
1665new file mode 100644
1666index 0000000..c5605c9
1667--- /dev/null
1668+++ b/supported-network-client
1669@@ -0,0 +1,9 @@
1670+= Clients =
1671+
1672+ * irssi
1673+ * avahi-utils
1674+
1675+= Mail =
1676+
1677+ * mutt
1678+ * lbdb
1679diff --git a/supported-network-common b/supported-network-common
1680new file mode 100644
1681index 0000000..812e1ab
1682--- /dev/null
1683+++ b/supported-network-common
1684@@ -0,0 +1,5 @@
1685+# common supported network servers (not client tools)
1686+
1687+= Network =
1688+
1689+ * shorewall-shell
1690diff --git a/supported-server b/supported-server
1691new file mode 100644
1692index 0000000..cf169d7
1693--- /dev/null
1694+++ b/supported-server
1695@@ -0,0 +1 @@
1696+This seed exists only to gather together all the other common supported-*-server seeds
1697diff --git a/supported-sysadmin b/supported-sysadmin
1698new file mode 100644
1699index 0000000..541af7e
1700--- /dev/null
1701+++ b/supported-sysadmin
1702@@ -0,0 +1 @@
1703+# Replaced by supported-sysadmin-[common|desktop]
1704diff --git a/supported-sysadmin-common b/supported-sysadmin-common
1705new file mode 100644
1706index 0000000..f0b53d5
1707--- /dev/null
1708+++ b/supported-sysadmin-common
1709@@ -0,0 +1,29 @@
1710+= System Administration Tools =
1711+
1712+ * attr # will move to base if we go to selinux
1713+ * quota
1714+ * backuppc # RobertCollins
1715+ * debian-goodies
1716+ * whois # FabioMassimoDiNitto
1717+ * cu # super-basic serial access
1718+ * john # detects weak passwords, might be needed in desktop
1719+ * libpam-cracklib # enables weak password checking during password change, should it be in desktop?
1720+ * mknbi # for creating etherboot images for LTSP
1721+
1722+ * fbset
1723+ * libcap-bin
1724+ * libpam-opie
1725+ * opie-client
1726+ * opie-server
1727+ * sasl2-bin
1728+ * libsasl2-modules-sql
1729+ * autofs
1730+ * awstats
1731+ * acct
1732+ * authbind # still in use in launchpad, https://lists.ubuntu.com/archives/ubuntu-devel/2019-February/040591.html
1733+ * siege
1734+ * bonnie++
1735+ * sqlite3 # CLI utility, libs in main. nijaba
1736+ * policyrcd-script-zg2 # helps with chroot administration
1737+ * pastebinit
1738+ * mlocate

Subscribers

People subscribed via source and target branches